decidim-core 0.8.4 → 0.9.0

data/app/controllers/decidim/pages_controller.rb

@@ -14,6 +14,7 @@ module Decidim
     helper_method :page, :stats
     helper CtaButtonHelper
     helper Decidim::SanitizeHelper
+    skip_before_action :store_current_location
 
     def index
       @pages = current_organization.static_pages.all.to_a.sort do |a, b|

data/app/controllers/decidim/profiles_controller.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The controller to handle the user's public profile page.
+  class ProfilesController < Decidim::ApplicationController
+    skip_authorization_check
+
+    helper Decidim::Messaging::ConversationHelper
+
+    helper_method :user
+
+    def show; end
+
+    private
+
+    def user
+      @user ||= Decidim::User.find_by!(
+        nickname: params[:nickname],
+        organization: current_organization
+      )
+    end
+  end
+end

data/app/controllers/decidim/scopes_controller.rb

@@ -3,27 +3,26 @@
 module Decidim
   # Exposes the scopes text search so users can choose a scope writing its name.
   class ScopesController < Decidim::ApplicationController
-    def search
-      authorize! :search, Scope
-      root = Scope.where(id: params[:root], organization: current_organization).first
-      scopes = if params[:term].present?
-                 FreetextScopes.for(current_organization, I18n.locale, params[:term], root)
-               elsif root
-                 root.children
-               else
-                 current_organization.top_scopes
-               end
-      root_option = if params[:include_root] == "true" && params[:term].blank?
-                      if root
-                        [{ id: root.id.to_s, text: root.name[I18n.locale.to_s] }]
-                      else
-                        [{ id: "global", text: I18n.t("decidim.scopes.global") }]
-                      end
-                    else
-                      []
-                    end
+    skip_before_action :store_current_location
 
-      render json: { results: root_option + scopes.map { |scope| { id: scope.id.to_s, text: scope.name[I18n.locale.to_s] } } }
+    def picker
+      authorize! :pick, Scope
+
+      title = params[:title] || t("decidim.scopes.picker.title", field: params[:field]&.downcase)
+      root = Scope.find(params[:root]) if params[:root]
+      context = root ? { root: root.id, title: title } : { title: title }
+      required = params[:required] && params[:required] != "false"
+      if params[:current]
+        current = (root&.descendants || current_organization.scopes).find_by(id: params[:current]) || root
+        scopes = current.children
+        parent_scopes = current.part_of_scopes(root)
+      else
+        current = root
+        scopes = root&.children || Scope.top_level
+        parent_scopes = [root].compact
+      end
+      render :picker, layout: nil, locals: { required: required, title: title, root: root, current: current, scopes: scopes.order(name: :asc),
+                                             parent_scopes: parent_scopes, global_value: params[:global_value], context: context }
     end
   end
 end

data/app/events/decidim/profile_updated_event.rb

@@ -0,0 +1,27 @@
+# frozen-string_literal: true
+
+module Decidim
+  class ProfileUpdatedEvent < Decidim::Events::SimpleEvent
+    i18n_attributes :nickname, :name
+
+    delegate :profile_path, :profile_url, :nickname, :name, to: :updated_user
+
+    private
+
+    def resource_path
+      profile_path
+    end
+
+    def resource_title
+      name
+    end
+
+    def resource_url
+      profile_url
+    end
+
+    def updated_user
+      @updated_user ||= Decidim::UserPresenter.new(resource)
+    end
+  end
+end

data/app/forms/decidim/account_form.rb

@@ -7,21 +7,36 @@ module Decidim
     mimic :user
 
     attribute :name
+    attribute :nickname
     attribute :email
     attribute :password
     attribute :password_confirmation
     attribute :avatar
     attribute :remove_avatar
+    attribute :personal_url
+    attribute :about
 
     validates :name, presence: true
     validates :email, presence: true
+    validates :nickname, presence: true
 
+    validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, confirmation: true
     validates :password, length: { in: Decidim::User.password_length, allow_blank: true }
     validates :password_confirmation, presence: true, if: :password_present
     validates :avatar, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_avatar_size } }
 
     validate :unique_email
