decidim-core 0.29.4 → 0.30.0.rc1

data/app/controllers/decidim/geolocation_controller.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  class GeolocationController < Decidim::ApplicationController
+    include Decidim::AjaxPermissionHandler
+
+    def locate
+      enforce_permission_to :locate, :geolocation
+
+      unless Decidim::Map.configured?
+        return render(json: { message: I18n.t("not_configured", scope: "decidim.application.geocoding"), found: false }, status: :unprocessable_entity)
+      end
+
+      geocoder = Decidim::Map.utility(:geocoding, organization: current_organization)
+      address = geocoder.address([params[:latitude], params[:longitude]])
+      render json: { address:, found: address.present? }
+    end
+  end
+end

data/app/controllers/decidim/homepage_controller.rb

@@ -3,7 +3,6 @@
 module Decidim
   class HomepageController < Decidim::ApplicationController
     skip_before_action :store_current_location
-
     def show; end
   end
 end

data/app/controllers/decidim/open_data_controller.rb

@@ -2,24 +2,49 @@
 
 module Decidim
   class OpenDataController < Decidim::ApplicationController
+    helper_method :open_data_component_manifests, :open_data_participatory_space_manifests, :open_data_core_manifests
+
+    def index; end
+
     def download
-      if uploader.attached?
-        redirect_to uploader.path
+      resource = params[:resource] || nil
+
+      if open_data_file_for_resource(resource)
+        file = open_data_file_for_resource(resource)
+        send_data file.download, filename: file.blob.filename.to_s, type: file.blob.content_type
       else
-        schedule_open_data_generation
+        schedule_open_data_generation(resource)
         flash[:alert] = t("decidim.open_data.not_available_yet")
-        redirect_back fallback_location: root_path
+        redirect_back fallback_location: open_data_path
       end
     end
 
     private
 
-    def uploader
-      @uploader ||= Decidim::ApplicationUploader.new(current_organization, :open_data_file)
+    def open_data_core_manifests
+      @open_data_core_manifests ||= Decidim.open_data_manifests.select(&:include_in_open_data)
+    end
+
+    def open_data_component_manifests
+      @open_data_component_manifests ||= Decidim.component_manifests
+                                                .flat_map(&:export_manifests)
+                                                .select(&:include_in_open_data?)
+    end
+
+    def open_data_participatory_space_manifests
+      @open_data_participatory_space_manifests ||= Decidim.participatory_space_manifests
+                                                          .flat_map(&:export_manifests)
+                                                          .select(&:include_in_open_data?)
+    end
+
+    def open_data_file_for_resource(resource)
+      current_organization.open_data_files.all.find do |file|
+        file.blob.filename == current_organization.open_data_file_path(resource)
+      end
     end
 
-    def schedule_open_data_generation
-      OpenDataJob.perform_later(current_organization)
+    def schedule_open_data_generation(resource = nil)
+      OpenDataJob.perform_later(current_organization, resource)
     end
   end
 end

data/app/controllers/decidim/profiles_controller.rb

@@ -24,7 +24,7 @@ module Decidim
     def show
       return redirect_to profile_members_path if profile_holder.is_a?(Decidim::UserGroup)
 
-      redirect_to profile_activity_path(nickname: params[:nickname].downcase)
+      redirect_to profile_activity_path(nickname: params[:nickname])
     end
 
     def tooltip
@@ -116,7 +116,7 @@ module Decidim
     def profile_holder
       return if params[:nickname].blank?
 
