decidim-core 0.30.3 → 0.31.0.rc2

data/app/models/decidim/messaging/conversation.rb

@@ -64,11 +64,11 @@ module Decidim
       # Initiates a conversation between a user and a set of interlocutors with
       # an initial message.
       #
-      # @param originator [Decidim::UserBaseEntity] The user or group starting the conversation
+      # @param originator [Decidim::UserBaseEntity] The user starting the conversation
       # @param interlocutors [Array<Decidim::User>] The set of interlocutors in
       #   the conversation (not including the originator).
       # @param body [String] The content of the initial message
-      # @param user [Decidim::User] The user starting the conversation in case originator is a group
+      # @param user [Decidim::User] The user starting the conversation
       #
       # @return [Decidim::Messaging::Conversation] The newly created conversation
       #
@@ -97,7 +97,7 @@ module Decidim
       #
       # @param sender [Decidim::UserBaseEntity] The sender of the message
       # @param body [String] The content of the message
-      # @param user [Decidim::User] The user sending the message in case sender is a group
+      # @param user [Decidim::User] The user sending the message
       #
       # @return [Decidim::Messaging::Message] The newly created message
       #
@@ -126,7 +126,6 @@ module Decidim
       # @return Boolean
       #
       def accept_user?(user)
-        # if user is a group, members are accepted
         blocked = interlocutors(user).detect { |participant| !participant.accepts_conversation?(user) }
         blocked.blank?
       end
@@ -142,7 +141,6 @@ module Decidim
 
       #
       # Given a user, returns if the user is participating in the conversation
-      # for groups being part of a conversation all their admin member are accepted
       #
       # @return Boolean
       #

data/app/models/decidim/messaging/message.rb

@@ -37,11 +37,8 @@ module Decidim
       # including also a receipt for the remittant (sender) of the message.
       # Receipts are unread by default, except for the sender's receipt.
       #
-      # If the sender is a UserGroup then receipts will be created for its managers
-      # a "from" user can be specified to avoid create a receipt for the real user sending the message
-      #
-      # @param recipients [Array<Decidim::UserBaseEntity>] Users or groups receiving the message
-      # @param from [Array<Decidim::User>] the user sending the message in case sender is a group
+      # @param recipients [Array<Decidim::UserBaseEntity>] Users receiving the message
+      # @param from [Array<Decidim::User>] the user sending the message
       #
       def envelope_for(recipients:, from: nil)
         @from = sender.is_a?(User) ? sender : from
@@ -49,7 +46,7 @@ module Decidim
 
         receipts.build(recipient: @from, read_at: Time.current) if @from.is_a?(User)
 
-        all_recipients(recipients).each do |recipient|
+        recipients.each do |recipient|
           next if @already_notified.include?(recipient)
 
           receipts.build(recipient:)
@@ -64,15 +61,6 @@ module Decidim
 
       private
 
-      # returns all possible recipients from a list of users or groups
-      def all_recipients(recipients)
-        users = recipients.flat_map do |recipient|
-          recipient.is_a?(UserGroup) ? recipient.managers : recipient
-        end
-        users += sender.managers if sender.is_a?(UserGroup)
-        users
-      end
-
       def sender_is_participant
         errors.add(:sender, :invalid) unless conversation.participants.include?(sender)
       end

data/app/models/decidim/omniauth_provider.rb

@@ -3,7 +3,7 @@
 module Decidim
   class OmniauthProvider
     def self.available
-      Rails.application.secrets[:omniauth] || {}
+      Decidim.omniauth_providers
     end
 
     def self.enabled

data/app/models/decidim/organization.rb

@@ -15,9 +15,8 @@ module Decidim
     SOCIAL_HANDLERS = [:twitter, :facebook, :instagram, :youtube, :github].freeze
     AVAILABLE_MACHINE_TRANSLATION_DISPLAY_PRIORITIES = %w(original translation).freeze
 
-    translatable_fields :name, :description, :cta_button_text, :omnipresent_banner_title, :omnipresent_banner_short_description,
-                        :highlighted_content_banner_title, :highlighted_content_banner_short_description, :highlighted_content_banner_action_title,
-                        :highlighted_content_banner_action_subtitle, :welcome_notification_subject, :welcome_notification_body, :id_documents_explanation_text,
+    translatable_fields :name, :description, :omnipresent_banner_title, :omnipresent_banner_short_description,
+                        :welcome_notification_subject, :welcome_notification_body, :id_documents_explanation_text,
                         :admin_terms_of_service_body
 
     has_many :static_pages, foreign_key: "decidim_organization_id", class_name: "Decidim::StaticPage", inverse_of: :organization, dependent: :destroy
@@ -31,7 +30,6 @@ module Decidim
     has_many :users, foreign_key: "decidim_organization_id", class_name: "Decidim::User", dependent: :destroy
     has_many :user_entities, foreign_key: "decidim_organization_id", class_name: "Decidim::UserBaseEntity", dependent: :destroy
     has_many :oauth_applications, foreign_key: "decidim_organization_id", class_name: "Decidim::OAuthApplication", inverse_of: :organization, dependent: :destroy