+    validate :unique_nickname
+    validate :personal_url_format
+
+    def personal_url
+      return if super.blank?
+
+      return "http://" + super unless super.match?(%r{\A(http|https)://}i)
+
+      super
+    end
 
     private
 
@@ -38,5 +53,24 @@ module Decidim
       errors.add :email, :taken
       false
     end
+
+    def unique_nickname
+      return true if Decidim::User.where(
+        organization: context.current_organization,
+        nickname: nickname
+      ).where.not(id: context.current_user.id).empty?
+
+      errors.add :nickname, :taken
+      false
+    end
+
+    def personal_url_format
+      return if personal_url.blank?
+
+      uri = URI.parse(personal_url)
+      errors.add :personal_url, :invalid if !uri.is_a?(URI::HTTP) || uri.host.nil?
+    rescue URI::InvalidURIError
+      errors.add :personal_url, :invalid
+    end
   end
 end

data/app/forms/decidim/form.rb

@@ -7,6 +7,7 @@ module Decidim
     delegate :current_organization,
              :current_user,
              :current_feature,
+             :current_participatory_space,
              to: :context, prefix: false, allow_nil: true
 
     delegate :available_locales, to: :current_organization, allow_nil: true

data/app/forms/decidim/messaging/conversation_form.rb

@@ -2,7 +2,7 @@
 
 module Decidim
   module Messaging
-    # A form object to be used when users want to follow a followable resource.
+    # A form object to be used when users want to message another user.
     class ConversationForm < Decidim::Form
       mimic :conversation
 
@@ -12,7 +12,10 @@ module Decidim
       validates :body, :recipient, presence: true
 
       def recipient
-        Decidim::User.find_by(id: recipient_id)
+        @recipient ||= Decidim::User
+                       .where.not(id: current_user.id)
+                       .where(organization: current_user.organization)
+                       .find_by(id: recipient_id)
       end
     end
   end

data/app/forms/decidim/omniauth_registration_form.rb

@@ -7,6 +7,7 @@ module Decidim
 
     attribute :email, String
     attribute :name, String
+    attribute :nickname, String
     attribute :provider, String
     attribute :uid, String
     attribute :tos_agreement, Boolean
@@ -20,5 +21,9 @@ module Decidim
     def self.create_signature(provider, uid)
       Digest::MD5.hexdigest("#{provider}-#{uid}-#{Rails.application.secrets.secret_key_base}")
     end
+
+    def normalized_nickname
+      User.nicknamize(nickname || name)
+    end
   end
 end

data/app/forms/decidim/registration_form.rb

@@ -7,10 +7,11 @@ module Decidim
 
     attribute :sign_up_as, String
     attribute :name, String
+    attribute :nickname, String
     attribute :email, String
     attribute :password, String
     attribute :password_confirmation, String
-    attribute :newsletter_notifications, Boolean
+    attribute :newsletter, Boolean
     attribute :tos_agreement, Boolean
 
     attribute :user_group_name, String
@@ -19,6 +20,7 @@ module Decidim
 
     validates :sign_up_as, inclusion: { in: %w(user user_group) }
     validates :name, presence: true
+    validates :nickname, presence: true
     validates :email, presence: true
     validates :password, presence: true, confirmation: true, length: { in: Decidim::User.password_length }
     validates :tos_agreement, allow_nil: false, acceptance: true
@@ -28,6 +30,7 @@ module Decidim
     validates :user_group_phone, presence: true, if: :user_group?
 
     validate :email_unique_in_organization
+    validate :nickname_unique_in_organization
     validate :user_group_name_unique_in_organization
     validate :user_group_document_number_unique_in_organization
 
@@ -41,6 +44,10 @@ module Decidim
       errors.add :email, :taken if User.where(email: email, organization: current_organization).first.present?
     end
 
+    def nickname_unique_in_organization
+      errors.add :nickname, :taken if User.where(nickname: nickname, organization: current_organization).first.present?
+    end
+
     def user_group_name_unique_in_organization
       errors.add :user_group_name, :taken if UserGroup.where(name: user_group_name, decidim_organization_id: current_organization.id).first.present?
     end

data/app/helpers/decidim/action_authorization_helper.rb

@@ -36,7 +36,7 @@ module Decidim
       unless current_user_authorized?(action)
         html_options ||= {}
         html_options["onclick"] = "event.preventDefault();"
-        html_options["data-toggle"] = current_user ? "#{action.to_s.underscore}AuthorizationModal" : "loginModal"
+        html_options["data-open"] = current_user ? "#{action.to_s.underscore}AuthorizationModal" : "loginModal"
         url = ""
       end
 
@@ -67,7 +67,7 @@ module Decidim
       end
 
       unless current_user_authorized?(action)
-        html_options["data-toggle"] = current_user ? "#{action.to_s.underscore}AuthorizationModal" : "loginModal"
+        html_options["data-open"] = current_user ? "#{action.to_s.underscore}AuthorizationModal" : "loginModal"
         url = ""
       end
 

data/app/helpers/decidim/application_helper.rb

@@ -24,5 +24,13 @@ module Decidim
 
       Truncato.truncate(text, options)
     end
+
+    def present(object)
+      presenter = "#{object.class.name}Presenter".constantize.new(object)
+
+      yield(presenter) if block_given?
+
+      presenter
+    end
   end
 end

data/app/helpers/decidim/feature_path_helper.rb

@@ -7,17 +7,27 @@ module Decidim
     #
     # feature - the Feature we want to find the root path for.
     #
-    # Returns a url.
+    # Returns a relative url.
     def main_feature_path(feature)
       current_params = try(:params) || {}
       EngineRouter.main_proxy(feature).root_path(locale: current_params[:locale])
     end
 
+    # Returns the defined root url for a given feature.
+    #
+    # feature - the Feature we want to find the root path for.
+    #
+    # Returns an absolute url.
+    def main_feature_url(feature)
+      current_params = try(:params) || {}
+      EngineRouter.main_proxy(feature).root_url(locale: current_params[:locale])
+    end
+
     # Returns the defined admin root path for a given feature.
     #
     # feature - the Feature we want to find the root path for.
     #
-    # Returns a url.
+    # Returns a relative url.
     def manage_feature_path(feature)
       current_params = try(:params) || {}
       EngineRouter.admin_proxy(feature).root_path(locale: current_params[:locale])

data/app/helpers/decidim/feature_reference_helper.rb

@@ -13,7 +13,7 @@ module Decidim
     def feature_reference(feature, options = {})
       return unless feature.reference
       @reference = feature.reference
-      "<div class='reference #{options[:class]}'>#{localized_reference}</div>".html_safe
+      "<div class='tech-info #{options[:class]}'>#{localized_reference}</div>".html_safe
     end
 
     private

data/app/helpers/decidim/messaging/conversation_helper.rb

@@ -4,21 +4,30 @@ module Decidim
   module Messaging
     module ConversationHelper
       #
-      # Builds a link to the conversation between the current user and another
+      # Links to the conversation between the current user and another user
+      #
+      def link_to_current_or_new_conversation_with(user, title = t("decidim.contact"))
+        link_to current_or_new_conversation_path_with(user), title: title do
+          icon "envelope-closed", aria_label: title, class: "icon--small"
+        end
+      end
+
+      #
+      # Finds the right path to the conversation the current user and another
       # user.
       #
-      # * If there's no current user, it links to the login form.
+      # * If there's no current user, it returns to the login form path.
       #
-      # * If there's no prior existing conversation between the users, it links
-      #   to the new conversation form.
+      # * If there's no prior existing conversation between the users, it
+      #   returns the new conversation form path.
       #
-      # * Otherwise, it links to the existing conversation.
+      # * Otherwise, it returns the path to the existing conversation.
       #
       # @param user [Decidim::User] The user to link to a conversation with
       #
       # @return [String] The resulting route
       #
-      def link_to_current_or_new_conversation_with(user)
+      def current_or_new_conversation_path_with(user)
         return decidim.new_user_session_path unless user_signed_in?
 
         conversation = conversation_between(current_user, user)
@@ -30,9 +39,18 @@ module Decidim
         end
       end
 
-      def conversation_between(one_user, another_user)
-        UserConversations.for(one_user).find do |conversation|
-          conversation.participants.to_set == [one_user, another_user].to_set
+      #
+      # Finds the conversation between the given participants
+      #
+      # @param participants [Array<Decidim::User>] The participants to find a
+      #   conversation between.
+      #
+      # @return [Decidim::Messaging::Conversation]
+      def conversation_between(*participants)
+        return if participants.to_set.length <= 1
+
+        UserConversations.for(participants.first).find do |conversation|
+          conversation.participants.to_set == participants.to_set
         end
       end
     end

data/app/helpers/decidim/newsletters_helper.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Helper that provides methods to render links with utm codes, and replaced name
+  module NewslettersHelper
+    # If the newsletter body there are some links and the Decidim.track_newsletter_links = true
+    # it will be replaced with the utm_codes method described below.
+    # for example transform "https://es.lipsum.com/" to "https://es.lipsum.com/?utm_source=localhost&utm_campaign=newsletter_11"
+    # And replace "%{name}" on the subject or content of newsletter to the user Name
+    # for example transform "%{name}" to "User Name"
+    def parse_interpolations(content, user = nil, id = nil)
+      if Decidim.config.track_newsletter_links
+        if id.present? && user.present?
+          host = user.organization.host.to_s
+          campaign = "newsletter_#{id}"
+
+          links = content.scan(/href\s*=\s*"([^"]*)"/)
+
+          links.each do |link|
+            link_replaced = link.first + utm_codes(host, campaign)
+            content = content.gsub(/href\s*=\s*"([^"]*#{link.first})"/, %(href="#{link_replaced}"))
+          end
+        end
+      end
+
+      if user.present?
+        content.gsub("%{name}", user.name)
+      else
+        content.gsub("%{name}", "")
+      end
+    end
+
+    # this method is used to generate the root link on mail with the utm_codes
+    # If the newsletter_id is nil, it returns the root_url
+    def custom_url_for_mail_root(organization, newsletter_id = nil)
+      if newsletter_id.present?
+        decidim.root_url(host: organization.host) + utm_codes(organization.host, newsletter_id.to_s)
+      else
+        decidim.root_url(host: organization.host)
+      end
+    end
+
+    # Method to specify the utm_codes.
+    # You can change or add utm_codes for track
+    def utm_codes(host, newsletter_id)
+      "?utm_source=#{host}&utm_campaign=#{newsletter_id}"
+    end
+  end
+end

data/app/helpers/decidim/scopes_helper.rb

@@ -5,11 +5,52 @@ module Decidim
   module ScopesHelper
     Option = Struct.new(:id, :name)
 
-    # Check whether the resource has a visible scope or not.
+    # Checks if the resource should show its scope or not.
+    # resource - the resource to analize
     #
     # Returns boolean.
     def has_visible_scopes?(resource)
-      current_participatory_space.scopes_enabled? && current_participatory_space.scope.blank? && resource.scope.present?
+      try(:current_participatory_space)&.try(:scopes_enabled?) && resource.scope.present? && current_participatory_space.try(:scope)&.id != resource.scope&.id
+    end
+
+    # Retrieves the translated name and type for an scope.
+    # scope - a Decidim::Scope
+    # global_name - text to use when scope is nil
+    #
+    # Returns a string
+    def scope_name_for_picker(scope, global_name)
+      if scope
+        name = translated_attribute(scope.name)
+        name << " (#{translated_attribute(scope.scope_type.name)})" if scope.scope_type
+        name
+      else
+        global_name
+      end
+    end
+
+    # Renders a scopes picker field in a form.
+    # form - FormBuilder object
+    # name - attribute name
+    #
+    # Returns nothing.
+    def scopes_picker_field(form, name, root: false)
+      root = try(:current_participatory_space)&.scope if root == false
+      form.scopes_picker name do |scope|
+        { url: decidim.scopes_picker_path(root: root, current: scope&.id, field: form.label_for(name)),
+          text: scope_name_for_picker(scope, I18n.t("decidim.scopes.global")) }
+      end
+    end
+
+    # Renders a scopes picker field in a filter form.
+    # form - FilterFormBuilder object
+    # name - attribute name
+    #
+    # Returns nothing.
+    def scopes_picker_filter(form, name)
+      form.scopes_picker name, multiple: true, legend_title: I18n.t("decidim.scopes.scopes"), label: false do |scope|
+        { url: decidim.scopes_picker_path(root: try(:current_participatory_space)&.scope, current: scope&.id, title: I18n.t("decidim.scopes.prompt"), global_value: "global"),
+          text: scope_name_for_picker(scope, I18n.t("decidim.scopes.prompt")) }
+      end
     end
   end
 end