decidim-core 0.20.1 → 0.21.0

data/app/cells/decidim/navbar_admin_link/show.erb

@@ -0,0 +1,6 @@
+<div class="topbar__admin__link <%= link_class %>">
+  <%= link_to link_url do %>
+    <%= icon link_icon_name %>
+    <span><%= link_name %></span>
+  <% end %>
+</div>

data/app/cells/decidim/navbar_admin_link_cell.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  # This cell renders a link in the top navbar
+  # so admins can easily manage data without having to look for it at the admin
+  # panel when they're at a public page.
+  # example use:
+  #   <%= cell("decidim/navbar_admin_link", { link_url: link_url, link_options: link_options }) %>
+  #
+  class NavbarAdminLinkCell < Decidim::ViewModel
+    include Decidim::IconHelper
+
+    def show
+      render if link_url
+    end
+
+    private
+
+    def link_url
+      return if model[:link_url].blank?
+
+      model[:link_url]
+    end
+
+    def link_icon_name
+      return "pencil" if model[:link_options][:icon].blank?
+
+      model[:link_options][:icon]
+    end
+
+    def link_name
+      return t("layouts.decidim.edit_link.edit") if model[:link_options][:name].blank?
+
+      model[:link_options][:name]
+    end
+
+    def link_class
+      return if model[:link_options][:class].blank?
+
+      model[:link_options][:class]
+    end
+  end
+end

data/app/cells/decidim/tags_cell.rb

@@ -40,7 +40,7 @@ module Decidim
     end
 
     def category_path
-      resource_locator(model).index(filter: { category_id: model.category.id })
+      resource_locator(model).index(filter: { category_id: [model.category.id.to_s] })
     end
 
     def scope?
@@ -56,7 +56,7 @@ module Decidim
     end
 
     def scope_path
-      resource_locator(model).index(filter: { scope_id: model.scope.id })
+      resource_locator(model).index(filter: { scope_id: [model.scope.id] })
     end
   end
 end

data/app/commands/decidim/amendable/accept.rb

@@ -29,6 +29,7 @@ module Decidim
         transaction do
           accept_amendment!
           update_amendable!
+          notify_emendation_state_change!
           notify_amendable_and_emendation_authors_and_followers
         end
 
@@ -37,7 +38,7 @@ module Decidim
 
       private
 
-      attr_reader :form
+      attr_reader :form, :emendation
 
       def accept_amendment!
         @amendment = Decidim.traceability.update!(
@@ -58,14 +59,18 @@ module Decidim
         @amendable.add_coauthor(@amender, user_group: @user_group)
       end
 
+      def notify_emendation_state_change!
+        emendation.process_amendment_state_change!
+      end
+
       def notify_amendable_and_emendation_authors_and_followers
-        affected_users = @emendation.authors + @amendable.notifiable_identities
-        followers = @emendation.followers + @amendable.followers - affected_users
+        affected_users = emendation.authors + @amendable.notifiable_identities
+        followers = emendation.followers + @amendable.followers - affected_users
 
         Decidim::EventsManager.publish(
           event: "decidim.events.amendments.amendment_accepted",
           event_class: Decidim::Amendable::AmendmentAcceptedEvent,
-          resource: @emendation,
+          resource: emendation,
           affected_users: affected_users.uniq,
           followers: followers.uniq
         )

data/app/commands/decidim/amendable/publish_draft.rb

@@ -30,6 +30,7 @@ module Decidim
           set_first_emendation_version
           publish_emendation
           change_amendment_state_to_evaluating
+          notify_emendation_state_change!
           notify_amendable_authors_and_followers
         end
 
@@ -62,6 +63,10 @@ module Decidim
         emendation.amendment.update(state: "evaluating")
       end
 
+      def notify_emendation_state_change!
+        emendation.process_amendment_state_change!
+      end
+
       def notify_amendable_authors_and_followers
         Decidim::EventsManager.publish(
           event: "decidim.events.amendments.amendment_created",

data/app/commands/decidim/amendable/reject.rb

@@ -26,6 +26,7 @@ module Decidim
 
         transaction do
           reject_amendment!
+          notify_emendation_state_change!
           notify_emendation_authors_and_followers
         end
 
@@ -43,6 +44,10 @@ module Decidim
         )
       end
 
+      def notify_emendation_state_change!
+        @emendation.process_amendment_state_change!
+      end
+
       def notify_emendation_authors_and_followers
         affected_users = @emendation.authors + @amendable.notifiable_identities
         followers = @emendation.followers + @amendable.followers - affected_users

data/app/commands/decidim/amendable/withdraw.rb

@@ -26,7 +26,7 @@ module Decidim
 
         transaction do
           withdraw_amendment!
-          withdraw_emendation!
+          notify_emendation_state_change!
         end
 
         broadcast(:ok, emendation)
@@ -45,17 +45,8 @@ module Decidim
         )
       end
 