-    has_many :hashtags, foreign_key: "decidim_organization_id", class_name: "Decidim::Hashtag", dependent: :destroy
 
     has_many :templates, foreign_key: "decidim_organization_id", class_name: "Decidim::Templates::Template", dependent: :destroy if defined? Decidim::Templates
 
@@ -41,7 +39,7 @@ module Decidim
     #  enabled: Users registration and sign in are enabled (default value).
     #  existing: Users cannot be registered in the system. Only existing users can sign in.
     #  disable: Users cannot register or sign in.
-    enum users_registration_mode: [:enabled, :existing, :disabled], _prefix: true
+    enum :users_registration_mode, [:enabled, :existing, :disabled], prefix: true
 
     validates :host, uniqueness: true
     validates :reference_prefix, presence: true
@@ -57,9 +55,6 @@ module Decidim
     has_one_attached :favicon
     validates_upload :favicon, uploader: Decidim::OrganizationFaviconUploader
 
-    has_one_attached :highlighted_content_banner_image
-    validates_upload :highlighted_content_banner_image, uploader: Decidim::ImageUploader
-
     has_many_attached :open_data_files
 
     validate :unique_name

data/app/models/decidim/participatory_space_role_config/{valuator.rb → evaluator.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module ParticipatorySpaceRoleConfig
-    class Valuator < Base
+    class Evaluator < Base
       def accepted_components
         [:proposals]
       end

data/app/models/decidim/reminder_record.rb

@@ -7,6 +7,6 @@ module Decidim
     belongs_to :reminder, foreign_key: "decidim_reminder_id", class_name: "Decidim::Reminder"
     belongs_to :remindable, foreign_type: "remindable_type", polymorphic: true, optional: true
 
-    enum state: STATES
+    enum :state, STATES
   end
 end

data/app/models/decidim/searchable_resource.rb

@@ -36,5 +36,21 @@ module Decidim
                       tsearch: { prefix: true }
                     },
                     order_within_rank: "datetime DESC"
+
+    pg_search_scope :autocomplete_search,
+                    against: :content_a,
+                    using: {
+                      tsearch: { prefix: true }
+                    },
+                    order_within_rank: "datetime DESC"
+
+    # Returns the global ID of the resource.
+    def resource_global_id
+      URI::GID.build(
+        app: GlobalID.app,
+        model_name: resource_type,
+        model_id: resource_id
+      ).to_s
+    end
   end
 end

data/app/models/decidim/taxonomy.rb

@@ -53,7 +53,7 @@ module Decidim
     }
 
     scope :part_of, lambda { |id|
-      where("part_of @> ARRAY[?]", id.to_i)
+      where("part_of @> ARRAY[?]::integer[]", id.to_i)
     }
 
     def self.log_presenter_class_for(_log)
@@ -99,6 +99,10 @@ module Decidim
       Taxonomy.reset_counters(id, :children_count, :taxonomizations_count, :taxonomy_filters_count, :taxonomy_filter_items_count)
     end
 
+    def presenter
+      Decidim::TaxonomyPresenter.new(self)
+    end
+
     private
 
     def set_default_weight
@@ -109,6 +113,7 @@ module Decidim
 
     def forbid_cycles
       return unless parent_id
+      return if parent.part_of.compact_blank.empty?
 
       errors.add(:parent_id, :invalid) if parent.part_of.include?(id)
     end

data/app/models/decidim/user.rb

@@ -21,15 +21,13 @@ module Decidim
 
     devise :invitable, :database_authenticatable, :registerable, :confirmable, :timeoutable,
            :recoverable, :trackable, :lockable,
-           :decidim_validatable, :decidim_newsletterable,
-           :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys,
+           :decidim_validatable, :decidim_newsletterable, :jwt_authenticatable,
+           :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys, jwt_revocation_strategy: Decidim::Api::JwtDenylist,
                           request_keys: [:env], reset_password_keys: [:decidim_organization_id, :email],
                           confirmation_keys: [:decidim_organization_id, :email]
     devise :rememberable if Decidim.enable_remember_me
 
     has_many :identities, foreign_key: "decidim_user_id", class_name: "Decidim::Identity", dependent: :destroy
-    has_many :memberships, class_name: "Decidim::UserGroupMembership", foreign_key: :decidim_user_id, dependent: :destroy
-    has_many :user_groups, through: :memberships, class_name: "Decidim::UserGroup", foreign_key: :decidim_user_group_id
     has_many :access_grants, class_name: "Doorkeeper::AccessGrant", foreign_key: :resource_owner_id, dependent: :destroy
     has_many :access_tokens, class_name: "Doorkeeper::AccessToken", foreign_key: :resource_owner_id, dependent: :destroy
     has_many :reminders, foreign_key: "decidim_user_id", class_name: "Decidim::Reminder", dependent: :destroy
@@ -59,7 +57,17 @@ module Decidim
 
     scope :org_admins_except_me, ->(user) { where(organization: user.organization, admin: true).where.not(id: user.id) }
 