-      @profile_holder ||= Decidim::UserBaseEntity.find_by("nickname = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
+      @profile_holder ||= Decidim::UserBaseEntity.find_by("LOWER(nickname) = ? AND decidim_organization_id = ?", params[:nickname].downcase, current_organization.id)
     end
   end
 end

data/app/controllers/decidim/reports_controller.rb

@@ -2,7 +2,6 @@
 
 module Decidim
   # Exposes the report resource so users can report a reportable.
-  # Unless the reportable is marked as hideable, the resource notice will change accordingly.
   class ReportsController < Decidim::ApplicationController
     include FormFactory
     include NeedsPermission
@@ -16,12 +15,8 @@ module Decidim
 
       CreateReport.call(@form, reportable) do
         on(:ok) do
-          flash[:notice] = if hideable?
-                             I18n.t("decidim.reports.hide.success")
-                           else
-                             I18n.t("decidim.reports.create.success")
-                           end
-          redirect_to reportable.reload.reported_content_url
+          flash[:notice] = I18n.t("decidim.reports.create.success")
+          redirect_back fallback_location: root_path
         end
 
         on(:invalid) do

data/app/controllers/decidim/user_activities_controller.rb

@@ -22,7 +22,7 @@ module Decidim
     def user
       return unless params[:nickname]
 
-      @user ||= current_organization.users.find_by("nickname = ?", params[:nickname].downcase)
+      @user ||= current_organization.users.find_by("LOWER(nickname) = ?", params[:nickname].downcase)
     end
 
     def activities

data/app/controllers/decidim/user_conversations_controller.rb

@@ -11,6 +11,7 @@ module Decidim
     include FormFactory
     include Messaging::ConversationHelper
     include HasProfileBreadcrumb
+    include AjaxPermissionHandler
 
     before_action :authenticate_user!
     before_action :ensure_profile_manager
@@ -18,9 +19,6 @@ module Decidim
     helper Decidim::ResourceHelper
     helper_method :user, :conversations, :conversation
 
-    # overwrite original rescue_from to ensure we print messages from ajax methods (update)
-    rescue_from Decidim::ActionForbidden, with: :ajax_user_has_no_permission
-
     def index
       enforce_permission_to :list, :conversation, interlocutor: user
     end
@@ -94,14 +92,6 @@ module Decidim
 
     private
 
-    # Rescue ajax calls and print the update.js view which prints the info on the message ajax form
-    # Only if the request is AJAX, otherwise behave as Decidim standards
-    def ajax_user_has_no_permission
-      return user_has_no_permission unless request.xhr?
-
-      render_unprocessable_entity I18n.t("actions.unauthorized", scope: "decidim.core")
-    end
-
     def render_unprocessable_entity(message)
       render action: :update, locals: { error: message }, status: :unprocessable_entity
     end

data/app/events/decidim/soft_delete_resource_event.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  class SoftDeleteResourceEvent < Decidim::Events::SimpleEvent
+    i18n_attributes :resource_type, :resource_title
+
+    def resource_type
+      resource.model_name.human
+    end
+
+    def resource_title
+      translated_attribute resource.title
+    end
+  end
+end

data/app/forms/decidim/account_form.rb

@@ -21,10 +21,7 @@ module Decidim
 
     validates :name, presence: true, format: { with: Decidim::User::REGEXP_NAME }
     validates :email, presence: true, "valid_email_2/email": { disposable: true }
-    validates :nickname,
-              presence: true,
-              format: { with: Decidim::User::REGEXP_NICKNAME, message: :format },
-              length: { maximum: Decidim::User.nickname_max_length }
+    validates :nickname, presence: true, format: { with: Decidim::User::REGEXP_NICKNAME }
 
     validates :nickname, length: { maximum: Decidim::User.nickname_max_length, allow_blank: true }
     validates :password, password: { name: :name, email: :email, username: :nickname }, if: -> { password.present? }
@@ -69,7 +66,7 @@ module Decidim
 
     def unique_nickname
       return true if Decidim::UserBaseEntity.where(
-        "decidim_organization_id = ? AND nickname = ? ",
+        "decidim_organization_id = ? AND LOWER(nickname) = ? ",
         context.current_organization.id,
         nickname.downcase
       ).where.not(id: context.current_user.id).empty?

data/app/forms/decidim/amendable/form.rb

@@ -94,7 +94,8 @@ module Decidim
                            .from_model(@i18n_amendable)
                            .with_context(
                              current_component: @i18n_amendable.component,
-                             current_participatory_space: @i18n_amendable.participatory_space
+                             current_participatory_space: @i18n_amendable.participatory_space,
+                             current_organization: @i18n_amendable.organization
                            )
       end
 
@@ -114,7 +115,8 @@ module Decidim
       def form_context
         context.to_h.merge(
           current_component: amendable.component,
-          current_participatory_space: amendable.participatory_space
+          current_participatory_space: amendable.participatory_space,
+          current_organization: amendable.organization
         )
       end
     end

data/app/forms/decidim/ephemeral_user_form.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  # The form object of ephemeral users.
+  class EphemeralUserForm < Form
+    mimic :user
+
+    attribute :locale
+    attribute :name
+    attribute :nickname
+    attribute :organization
+    attribute :verified, Boolean, default: false
+
+    def name
+      super || I18n.t("decidim.ephemeral_user", locale:)
+    end
+
+    def nickname
+      super || User.nicknamize(name)
+    end
+  end
+end

data/app/forms/decidim/notifications_settings_form.rb

@@ -7,6 +7,7 @@ module Decidim
     mimic :user
 
     attribute :email_on_moderations, Boolean
+    attribute :email_on_assigned_proposals, Boolean
     attribute :newsletter_notifications, Boolean
     attribute :notifications_from_followed, Boolean
     attribute :notifications_from_own_activity, Boolean

data/app/forms/decidim/omniauth_registration_form.rb

@@ -11,6 +11,7 @@ module Decidim
     attribute :provider, String
     attribute :uid, String
     attribute :tos_agreement, Boolean
+    attribute :newsletter, Boolean
     attribute :oauth_signature, String
     attribute :avatar_url, String
     attribute :raw_data, Hash
@@ -21,11 +22,23 @@ module Decidim
     validates :uid, presence: true
 
     def self.create_signature(provider, uid)
-      Digest::MD5.hexdigest("#{provider}-#{uid}-#{Rails.application.secrets.secret_key_base}")
+      Digest::MD5.hexdigest("#{provider}-#{uid}-#{Rails.application.secret_key_base}")
     end
 
     def normalized_nickname
-      UserBaseEntity.nicknamize(nickname || name, current_organization.id)
+      UserBaseEntity.nicknamize(nickname || name, organization: current_organization)
+    end
+
+    def newsletter_at
+      return nil unless newsletter?
+
+      Time.current
+    end
+
+    def valid_tos?
+      return if tos_agreement.nil?
+
+      errors.add :tos_agreement, :accepted
     end
   end
 end

data/app/forms/decidim/registration_form.rb

@@ -37,7 +37,7 @@ module Decidim
     end
 
     def generate_nickname(name, organization)
-      Decidim::UserBaseEntity.nicknamize(name, organization.id)
+      Decidim::UserBaseEntity.nicknamize(name, organization:)
     end
 
     def valid_users

data/app/helpers/concerns/decidim/flash_helper_extensions.rb

@@ -7,6 +7,17 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
+      DEFAULT_KEY_MATCHING = {
+        alert: :alert,
+        notice: :success,
+        info: :info,
+        secondary: :secondary,
+        success: :success,
+        error: :alert,
+        warning: :warning,
+        primary: :primary
+      }.freeze
+
       # Displays the flash messages found in ActionDispatch's +flash+ hash using
       # FoundationRailsHelper's +callout+ component.
       #
@@ -20,7 +31,7 @@ module Decidim
       #
       # @return [String] the HTML with all the flash messages
       def display_flash_messages(closable: true, key_matching: {})
-        key_matching = FoundationRailsHelper::FlashHelper::DEFAULT_KEY_MATCHING.merge(key_matching)
+        key_matching = DEFAULT_KEY_MATCHING.merge(key_matching)
         key_matching.default = :primary
 
         capture do
@@ -106,13 +117,17 @@ module Decidim
       end
 
       def message(value)
-        return content_tag(:div, value, class: "flash__message flex items-center") unless value.is_a?(Hash)
+        return content_tag(:div, value, class: "flash__message") unless value.is_a?(Hash)
 
         content_tag(:div, class: "flash__message") do
           concat value[:title]
           concat content_tag(:span, value[:body], class: "flash__message-body")
         end
       end
+
+      def ignored_key?(key)
+        [:timedout].include?(key)
+      end
     end
   end
 end

data/app/helpers/decidim/action_authorization_helper.rb

@@ -57,26 +57,35 @@ module Decidim
         url = arguments[0]
         html_options = arguments[1]
       else
-        body = content_tag :span, arguments[0]
+        body = arguments[0]
         url = arguments[1]
         html_options = arguments[2]
       end
 
-      html_options ||= {}
+      html_options = (html_options || {}).with_indifferent_access
       resource = html_options.delete(:resource)
       permissions_holder = html_options.delete(:permissions_holder)
+      authorization_status = get_authorization_status(action, resource, permissions_holder)
+      redirect_path = valid_redirect(url, tag:, method: html_options[:method])
+      onboarding_options = onboarding_data_attributes(authorization_status, action, resource, permissions_holder, redirect_path)
 
-      if !current_user
-        html_options = clean_authorized_to_data_open(html_options)
-
+      if sign_in_required?(authorization_status)
+        html_options = clean_authorized_to_data_open(html_options.merge(onboarding_options))
         html_options["data-dialog-open"] = "loginModal"
-        url = "#"
-      elsif action && !action_authorized_to(action, resource:, permissions_holder:).ok?
-        html_options = clean_authorized_to_data_open(html_options)
 
-        html_options["data-dialog-open"] = "authorizationModal"
-        html_options["data-dialog-remote-url"] = modal_path(action, resource)
         url = "#"
+      elsif authorization_status&.ok? == false
+        html_options = clean_authorized_to_data_open(html_options.merge(onboarding_options))
+        if pending_steps?(authorization_status)
+          tag = "link"
+          html_options["method"] = "post"
+          html_options.delete(:remote)
+          url = decidim_verifications.renew_onboarding_data_authorizations_path
+        else
+          html_options["data-dialog-open"] = "authorizationModal"
+          html_options["data-dialog-remote-url"] = modal_path(action, resource, html_options)
+          url = "#"
+        end
       end
 
       html_options["onclick"] = "event.preventDefault();" if url == ""
@@ -84,25 +93,33 @@ module Decidim
       if block
         send("#{tag}_to", url, html_options, &body)
       else
-        send("#{tag}_to", body, url, html_options)
+        send("#{tag}_to", content_tag(:span, body), url, html_options)
       end
     end
     # rubocop: enable Metrics/PerceivedComplexity
 
-    def modal_path(action, resource)
+    def modal_path(action, resource, opts = {})
+      if (default_path = opts.delete(:authorizations_modal_path)).present?
+        return default_path
+      end
+
       resource_params = if resource
                           { resource_name: resource.resource_manifest.name, resource_id: resource.id }
                         else
                           {}
                         end
-      if current_component.present?
-        decidim.authorization_modal_path(authorization_action: action, component_id: current_component&.id, **resource_params)
+
+      component = try(:current_component)
+      if component.present?
+        decidim.authorization_modal_path(authorization_action: action, component_id: component&.id, **resource_params)
       else
         decidim.free_resource_authorization_modal_path(authorization_action: action, **resource_params)
       end
     end
 
     def clean_authorized_to_data_open(html_options)
+      return {} if html_options.blank?
+
       html_options.delete(:"data-dialog-open")
       html_options.delete(:"data-dialog-remote-url")
 
@@ -115,9 +132,53 @@ module Decidim
         html_options[key].delete("open_url")
         html_options[key].delete(:"open-url")
         html_options[key].delete("open-url")
+        html_options[key].delete(:"dialog-open")
+        html_options[key].delete(:"dialog-remote-url")
       end
 
       html_options
     end
+
+    def get_authorization_status(action, resource, permissions_holder)
+      return if action.blank?
+
+      permissions_holder ||= resource.blank? ? try(:current_component) : nil
+      return if permissions_holder.blank? && resource.try(:component).blank?
+
+      action_authorized_to(action, resource:, permissions_holder:)
+    end
+
+    def pending_steps?(authorization_status)
+      authorization_status.pending_authorizations_count.positive? && authorization_status.global_code != :unauthorized
+    end
+
+    def onboarding_data_attributes(authorization_status, action, resource, permissions_holder, redirect_path = nil)
+      return {} if action.blank?
+      return {} unless pending_steps?(authorization_status)
+
+      permissions_holder ||= try(:current_component) if resource.blank?
+      return {} if [resource, permissions_holder].all?(&:blank?)
+
+      {
+        "data-onboarding-model" => resource&.to_gid,
+        "data-onboarding-permissions-holder" => permissions_holder&.to_gid,
+        "data-onboarding-action" => action,
+        "data-onboarding-redirect-path" => redirect_path
+      }.compact
+    end
+
+    def valid_redirect(path, opts = {})
+      return if opts[:tag]&.to_sym == :button
+      return if path == "#"
+      return if opts[:method].present? && opts[:method].to_s != "get"
+
+      path
+    end
+
+    def sign_in_required?(authorization_status)
+      return if current_user.present?
+
+      !authorization_status&.ephemeral?
+    end
   end
 end

data/app/helpers/decidim/amendments_helper.rb

@@ -16,15 +16,6 @@ module Decidim
       cell("decidim/amendable/announcement", emendation)
     end
 
-    # Returns Html action button card to AMEND an amendable resource
-    def amend_button_for(amendable)
-      return unless amendments_enabled? && amendable.amendable?
-      return unless current_component.current_settings.amendment_creation_enabled
-      return unless can_participate_in_private_space?
-
-      cell("decidim/amendable/amend_button_card", amendable)
-    end
-
     # Checks if the user can participate in a participatory space
     # based on its settings related with Decidim::HasPrivateUsers.
     def can_participate_in_private_space?

data/app/helpers/decidim/application_helper.rb

@@ -4,11 +4,15 @@ module Decidim
   # Main module to add application-wide helpers.
   module ApplicationHelper
     include Decidim::OmniauthHelper
-    include Decidim::ScopesHelper
+    include Decidim::DecidimFormHelper
     include Decidim::ContextualHelpHelper
     include Decidim::AmendmentsHelper
     include Decidim::CacheHelper
 
+    def layout_item_classes
+      "layout-item"
+    end
+
     # Truncates a given text respecting its HTML tags.
     #
     # text    - The String text to be truncated.
@@ -99,7 +103,7 @@ module Decidim
     # Renders the cell contents.
     def cell(name, model, options = {}, &)
       options = { context: { view_context: self, current_user: } }.deep_merge(options)
-      super(name, model, options, &)
+      super
     end
 
     def prevent_timeout_seconds

data/app/helpers/decidim/breadcrumb_helper.rb

@@ -56,5 +56,11 @@ module Decidim
         active: active_item.active?
       }
     end
+
+    def render_schema_org_breadcrumb_list(breadcrumb_items)
+      exporter_options = { breadcrumb_items:, base_url: request.base_url, organization_name: current_organization_name }
+      exported_breadcrumb_list = Decidim::Exporters::JSON.new([exporter_options], Decidim::SchemaOrgBreadcrumbListSerializer).export.read
+      JSON.pretty_generate(JSON.parse(exported_breadcrumb_list).first)
+    end
   end
 end

data/app/helpers/decidim/cache_helper.rb

@@ -8,7 +8,7 @@ module Decidim
     def cache(name = {}, options = {}, &)
       name = Array(name) + [current_locale]
 
-      super(name, options, &)
+      super
     end
   end
 end