decidim-core 0.24.3 → 0.25.0.rc1

data/app/models/decidim/content_block_attachment.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  # Attachment can be any type of document or images related to a partcipatory
+  # process.
+  class ContentBlockAttachment < ApplicationRecord
+    include Decidim::HasUploadValidations
+
+    belongs_to :content_block, foreign_key: "decidim_content_block_id", class_name: "Decidim::ContentBlock", inverse_of: :attachments
+
+    has_one_attached :file
+    validates_upload :file
+
+    delegate :attached?, to: :file
+    delegate :organization, :manifest, to: :content_block
+
+    def uploader
+      return if content_block.blank?
+
+      config = manifest.images.find do |image_config|
+        image_config[:name].to_s == name.to_s
+      end
+
+      return if config.blank?
+
+      config[:uploader].constantize
+    end
+
+    def attached_uploader(name)
+      return unless name == :file
+
+      uploader.new(self, :file)
+    end
+  end
+end

data/app/models/decidim/impersonation_log.rb

@@ -25,6 +25,14 @@ module Decidim
       Decidim::AdminLog::ImpersonationLogPresenter
     end
 
+    def ensure_not_expired!
+      expire! if started_at + SESSION_TIME_IN_MINUTES.minutes < Time.current
+    end
+
+    def expire!
+      update!(expired_at: Time.current)
+    end
+
     private
 
     def same_organization

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

@@ -8,6 +8,8 @@ module Decidim
     # a group or a one-to-one conversation.
     #
     class Conversation < ApplicationRecord
+      self.table_name = "decidim_messaging_conversations"
+
       include Decidim::DataPortability
 
       has_many :participations, foreign_key: :decidim_conversation_id,

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

@@ -8,6 +8,8 @@ module Decidim
     # message, namely, the interlocutors of the sender in the conversation.
     #
     class Message < ApplicationRecord
+      self.table_name = "decidim_messaging_messages"
+
       include Decidim::FriendlyDates
 
       belongs_to :sender,

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

@@ -6,6 +6,8 @@ module Decidim
     # Holds a many-to-many relationship between conversations and their participants
     #
     class Participation < ApplicationRecord
+      self.table_name = "decidim_messaging_participations"
+
       belongs_to :conversation,
                  foreign_key: :decidim_conversation_id,
                  class_name: "Decidim::Messaging::Conversation",

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

@@ -8,6 +8,8 @@ module Decidim
     # example, the read/unread status, the deleted/undeleted status, and so on.
     #
     class Receipt < ApplicationRecord
+      self.table_name = "decidim_messaging_receipts"
+
       belongs_to :recipient, foreign_key: "decidim_recipient_id", class_name: "Decidim::User"
       belongs_to :message, foreign_key: "decidim_message_id", class_name: "Decidim::Messaging::Message"
 

data/app/models/decidim/oauth_application.rb

@@ -8,8 +8,8 @@ module Decidim
 
     belongs_to :organization, foreign_key: "decidim_organization_id", class_name: "Decidim::Organization", inverse_of: :oauth_applications
 
-    validates_upload :organization_logo
-    mount_uploader :organization_logo, OAuthApplicationLogoUploader
+    has_one_attached :organization_logo
+    validates_upload :organization_logo, uploader: OAuthApplicationLogoUploader
 
     def owner
       organization

data/app/models/decidim/organization.rb

