decidim-core 0.15.2 → 0.16.0

data/app/forms/decidim/omniauth_registration_form.rb

@@ -13,6 +13,7 @@ module Decidim
     attribute :tos_agreement, Boolean
     attribute :oauth_signature, String
     attribute :avatar_url, String
+    attribute :raw_data, Hash
 
     validates :email, presence: true
     validates :name, presence: true
@@ -24,7 +25,7 @@ module Decidim
     end
 
     def normalized_nickname
-      User.nicknamize(nickname || name, organization: current_organization)
+      UserBaseEntity.nicknamize(nickname || name, organization: current_organization)
     end
   end
 end

data/app/forms/decidim/user_group_form.rb

@@ -16,8 +16,6 @@ module Decidim
     validates :name, presence: true
     validates :email, presence: true, 'valid_email_2/email': { disposable: true }
     validates :nickname, presence: true
-    validates :document_number, presence: true
-    validates :phone, presence: true
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
@@ -30,6 +28,7 @@ module Decidim
     private
 
     def unique_document_number
+      return if document_number.blank?
       errors.add :document_number, :taken if UserGroup
                                              .with_document_number(
                                                context.current_organization,

data/app/forms/decidim/user_interest_scope_form.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The form object that handles the data behind updating a user's
+  # interests in her profile page.
+  class UserInterestScopeForm < Form
+    mimic :scope
+
+    attribute :name, String
+    attribute :checked, Boolean
+    attribute :children, Array[UserInterestScopeForm]
+
+    def map_model(model_hash)
+      scope = model_hash[:scope]
+      user = model_hash[:user]
+
+      self.id = scope.id
+      self.name = scope.name
+      self.checked = user.interested_scopes_ids.include?(scope.id)
+      self.children = scope.children.map do |children_scope|
+        UserInterestScopeForm.from_model(scope: children_scope, user: user)
+      end
+    end
+  end
+end

data/app/forms/decidim/user_interests_form.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The form object that handles the data behind updating a user's
+  # interests in her profile page.
+  class UserInterestsForm < Form
+    mimic :user
+
+    attribute :scopes, Array[UserInterestScopeForm]
+
+    def newsletter_notifications_at
+      return nil unless newsletter_notifications
+      Time.current
+    end
+
+    def map_model(user)
+      self.scopes = user.organization.scopes.top_level.map do |scope|
+        UserInterestScopeForm.from_model(scope: scope, user: user)
+      end
+    end
+  end
+end

data/app/helpers/decidim/amendments_helper.rb

@@ -0,0 +1,130 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A Helper to render and link amendments to resources.
+  module AmendmentsHelper
+    def amendments_enabled?
+      current_component.settings.amendments_enabled
+    end
+
+    def amend_button_for(amendable)
+      cell "decidim/amendable/amend_button_card", amendable if amendable.amendable?
+    end
+
+    # Renders the emendations of a amendable resource that includes the
+    # Amendable concern.
+    #
+    # amendable - The resource that has emendations.
+    #
+    # Returns Html grid of CardM.
+    def amendments_for(amendable)
+      return unless amendments_enabled? && amendable.emendations.count
+      return if amendable.emendation?
+      content = content_tag :h2, class: "section-heading", id: "amendments" do
+        t("section_heading", scope: "decidim.amendments.amendable", count: amendable.emendations.count)
+      end
+
+      content += if amendable.emendations.count.positive?
+                   cell(
+                     "decidim/collapsible_list",
+                     amendable.emendations,
+                     cell_options: { context: { current_user: current_user } },
+                     list_class: "row small-up-1 medium-up-2 card-grid",
+                     size: 4
+                   ).to_s
+                 else
+                   t("no_amendments", scope: "decidim.amendments.amendable", count: amendable.emendations.count)
+                 end
+
+      content_tag :div, content.html_safe, class: "section"
+    end
+
+    def amenders_for(amendable)
+      amendable.amendments.map { |amendment| present(amendment.amender) }.uniq
+    end
+
+    def amenders_list_for(amendable)
+      cell "decidim/amendable/amenders_list", amenders_for(amendable), context: { current_user: current_user } if amendable.amendable?
+    end
+
+    # Renders the state of an emendation
+    #
+    # emendation - The resource that is an emendation.
+    #
+    # Returns Html callout.
+    def emendation_announcement_for(emendation)
+      cell "decidim/amendable/announcement", emendation if emendation.emendation?
+    end
+
+    # Returns Html action button cards: accept/reject or promote
+    #
+    # emendation - The resource that is an emendation.
+    def emendation_actions_for(emendation)
+      return unless allowed_to_react_to_emendation?(emendation)
+      return accept_and_reject_buttons_for(emendation) if allowed_to_accept_and_reject?(emendation)
+      return promote_button_for(emendation) if allowed_to_promote?(emendation)
+    end
+
+    # Renders the buttons to accept/reject an emendation
+    def accept_and_reject_buttons_for(emendation)
+      cell("decidim/amendable/emendation_actions", emendation)
+    end
+
+    # Renders the button to promote an emendation
+    def promote_button_for(emendation)
+      cell("decidim/amendable/promote_button_card", emendation)
+    end
+
+    # Checks if current_user can react to the emendation
+    #
+    # Returns true or false
+    def allowed_to_react_to_emendation?(emendation)
+      return unless emendation.emendation?
+      return unless current_user
+      true
+    end
+
+    # Checks if current_user can accept and reject the emendation
+    #
+    # Returns true or false
+    def allowed_to_accept_and_reject?(emendation)
+      return unless emendation.amendment.evaluating?
+      emendation.amendable.created_by?(current_user) || current_user.admin
+    end
+
+    # Checks if current_user can promote the emendation
+    #
+    # Returns true or false
+    def allowed_to_promote?(emendation)
+      return unless emendation.state == "rejected"
+      return unless emendation.created_by?(current_user)
+      not_yet_promoted(emendation)
+    end
+
+    # Checks whether the ActionLog created in the promote command exists.
+    #
+    # Returns true or false
+    def not_yet_promoted(emendation)
+      logs = Decidim::ActionLog.where(decidim_component_id: emendation.component)
+                               .where(decidim_user_id: emendation.creator_author)
+                               .where(action: "promote")
+      logs.select { |l| l.extra["promoted_from"] == emendation.id }.empty?
+    end
+
+    def user_group_select_field(form, name)
+      selected = @form.user_group_id.presence
+      form.select(
+        name,
+        current_user.user_groups.verified.map { |g| [g.name, g.id] },
+        selected: selected,
+        include_blank: current_user.name,
+        label: t("new.amendment_author", scope: "decidim.amendments")
+      )
+    end
+
+    def emendation_ignored_field_value(key)
+      0 if @form.emendation_type.constantize.columns_hash[key.to_s].type == :integer
+      nil if key == :id
+    end
+  end
+end

data/app/helpers/decidim/application_helper.rb

@@ -5,6 +5,8 @@ module Decidim
   module ApplicationHelper
     include Decidim::OmniauthHelper
     include Decidim::ScopesHelper
+    include Decidim::ContextualHelpHelper
+    include Decidim::AmendmentsHelper
 
     # Truncates a given text respecting its HTML tags.
     #
@@ -25,8 +27,9 @@ module Decidim
       Truncato.truncate(text, options)
     end
 
-    def present(object)
-      presenter = "#{object.class.name}Presenter".constantize.new(object)
+    def present(object, presenter_class: nil)
+      presenter_class ||= "#{object.class.name}Presenter".constantize
+      presenter = presenter_class.new(object)
 
       yield(presenter) if block_given?
 
@@ -50,5 +53,19 @@ module Decidim
 
       content_for(:edit_link, link)
     end
+
+    # Public: Overwrites the `cell` helper method to automatically set some
+    # common context.
+    #
+    # name - the name of the cell to render
+    # model - the cell model
+    # options - a Hash with options
+    #
+    # Renders the cell contents.
+    def cell(name, model, options = {}, &block)
+      options = { context: { current_user: current_user } }.deep_merge(options)
+
+      super(name, model, options, &block)
+    end
   end
 end

data/app/helpers/decidim/card_helper.rb

@@ -10,8 +10,6 @@ module Decidim
     #
     # Returns an HTML.
     def card_for(model, options = {})
-      options = { context: { current_user: current_user } }.deep_merge(options)
-
       cell "decidim/card", model, options
     end
   end

data/app/helpers/decidim/cells_paginate_helper.rb

@@ -12,5 +12,9 @@ module Decidim
       options = options.reverse_merge(views_prefix: "../views/")
       super
     end
+
+    def per_page
+      params[:per_page] || Decidim::Paginable::OPTIONS.first
+    end
   end
 end

data/app/helpers/decidim/contextual_help_helper.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper to print layout elements for the different help elements available on the pages.
+  module ContextualHelpHelper
+    def floating_help(id, &block)
+      render partial: "decidim/shared/floating_help", locals: { content: capture(&block), id: id }
+    end
+  end
+end

data/app/helpers/decidim/cta_button_helper.rb

@@ -19,8 +19,10 @@ module Decidim
         decidim_participatory_processes.participatory_processes_path
       elsif current_user
         decidim.account_path
-      else
+      elsif current_organization.sign_up_enabled?
         decidim.new_user_registration_path
+      else
+        decidim.new_user_session_path
       end
     end
   end

data/app/helpers/decidim/decidim_form_helper.rb

@@ -103,7 +103,7 @@ module Decidim
         return safe_join [field_label, field_input]
       end
 
-      tabs_id = options[:tabs_id] || "#{object_name}-#{name}-tabs"
+      tabs_id = options[:tabs_id] || "#{object_name}-#{name}-tabs".underscore
       enabled_tabs = options[:enable_tabs].nil? ? true : options[:enable_tabs]
       tabs_panels_data = enabled_tabs ? { tabs: true } : {}
 

data/app/helpers/decidim/layout_helper.rb

@@ -66,5 +66,18 @@ module Decidim
       classes += [options[:class]]
       classes.compact
     end
+
+    def extended_navigation_bar(items, max_items: 5)
+      return unless items.any?
+      extra_items = items.slice((max_items + 1)..-1) || []
+      active_item = items.find { |item| item[:active] }
+
+      render partial: "decidim/shared/extended_navigation_bar", locals: {
+        items: items,
+        extra_items: extra_items,
+        active_item: active_item,
+        max_items: max_items
+      }
+    end
   end
 end

data/app/helpers/decidim/omniauth_helper.rb

@@ -23,8 +23,16 @@ module Decidim
 
     # Public: icon for omniauth buttons
     def oauth_icon(provider)
-      name = provider == :developer ? "phone" : normalize_provider_name(provider)
+      info = Rails.application.secrets.dig(:omniauth, provider.to_sym)
 
+      if info
+        icon_path = info[:icon_path]
+        return external_icon(icon_path) if icon_path
+
+        name = info[:icon]
+      end
+
+      name ||= normalize_provider_name(provider)
       icon(name)
     end
   end

data/app/helpers/decidim/pad_helper.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A Helper to render an Etherpad iframe.
+  module PadHelper
+    # Renders an iframe with the pad of a model that includes the
+    # Paddable concern.
+    #
+    # paddable - The model to render the pad from.
+    #
+    # Returns nothing.
+    def pad_iframe_for(paddable)
+      cell "decidim/pad_iframe", paddable
+    end
+  end
+end

data/app/helpers/decidim/participatory_space_helpers.rb

@@ -26,5 +26,20 @@ module Decidim
 
       @participatory_space_helpers = klass.new(self)
     end
+
+    def participatory_space_floating_help
+      return if help_section.blank?
+
+      content_tag "div", class: "row collapse" do
+        floating_help(help_id) { translated_attribute(help_section).html_safe }
+      end
+    end
+
+    def participatory_space_wrapper(&block)
+      content_tag :main, class: "wrapper" do
+        concat(participatory_space_floating_help)
+        concat(capture(&block))
+      end
+    end
   end
 end

data/app/helpers/decidim/searches_helper.rb

@@ -3,15 +3,59 @@
 module Decidim
   # A Helper to render and link to searchables.
   module SearchesHelper
-    # @param count: (optional) the number of resources so that the I18n backend can decide to translate into singluar or plural form.
-    def searchable_resource_human_name(resource, count: 1)
+    # Renders the human name of the given class name.
+    #
+    # klass_name - a String representing the class name of the resource to render
+    # count - (optional) the number of resources so that the I18n backend
+    #         can decide to translate into singluar or plural form.
+    def searchable_resource_human_name(resource, count: 5)
+      resource = if resource.is_a?(String)
+                   resource.constantize
+                 else
+                   resource
+                 end
+
       resource.model_name.human(count: count)
     end
 
-    def searchable_resources_as_options(all_label)
-      [["", all_label]] + Decidim::Searchable.searchable_resources.values.collect do |r|
-        [r.name, searchable_resource_human_name(r, count: 2)]
-      end.sort
+    # Generates a link to filter the current search by the given type. If no
+    # type is given, it generates a link to the main results page.
+    #
+    # resource_type - An optional String with the name of the model class to filter
+    # space_state - An optional String with the name of the state of the space
+    def search_path_by(resource_type: nil, space_state: nil)
+      new_params = {
+        utf8: params[:utf8],
+        filter: {
+          decidim_scope_id: params.dig(:filter, :decidim_scope_id),
+          term: params[:term] || params.dig(:filter, :term)
+        }
+      }
+      new_params[:filter][:resource_type] = resource_type if resource_type.present?
+      new_params[:filter][:space_state] = space_state if space_state.present?
+      decidim.search_path(new_params)
+    end
+
+    # Generates the path to the main results page (the one without any filter
+    # active), only the `term` one.
+    def main_search_path
+      search_path_by
+    end
+
+    # Generates the path to filter by resource type, considering the other filters.
+    def search_path_by_resource_type(resource_type)
+      search_path_by(space_state: params.dig(:filter, :space_state), resource_type: resource_type)
+    end
+
+    # Generates the path and link to filter by space state, taking into account
+    # the other filters applied.
+    def search_path_by_state_link(state)
+      path = search_path_by(resource_type: params.dig(:filter, :resource_type), space_state: state)
+      is_active = params.dig(:filter, :space_state).to_s == state.to_s
+
+      link_to path, class: "order-by__tab#{" is-active" if is_active}" do
+        content_tag(:strong, t(state || :all, scope: "decidim.searches.filters.state"))
+      end
     end
   end
 end