-      # Unlike other Amendable commands, we need to update the state of the
-      # emendation for the scope Decidim::Proposals::Proposal::expect_withdrawn
-      # to be able to retrieve rejected emendations.
-      #
-      # Because we are modifying the emendation itself, we need to prevent
-      # PaperTrail from creating an additional version to ensure that this
-      # change does not appear in the diff renderer of the emendation page.
-      def withdraw_emendation!
-        PaperTrail.request(enabled: false) do
-          emendation.update!(state: "withdrawn")
-        end
+      def notify_emendation_state_change!
+        emendation.process_amendment_state_change!
       end
     end
   end

data/app/commands/decidim/create_registration.rb

@@ -17,9 +17,12 @@ module Decidim
     #
     # Returns nothing.
     def call
-      return broadcast(:invalid) if form.invalid?
+      if form.invalid?
+        user = User.has_pending_invitations?(form.current_organization.id, form.email)
+        user.invite!(user.invited_by) if user
+        return broadcast(:invalid)
+      end
 
-      delete_pending_invited_user
       create_user
 
       broadcast(:ok, @user)
@@ -31,10 +34,6 @@ module Decidim
 
     attr_reader :form
 
-    def delete_pending_invited_user
-      User.invitation_not_accepted.where(email: form.email).delete_all
-    end
-
     def create_user
       @user = User.create!(
         email: form.email,

data/app/controllers/concerns/decidim/use_organization_time_zone.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  # When included in a controller this concern will wrap any action
+  # in the context of the organization configured time zone
+  module UseOrganizationTimeZone
+    extend ActiveSupport::Concern
+
+    included do
+      around_action :use_organization_time_zone
+      helper_method :organization_time_zone
+
+      # Executes a block of code in the context of the the organization's time zone
+      #
+      # &action - a block of code to be wrapped around the time zone
+      #
+      # Returns nothing.
+      def use_organization_time_zone(&action)
+        Time.use_zone(organization_time_zone, &action)
+      end
+
+      # The current time zone from the organization. Available as a helper for the views.
+      #
+      # Returns a String.
+      def organization_time_zone
+        @organization_time_zone ||= current_organization.time_zone
+      end
+    end
+  end
+end

data/app/controllers/decidim/application_controller.rb

@@ -3,8 +3,11 @@
 module Decidim
   # The main application controller that inherits from Rails.
   class ApplicationController < ::DecidimController
+    include Browser::ActionController
+
     include NeedsOrganization
     include LocaleSwitcher
+    include UseOrganizationTimeZone
     include NeedsPermission
     include PayloadInfo
     include ImpersonateUsers

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

@@ -15,6 +15,7 @@ module Decidim
       helper Decidim::FiltersHelper
       helper Decidim::OrdersHelper
       helper Decidim::ResourceReferenceHelper
+      helper Decidim::ResourceVersionsHelper
       helper Decidim::TranslationsHelper
       helper Decidim::IconHelper
       helper Decidim::ResourceHelper

data/app/controllers/decidim/data_portability_controller.rb

@@ -16,40 +16,33 @@ module Decidim
     def export
       enforce_permission_to :export, :user, current_user: current_user
 
-      DataPortabilityExportJob.perform_later(current_user, export_format)
+      DataPortabilityExportJob.perform_later(current_user)
 
       flash[:notice] = t("decidim.account.data_portability_export.notice")
-
       redirect_back(fallback_location: data_portability_path)
     end
 
     def download_file
       enforce_permission_to :download, :user, current_user: current_user
 
-      if params[:token].present?
-        file_reader = Decidim::DataPortabilityFileReader.new(current_user, params[:token])
-        if file_reader.valid_token?
-          file = File.open(file_reader.file_path)
-          if File.exist?(file)
-            send_file file, type: "application/zip", disposition: "attachment"
-          else
-            flash[:error] = t("decidim.account.data_portability_export.file_no_exists")
-            redirect_to data_portability_path
-          end
-        else
-          flash[:error] = t("decidim.account.data_portability_export.invalid_token")
-          redirect_to data_portability_path
-        end
+      if data_portability_file_exists?
+        redirect_to uploader.url
       else
-        flash[:error] = t("decidim.account.data_portability_export.no_token")
+        flash[:error] = t("decidim.account.data_portability_export.file_no_exists")
         redirect_to data_portability_path
       end
     end
 
     private
 
-    def export_format
-      "CSV"
+    def data_portability_file_exists?
+      uploader.file.exists?
+    rescue StandardError
+      false
+    end
+
+    def uploader
+      current_user.data_portability_file(params[:filename])
     end
   end
 end

data/app/controllers/decidim/devise/omniauth_registrations_controller.rb

@@ -66,7 +66,7 @@ module Decidim
       end
 
       def action_missing(action_name)
-        return send(:create) if devise_mapping.omniauthable? && User.omniauth_providers.include?(action_name.to_sym)
+        return send(:create) if devise_mapping.omniauthable? && current_organization.enabled_omniauth_providers.keys.include?(action_name.to_sym)
 
         raise AbstractController::ActionNotFound, "The action '#{action_name}' could not be found for Decidim::Devise::OmniauthCallbacksController"
       end

data/app/controllers/decidim/devise/registrations_controller.rb

@@ -39,6 +39,7 @@ module Decidim
           end
 
           on(:invalid) do
+            flash.now[:alert] = @form.errors[:base].join(", ") if @form.errors[:base].any?
             render :new
           end
         end

data/app/controllers/decidim/scopes_controller.rb

@@ -8,21 +8,33 @@ module Decidim
     def picker
       enforce_permission_to :pick, :scope
 
-      context = root ? { root: root.id, title: title } : { title: title }
+      context = root ? { root: root.id, title: title, max_depth: max_depth } : { title: title, max_depth: max_depth }
       required = params[:required] && params[:required] != "false"
-      current = (root&.descendants || current_organization.scopes).find_by(id: params[:current]) if params[:current].present?
 
       if current
-        scopes = current.children
+        scopes = current.children unless scope_depth_limit?
         parent_scopes = current.part_of_scopes(root)
       else
-        current = root
-        scopes = root&.children || current_organization.scopes.top_level
+        scopes = root&.children || current_organization.scopes.top_level unless scope_depth_limit?
+
         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 }