@@ -29,6 +29,7 @@ module Decidim
     has_many :admins, -> { where(admin: true) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
     has_many :users_with_any_role, -> { where.not(roles: []) }, foreign_key: "decidim_organization_id", class_name: "Decidim::User"
     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
 
@@ -45,20 +46,22 @@ module Decidim
     validates :time_zone, presence: true, time_zone: true
     validates :default_locale, inclusion: { in: :available_locales }
 
-    validates_upload :official_img_header
-    mount_uploader :official_img_header, Decidim::OfficialImageHeaderUploader
+    has_one_attached :official_img_header
+    validates_upload :official_img_header, uploader: Decidim::OfficialImageHeaderUploader
 
-    validates_upload :official_img_footer
-    mount_uploader :official_img_footer, Decidim::OfficialImageFooterUploader
+    has_one_attached :official_img_footer
+    validates_upload :official_img_footer, uploader: Decidim::OfficialImageFooterUploader
 
-    validates_upload :logo
-    mount_uploader :logo, Decidim::OrganizationLogoUploader
+    has_one_attached :logo
+    validates_upload :logo, uploader: Decidim::OrganizationLogoUploader
 
-    validates_upload :favicon
-    mount_uploader :favicon, Decidim::OrganizationFaviconUploader
+    has_one_attached :favicon
+    validates_upload :favicon, uploader: Decidim::OrganizationFaviconUploader
 
-    validates_upload :highlighted_content_banner_image
-    mount_uploader :highlighted_content_banner_image, ImageUploader
+    has_one_attached :highlighted_content_banner_image
+    validates_upload :highlighted_content_banner_image, uploader: Decidim::ImageUploader
+
+    has_one_attached :open_data_file
 
     def self.log_presenter_class_for(_log)
       Decidim::AdminLog::OrganizationPresenter
@@ -121,13 +124,6 @@ module Decidim
       !users_registration_mode_disabled?
     end
 
-    def open_data_file
-      @open_data_file ||= OpenDataUploader.new(self).tap do |uploader|
-        uploader.retrieve_from_store! open_data_file_path
-        uploader.cache! open_data_file_path
-      end
-    end
-
     def open_data_file_path
       "#{host}-open-data.zip"
     end
@@ -174,9 +170,9 @@ module Decidim
         Decidim::OmniauthProvider.extract_provider_key(key)
       end.compact.uniq
 
-      Hash[tenant_enabled_providers_keys.map do |key|
-        [key, omniauth_provider_settings(key)]
-      end]
+      tenant_enabled_providers_keys.index_with do |key|
+        omniauth_provider_settings(key)
+      end
     end
 
     def omniauth_provider_settings(provider)

data/app/models/decidim/user.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_dependency "devise/models/decidim_validatable"
-require_dependency "devise/models/decidim_newsletterable"
+require "devise/models/decidim_validatable"
+require "devise/models/decidim_newsletterable"
 require "valid_email2"
 
 module Decidim
@@ -22,11 +22,12 @@ module Decidim
     end
 
     devise :invitable, :database_authenticatable, :registerable, :confirmable, :timeoutable,
-           :recoverable, :rememberable, :trackable, :lockable,
+           :recoverable, :trackable, :lockable,
            :decidim_validatable, :decidim_newsletterable,
            :omniauthable, omniauth_providers: Decidim::OmniauthProvider.available.keys,
                           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
@@ -49,7 +50,10 @@ module Decidim
 
     validate :all_roles_are_valid
 
-    mount_uploader :avatar, Decidim::AvatarUploader
+    has_one_attached :avatar
+    validates_upload :avatar, uploader: Decidim::AvatarUploader
+
+    has_one_attached :data_portability_file
 
     scope :not_deleted, -> { where(deleted_at: nil) }
 
@@ -229,14 +233,6 @@ module Decidim
       extended_data["user_name"] || name
     end
 
-    # Caches a Decidim::DataPortabilityUploader with the retrieved file.
-    def data_portability_file(filename)
-      @data_portability_file ||= DataPortabilityUploader.new(self).tap do |uploader|
-        uploader.retrieve_from_store!(filename)
-        uploader.cache!(filename)
-      end
-    end
-
     # return the groups where this user has been accepted
     def accepted_user_groups
       UserGroups::AcceptedUserGroups.for(self)
@@ -256,6 +252,14 @@ module Decidim
       save!
     end
 
+    ransacker :invitation_accepted_at do
+      Arel.sql(%{("decidim_users"."invitation_accepted_at")::text})
+    end
+
+    ransacker :last_sign_in_at do
+      Arel.sql(%{("decidim_users"."last_sign_in_at")::text})
+    end
+
     protected
 
     # Overrides devise email required validation.

data/app/models/decidim/user_base_entity.rb

@@ -20,8 +20,8 @@ module Decidim
     # Regex for name & nickname format validations
     REGEXP_NAME = /\A(?!.*[<>?%&\^*#@()\[\]=+:;"{}\\|])/.freeze
 
-    validates_avatar
-    mount_uploader :avatar, Decidim::AvatarUploader
+    has_one_attached :avatar
+    validates_avatar :avatar, uploader: Decidim::AvatarUploader
 
     validates :name, format: { with: REGEXP_NAME }
 

data/app/models/decidim/user_group.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_dependency "devise/models/decidim_validatable"
+require "devise/models/decidim_validatable"
 require "valid_email2"
 
 module Decidim
@@ -10,6 +10,7 @@ module Decidim
     include Decidim::DataPortability
     include Decidim::ActsAsAuthor
     include Decidim::UserReportable
+    include Decidim::Searchable
 
     has_many :memberships, class_name: "Decidim::UserGroupMembership", foreign_key: :decidim_user_group_id, dependent: :destroy
     has_many :users, through: :memberships, class_name: "Decidim::User", foreign_key: :decidim_user_id
@@ -25,6 +26,9 @@ module Decidim
     validate :correct_state
     validate :unique_document_number, if: :has_document_number?
 
+    has_one_attached :avatar
+    validates_upload :avatar, uploader: Decidim::AvatarUploader
+
     devise :confirmable, :decidim_validatable, confirmation_keys: [:decidim_organization_id, :email]
 
     scope :verified, -> { where.not("extended_data->>'verified_at' IS ?", nil) }
@@ -32,6 +36,16 @@ module Decidim
     scope :rejected, -> { where.not("extended_data->>'rejected_at' IS ?", nil) }
     scope :pending, -> { where("extended_data->>'rejected_at' IS ? AND extended_data->>'verified_at' IS ?", nil, nil) }
 
+    searchable_fields(
+      {
+        organization_id: :decidim_organization_id,
+        A: :name,
+        datetime: :created_at
+      },
+      index_on_create: ->(user_group) { !user_group.deleted? },
+      index_on_update: ->(user_group) { !user_group.deleted? }
+    )
+
     def self.with_document_number(organization, number)
       where(decidim_organization_id: organization.id)
         .where("extended_data->>'document_number' = ?", number)
@@ -66,6 +80,11 @@ module Decidim
       verified_at.blank? && rejected_at.blank?
     end
 
+    # Check if the group has been deleted or not
+    def deleted?
+      deleted_at.present?
+    end
+
     def self.user_collection(user)
       user.user_groups
     end

data/app/packs/entrypoints/decidim_conference_diploma.js

@@ -0,0 +1,2 @@
+// CSS
+import "entrypoints/decidim_conference_diploma.scss"

data/app/packs/entrypoints/decidim_conference_diploma.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/conference-diploma.scss";

data/app/packs/entrypoints/decidim_core.js

@@ -0,0 +1,69 @@
+/* eslint no-unused-vars: 0 */
+/* eslint id-length: ["error", { "exceptions": ["$"] }] */
+
+import $ from "jquery"
+import Quill from "quill"
+import Rails from "@rails/ujs"
+
+import "core-js/stable";
+import "regenerator-runtime/runtime";
+import morphdom from "morphdom"
+// Export variable to make it available in .js.erb templates
+window.morphdom = morphdom
+import "src/decidim/vendor/foundation-datepicker"
+import "src/decidim/foundation_datepicker_locales"
+import "src/decidim/vendor/modernizr"
+import "social-share-button"
+
+import "src/decidim/input_tags"
+import "src/decidim/input_hashtags"
+import "src/decidim/input_mentions"
+import "src/decidim/input_multiple_mentions"
+import "src/decidim/input_character_counter"
+import "src/decidim/input_autojump"
+import "src/decidim/index"
+import "src/decidim/history"
+import "src/decidim/callout"
+import "src/decidim/clipboard"
+import "src/decidim/append_elements"
+import "src/decidim/user_registrations"
+import "src/decidim/account_form"
+import "src/decidim/data_picker"
+import "src/decidim/dropdowns_menus"
+import "src/decidim/append_redirect_url_to_modals"
+import "src/decidim/form_validator"
+import "src/decidim/ajax_modals"
+import "src/decidim/conferences"
+import "src/decidim/tooltip_keep_on_hover"
+import "src/decidim/diff_mode_dropdown"
+import "src/decidim/conversations"
+import "src/decidim/delayed"
+import "src/decidim/icon"
+import "src/decidim/vizzs"
+import "src/decidim/responsive_horizontal_tabs"
+import "src/decidim/security/selfxss_warning"
+import "src/decidim/session_timeouter"
+import "src/decidim/configuration"
+import "src/decidim/floating_help"
+import "src/decidim/confirm"
+import "src/decidim/comments/comments"
+import "src/decidim/results_listing"
+import "src/decidim/represent_user_group"
+import "src/decidim/impersonation"
+import "src/decidim/start_conversation_dialog"
+import "src/decidim/notifications"
+import "src/decidim/identity_selector_dialog"
+import "src/decidim/gallery"
+
+// CSS
+import "entrypoints/decidim_core.scss"
+
+// Import from the Rails instance application
+import "src/decidim/decidim_application"
+
+// Images
+require.context("../images", true)
+
+// This needs to be loaded after confirm dialog to bind properly
+Rails.start()
+

data/app/packs/entrypoints/decidim_core.scss

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

data/app/packs/entrypoints/decidim_email.js

@@ -0,0 +1 @@
+import "entrypoints/decidim_email.scss";

data/app/packs/entrypoints/decidim_email.scss

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

data/app/packs/entrypoints/decidim_geocoding_provider_here.js

@@ -0,0 +1 @@
+import "src/decidim/geocoding/provider/here"

data/app/packs/entrypoints/decidim_geocoding_provider_photon.js

@@ -0,0 +1 @@
+import "src/decidim/geocoding/provider/photon"

data/app/packs/entrypoints/decidim_map.js

@@ -0,0 +1 @@
+import "entrypoints/decidim_map.scss";

data/app/packs/entrypoints/decidim_map.scss

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

data/app/packs/entrypoints/decidim_map_provider_default.js

@@ -0,0 +1,2 @@
+import "src/decidim/map/provider/default"
+import "src/decidim/map"

data/app/packs/entrypoints/decidim_map_provider_here.js

@@ -0,0 +1,2 @@
+import "src/decidim/map/provider/here"
+import "src/decidim/map"

data/app/packs/entrypoints/decidim_widget.js

@@ -0,0 +1 @@
+import "src/decidim/widget"