-    scope :ephemeral, -> { where("extended_data @> ?", Arel.sql({ ephemeral: true }.to_json)) }
+    scope :ephemeral, -> { where("extended_data @> ?", { ephemeral: true }.to_json) }
+
+    scope :with_inactivity_notification, lambda {
+      where("extended_data ? 'inactivity_notification'")
+    }
+
+    scope :active_after_notification, lambda {
+      where("current_sign_in_at > (extended_data->'inactivity_notification'->>'sent_at')::timestamp")
+    }
+    scope :user_group, -> { where("#{arel_table.name}.extended_data @> ?", { group: true }.to_json) }
+    scope :not_user_group, -> { where.not("#{arel_table.name}.extended_data @> ?", { group: true }.to_json) }
 
     attr_accessor :newsletter_notifications
 
@@ -95,6 +103,21 @@ module Decidim
       invitation_not_accepted.find_by(decidim_organization_id: organization_id, email:)
     end
 
+    # Returns users eligible for receiving the first inactivity warning email.
+    def self.first_warning_inactive_users
+      InactiveUsersQuery.new(self).for_first_warning(Decidim.first_warning_inactive_users_after_days.days.ago)
+    end
+
+    # Returns users eligible for receiving the final inactivity warning email.
+    def self.last_warning_inactive_users
+      InactiveUsersQuery.new(self).for_last_warning(Decidim.last_warning_inactive_users_after_days.days.ago)
+    end
+
+    # Returns users eligible for account removal due to prolonged inactivity.
+    def self.removable_users
+      InactiveUsersQuery.new(self).for_removal(Decidim.delete_inactive_users_last_warning_days_before.days.ago)
+    end
+
     # Returns the presenter for this author, to be used in the views.
     # Required by ActsAsAuthor.
     def presenter
@@ -135,6 +158,10 @@ module Decidim
       !officialized_at.nil?
     end
 
+    def group?
+      extended_data["group"]
+    end
+
     def follows?(followable)
       Decidim::Follow.where(user: self, followable:).any?
     end
@@ -207,16 +234,6 @@ module Decidim
       extended_data["user_name"] || name
     end
 
-    # return the groups where this user has been accepted
-    def accepted_user_groups
-      UserGroups::AcceptedUserGroups.for(self)
-    end
-
-    # return the groups where this user has admin permissions
-    def manageable_user_groups
-      UserGroups::ManageableUserGroups.for(self)
-    end
-
     def authenticatable_salt
       "#{super}#{session_token}"
     end

data/app/models/decidim/user_base_entity.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Decidim
-  # This class serves as a base class for `Decidim::User` and `Decidim::UserGroup`
+  # This class serves as a base class for `Decidim::User`
   # so that we can set some shared logic.
   # This class is not supposed to be used directly.
   class UserBaseEntity < ApplicationRecord
@@ -56,7 +56,7 @@ module Decidim
     end
 
     def public_users_followings
-      # To include users and groups self.class is not valid because for a user
+      # To include any base entity self.class is not valid because for a user
       # self.class.joins(:follows)... only return users
       @public_users_followings ||= users_followings.not_blocked
     end

data/app/packs/entrypoints/decidim_conference_diploma.scss

@@ -1,3 +1,3 @@
-// Since the following resource contains url() stuff, webpacker does not resolve as it should the inner paths
+// Since the following resource contains url() stuff, shakapacker does not resolve as it should the inner paths
 // (it misses "file-loader" webpack plugin). Therefore, we need to keep this file separate from the JS entrypoint
-@import "stylesheets/decidim/legacy/conference-diploma.scss";
+@use "stylesheets/decidim/legacy/conference-diploma";

data/app/packs/entrypoints/decidim_core.scss

@@ -1,3 +1,3 @@
-// Since the following resource contains url() stuff, webpacker does not resolve as it should the inner paths
+// Since the following resource contains url() stuff, shakapacker does not resolve as it should the inner paths
 // (it misses "file-loader" webpack plugin). Therefore, we need to keep this file separate from the JS entrypoint
-@import "stylesheets/decidim/application.scss";
+@use "stylesheets/decidim/application";

data/app/packs/entrypoints/decidim_editor.js

@@ -1,7 +1,3 @@
-import createEditor from "src/decidim/editor";
-
 // CSS
 import "stylesheets/decidim/editor.scss"
 
-// Global exports
-window.createEditor = createEditor;

data/app/packs/entrypoints/decidim_map.scss

@@ -1,3 +1,3 @@
-// Since the following resource contains url() stuff, webpacker does not resolve as it should the inner paths
+// Since the following resource contains url() stuff, shakapacker does not resolve as it should the inner paths
 // (it misses "file-loader" webpack plugin). Therefore, we need to keep this file separate from the JS entrypoint
-@import "stylesheets/decidim/map.scss";
+@use "stylesheets/decidim/map";

data/app/packs/entrypoints/decidim_overrides.scss

@@ -1,2 +1,2 @@
 // Application specific styles: https://docs.decidim.org/en/customize/styles/
-@import "stylesheets/decidim/decidim_application";
+@use "stylesheets/decidim/decidim_application";

data/app/packs/entrypoints/decidim_qr.js

@@ -0,0 +1 @@
+import "stylesheets/decidim/qr.scss"