+      render(
+        :picker,
+        layout: nil,
+        locals: {
+          required: required,
+          title: title,
+          root: root,
+          current: (current || root),
+          scopes: scopes&.order(name: :asc),
+          parent_scopes: parent_scopes,
+          global_value: params[:global_value],
+          max_depth: max_depth,
+          context: context
+        }
+      )
     end
 
     private
@@ -36,5 +48,27 @@ module Decidim
 
       @root ||= current_organization.scopes.find(params[:root])
     end
+
+    def current
+      return if params[:current].blank?
+
+      @current ||= (root&.descendants || current_organization.scopes).find_by(id: params[:current])
+    end
+
+    def filter_scope_depth?
+      @filter_scope_depth ||= params[:max_depth].present?
+    end
+
+    def scope_depth_limit?
+      return unless filter_scope_depth?
+
+      @scope_depth_limit ||= current&.scope_type == max_depth
+    end
+
+    def max_depth
+      return unless filter_scope_depth?
+
+      @max_depth ||= current_organization.scope_types.find(params[:max_depth])
+    end
   end
 end

data/app/forms/decidim/registration_form.rb

@@ -23,6 +23,7 @@ module Decidim
 
     validate :email_unique_in_organization
     validate :nickname_unique_in_organization
+    validate :no_pending_invitations_exist
 
     def newsletter_at
       return nil unless newsletter?
@@ -39,5 +40,9 @@ module Decidim
     def nickname_unique_in_organization
       errors.add :nickname, :taken if User.no_active_invitation.find_by(nickname: nickname, organization: current_organization).present?
     end
+
+    def no_pending_invitations_exist
+      errors.add :base, I18n.t("devise.failure.invited") if User.has_pending_invitations?(current_organization.id, email)
+    end
   end
 end

data/app/functions/decidim/core/component_finder_base.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # An abstract class with the logic for the GraphQL endpoint for a single component to be searchable.
+    # Normal components (such as Proposal) can inherit from this class and just
+    # add the needed search arguments
+    #
+    # Usually something like:
+    #
+    #   class ProposalFinderHelper < Decidim::Core::ComponentFinderBase
+    #     argument :id, !types.ID, "The ID of the proposal"
+    #   end
+    #
+    # For an example check
+    # decidim-proposals/app/types/decidim/proposals/proposals_type.rb
+    class ComponentFinderBase < GraphQL::Function
+      attr_reader :model_class
+
+      def initialize(model_class:)
+        @model_class = model_class
+      end
+
+      def call(component, args, _ctx)
+        query = { component: component }
+        args.keys.each do |key|
+          query[key] = args[key]
+        end
+        model_class.published.find_by(query)
+      end
+    end
+  end
+end