decidim-core 0.32.0.rc3 → 0.32.0

data/lib/decidim/command.rb

@@ -54,7 +54,7 @@ module Decidim
     protected
 
     def event_arguments
-      raise "#{self.class} must implement #event_arguments"
+      raise "#{self.class} must implement #event_arguments (passed to #{event_namespace})"
     end
 
     def event_namespace

data/lib/decidim/core/content_blocks/registry_manager.rb

@@ -45,11 +45,11 @@ module Decidim
             ]
 
             content_block.settings do |settings|
-              settings.attribute :title, type: :text, translated: true
+              settings.attribute :title, type: :text, translated: true, required: true
               settings.attribute :short_description, type: :text, translated: true
-              settings.attribute :action_button_title, type: :text, translated: true
-              settings.attribute :action_button_subtitle, type: :text, translated: true
-              settings.attribute :action_button_url, type: :text
+              settings.attribute :action_button_title, type: :text, translated: true, required: true
+              settings.attribute :action_button_subtitle, type: :text, translated: true, required: true
+              settings.attribute :action_button_url, type: :text, required: true
             end
 
             content_block.default!

data/lib/decidim/core/engine.rb

@@ -463,6 +463,14 @@ module Decidim
         end
       end
 
+      initializer "decidim_core.delete_account" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.destroy_account:after") do |_event_name, data|
+            Decidim::DeleteUserMailer.delete(user_email: data[:user_email], user_name: data[:user_name], locale: data[:locale], organization: data[:organization]).deliver_later
+          end
+        end
+      end
+
       initializer "decidim_core.add_cells_view_paths" do
         Cell::ViewModel.view_paths << Rails.root.join("app/views") # for partials
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Core::Engine.root}/app/cells")

data/lib/decidim/core/test/factories.rb

@@ -85,6 +85,8 @@ FactoryBot.define do
     "#{Faker::Lorem.sentence(word_count: 1, supplemental: true, random_words_to_add: 3)} #{n}"
   end
 
+  sequence(:component_position)
+
   factory :category, class: "Decidim::Category" do
     transient do
       skip_injection { false }
@@ -469,6 +471,7 @@ FactoryBot.define do
     manifest_name { "dummy" }
     published_at { Time.current }
     deleted_at { nil }
+    weight { generate(:component_position) }
     settings do
       {
         dummy_global_translatable_text: generate_localized_title(:dummy_global_translatable_text, skip_injection:),

data/lib/decidim/core/test/shared_examples/admin_resource_gallery_examples.rb

@@ -87,7 +87,7 @@ end
 
 shared_examples "admin creates resource gallery" do
   context "when uploading images" do
-    let(:uploaded_photos) do
+    let(:uploaded_attachments) do
       [
         {
           title: "Picture of the city",
@@ -99,10 +99,10 @@ shared_examples "admin creates resource gallery" do
         }
       ]
     end
-    let(:photos) { [] }
+    let(:current_attachments) { [] }
 
     it "creates a gallery for the resource" do
-      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_photos.count)
+      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_attachments.count)
 
       resource = resource_class.last
       expect(resource.photos.count).to eq(2)
@@ -111,7 +111,7 @@ shared_examples "admin creates resource gallery" do
     end
 
     context "when gallery is left blank" do
-      let(:uploaded_photos) { [] }
+      let(:uploaded_attachments) { [] }
 
       it "broadcasts ok" do
         expect { command.call }.to broadcast(:ok)
@@ -122,7 +122,7 @@ end
 
 shared_examples "admin manages resource gallery" do
   context "when managing images" do
-    let(:uploaded_photos) do
+    let(:uploaded_attachments) do
       [
         {
           title: "Picture of the city",
@@ -134,10 +134,10 @@ shared_examples "admin manages resource gallery" do
         }
       ]
     end
-    let(:photos) { [] }
+    let(:current_attachments) { [] }
 
     it "creates a gallery for the resource" do
-      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_photos.count)
+      expect { command.call }.to change(Decidim::Attachment, :count).by(uploaded_attachments.count)
       resource = resource_class.last
       expect(resource.photos.count).to eq(2)
       last_attachment = Decidim::Attachment.last
@@ -145,7 +145,7 @@ shared_examples "admin manages resource gallery" do
     end
 
     context "when gallery is left blank" do
-      let(:uploaded_photos) { [] }
+      let(:uploaded_attachments) { [] }
 
       it "broadcasts ok" do
         expect { command.call }.to broadcast(:ok)
@@ -155,8 +155,8 @@ shared_examples "admin manages resource gallery" do
     context "when images are removed" do
       let!(:image1) { create(:attachment, :with_image, attached_to: resource) }
       let!(:image2) { create(:attachment, :with_image, attached_to: resource) }
-      let(:uploaded_photos) { [] }
-      let(:current_photos) { [image1] }
+      let(:uploaded_attachments) { [] }
+      let(:current_attachments) { [image1.id] }
 
       it "to decrease the number of photos in the gallery" do
         expect(resource.attachments.count).to eq(2)

data/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -990,16 +990,16 @@ shared_examples "comments" do
         let(:content) { "A valid user mention: @#{mentioned_user.nickname}" }
 
         context "when text finish with a mention" do
-          it "shows the tribute container" do
-            expect(page).to have_css(".tribute-container", text: mentioned_user.name, wait: 10)
+          it "shows the suggestions menu" do
+            expect(page).to have_css(".editor-suggestions-item", text: "@#{mentioned_user.nickname} (#{mentioned_user.name})", wait: 10)
           end
         end
 
         context "when text contains a mention" do
           let(:content) { "A valid user mention: @#{mentioned_user.nickname}." }
 
-          it "shows the tribute container" do
-            expect(page).to have_no_css(".tribute-container", text: mentioned_user.name)
+          it "hides the suggestions menu" do
+            expect(page).to have_no_css(".editor-suggestions-item", text: "@#{mentioned_user.nickname} (#{mentioned_user.name})")
           end
         end
       end
@@ -1008,8 +1008,8 @@ shared_examples "comments" do
         let!(:mentioned_user) { create(:user, organization:) }
         let(:content) { "A unconfirmed user mention: @#{mentioned_user.nickname}" }
 
-        it "do not show the tribute container" do
-          expect(page).to have_no_css(".tribute-container", text: mentioned_user.name)
+        it "does not show the suggestions menu" do
+          expect(page).to have_no_css(".editor-suggestions-item", text: "@#{mentioned_user.nickname} (#{mentioned_user.name})")
         end
       end
     end

data/lib/decidim/core/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.32.0.rc3"
+      "0.32.0"
     end
   end
 end

data/lib/decidim/map/autocomplete.rb

@@ -37,19 +37,20 @@ module Decidim
           template.snippets.add(:decidim_geocoding_scripts, template.append_javascript_pack_tag("decidim_geocoding"))
           template.snippets.add(:decidim_geocoding_styles, template.append_stylesheet_pack_tag("decidim_geocoding"))
 
-          template.content_tag(:div, class: "geocoding-container") do
+          template.content_tag(:div, class: "geocoding") do
             template.text_field(
               object_name,
               method,
               options.merge("data-decidim-geocoding" => view_options.to_json)
             ) +
-              template.content_tag(:div, class: "input-group-button user-device-location") do
-                template.content_tag(:button, class: "button button__sm md:button__sm button__text-secondary", type: "button", data: {
+              template.content_tag(:div, class: "input-group-button geocoding__locate") do
+                template.content_tag(:button, class: "button button__sm md:button__sm button__text-secondary geocoding__button", type: "button", data: {
                                        input: "#{object_name}_#{method}",
                                        latitude: "#{object_name}_latitude",
                                        longitude: "#{object_name}_longitude",
                                        error_no_location: I18n.t("errors.no_device_location", scope: "decidim.proposals.forms"),
                                        error_unsupported: I18n.t("errors.device_not_supported", scope: "decidim.proposals.forms"),
+                                       locating_text: I18n.t("locating", scope: "decidim.proposals.forms"),
                                        url: Decidim::Core::Engine.routes.url_helpers.locate_path
                                      }) do
                   icon("map-pin-line", role: "img", "aria-hidden": true) + " #{I18n.t("use_my_location", scope: "decidim.proposals.forms")}"

data/lib/decidim/searchable.rb

@@ -117,6 +117,11 @@ module Decidim
             searchables_in_org.find_each do |sr|
               next if sr.blank?
 
+              unless sr.locale.in?(org.available_locales)
+                sr.destroy
+                next
+              end
+
               sr.update(contents_to_searchable_resource_attributes(fields, sr.locale))
             end
           end

data/lib/decidim/view_model.rb

@@ -83,7 +83,7 @@ module Decidim
     end
 
     def perform_caching?
-      cache_hash.present?
+      super && cache_hash.present?
     end
 
     def cache_hash

data/lib/tasks/decidim_mailers_tasks.rake

@@ -4,20 +4,42 @@ namespace :decidim do
   namespace :mailers do
     desc "Sends the notification digest email with the daily report"
     task notifications_digest_daily: :environment do
-      notifications_digest(:daily)
+      time = Time.now.utc
+      target_users = Decidim::User.where(notifications_sending_frequency: :daily)
+
+      target_users.find_in_batches do |batch|
+        notification_users =
+          Decidim::Notification
+          .daily(time)
+          .where(decidim_user_id: batch.pluck(:id))
+          .select(:decidim_user_id)
+          .distinct
+          .pluck(:decidim_user_id)
+
+        notification_users.each do |user_id|
+          Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user_id, :daily, time:)
+        end
+      end
     end
 
     desc "Sends the notification digest email with the weekly report"
     task notifications_digest_weekly: :environment do
-      notifications_digest(:weekly)
-    end
-  end
+      time = Time.now.utc
+      target_users = Decidim::User.where(notifications_sending_frequency: :weekly)
+
+      target_users.find_in_batches do |batch|
+        notification_users =
+          Decidim::Notification
+          .weekly(time)
+          .where(decidim_user_id: batch.pluck(:id))
+          .select(:decidim_user_id)
+          .distinct
+          .pluck(:decidim_user_id)
 
-  def notifications_digest(frequency)
-    target_users = Decidim::User.where(notifications_sending_frequency: frequency)
-    time = Time.now.utc
-    target_users.find_each do |user|
-      Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user.id, frequency, time:)
+        notification_users.each do |user_id|
+          Decidim::EmailNotificationsDigestGeneratorJob.perform_later(user_id, :weekly, time:)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.32.0.rc3
+  version: 0.32.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -893,28 +893,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1256,7 +1256,6 @@ files:
 - app/commands/decidim/delete_follow.rb
 - app/commands/decidim/destroy_account.rb
 - app/commands/decidim/destroy_ephemeral_user.rb
-- app/commands/decidim/gallery_methods.rb
 - app/commands/decidim/invite_user.rb
 - app/commands/decidim/invite_user_again.rb
 - app/commands/decidim/like_resource.rb
@@ -1489,6 +1488,7 @@ files:
 - app/mailers/decidim/application_mailer.rb
 - app/mailers/decidim/block_user_mailer.rb
 - app/mailers/decidim/decidim_devise_mailer.rb
+- app/mailers/decidim/delete_user_mailer.rb
 - app/mailers/decidim/export_mailer.rb
 - app/mailers/decidim/messaging/conversation_mailer.rb
 - app/mailers/decidim/newsletter_mailer.rb
@@ -1774,6 +1774,7 @@ files:
 - app/packs/src/decidim/geocoding/provider/here.js
 - app/packs/src/decidim/geocoding/provider/photon.js
 - app/packs/src/decidim/geocoding/reverse_geocoding.js
+- app/packs/src/decidim/geocoding/reverse_geocoding.test.js
 - app/packs/src/decidim/index.js
 - app/packs/src/decidim/map.js
 - app/packs/src/decidim/map/controller.js
@@ -1815,7 +1816,6 @@ files:
 - app/packs/src/decidim/utilities/dom.js
 - app/packs/src/decidim/utilities/text.js
 - app/packs/src/decidim/vendor/jquery-tmpl.js
-- app/packs/src/decidim/vendor/tribute.js
 - app/packs/stylesheets/decidim/_accordion.scss
 - app/packs/stylesheets/decidim/_actions.scss
 - app/packs/stylesheets/decidim/_activity.scss
@@ -1830,6 +1830,7 @@ files:
 - app/packs/stylesheets/decidim/_datepicker.scss
 - app/packs/stylesheets/decidim/_documents.scss
 - app/packs/stylesheets/decidim/_dropdown.scss
+- app/packs/stylesheets/decidim/_editor_suggestions.scss
 - app/packs/stylesheets/decidim/_emoji.scss
 - app/packs/stylesheets/decidim/_filters.scss
 - app/packs/stylesheets/decidim/_flash.scss
@@ -1871,9 +1872,9 @@ files:
 - app/packs/stylesheets/decidim/_tabs_x.scss
 - app/packs/stylesheets/decidim/_tags.scss
 - app/packs/stylesheets/decidim/_toggle_switch.scss
+- app/packs/stylesheets/decidim/_tom_select.scss
 - app/packs/stylesheets/decidim/_tooltip.scss
 - app/packs/stylesheets/decidim/_tos.scss
-- app/packs/stylesheets/decidim/_tribute.scss
 - app/packs/stylesheets/decidim/_typography.scss
 - app/packs/stylesheets/decidim/_versions.scss
 - app/packs/stylesheets/decidim/_vertical_tabs.scss
@@ -2064,6 +2065,7 @@ files:
 - app/views/decidim/application/_radio_accordion.html.erb
 - app/views/decidim/authorization_modals/show.html.erb
 - app/views/decidim/block_user_mailer/notify.html.erb
+- app/views/decidim/delete_user_mailer/delete.html.erb
 - app/views/decidim/devise/confirmations/new.html.erb
 - app/views/decidim/devise/invitations/edit.html.erb
 - app/views/decidim/devise/omniauth_registrations/new.html.erb
@@ -2131,7 +2133,6 @@ files:
 - app/views/decidim/pages/index.html.erb
 - app/views/decidim/pages/show.html.erb
 - app/views/decidim/participants_account_mailer/inactivity_notification.html.erb
-- app/views/decidim/participants_account_mailer/removal_notification.html.erb
 - app/views/decidim/participatory_space/members/_member.html.erb
 - app/views/decidim/profiles/show.html.erb
 - app/views/decidim/qr/show.html.erb

data/app/commands/decidim/gallery_methods.rb

@@ -1,107 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A module with all the gallery common methods
-  # Allows to create several image attachments at once
-  module GalleryMethods
-    private
-
-    def build_gallery(attached_to = nil)
-      @gallery = []
-      @form.add_photos.compact_blank.each do |photo|
-        if photo.is_a?(Hash) && photo.has_key?(:id)
-          update_attachment_title_for(photo)
-          next
-        end
-
-        @gallery << Attachment.new(
-          title: photos_title(photo),
-          attached_to: attached_to || gallery_attached_to,
-          file: photos_signed_id(photo), # Define attached_to before this
-          content_type: photos_content_type(photo)
-        )
-      end
-    end
-
-    def update_attachment_title_for(photo)
-      Decidim::Attachment.find(photo[:id]).update(title: photos_title(photo))
-    end
-
-    def image?(signed_id)
-      blob(signed_id).content_type.start_with? "image"
-    end
-
-    def gallery_invalid?
-      @gallery.each do |photo|
-        if photo.invalid? && photo.errors.has_key?(:file)
-          @form.errors.add(:add_photos, photo.errors[:file])
-          return true
-        end
-      end
-      false
-    end
-
-    def create_gallery(first_weight: 0)
-      weight = first_weight
-      # Add the weights first to the old photos
-      @form.photos.each do |photo|
-        photo.update!(weight:)
-        weight += 1
-      end
-      @gallery.map! do |photo|
-        photo.weight = weight
-        photo.attached_to = gallery_attached_to
-        photo.save!
-        weight += 1
-        @form.photos << photo
-      end
-    end
-
-    def photo_cleanup!
-      gallery_attached_to.photos.each do |photo|
-        next unless @form.photos.map(&:id).exclude?(photo.id)
-
-        photo.destroy! if (@form.respond_to?(:documents) && @form.documents.map(&:id).exclude?(photo.id)) || !@form.respond_to?(:documents)
-      end
-      # manually reset cached photos
-      gallery_attached_to.reload
-      gallery_attached_to.instance_variable_set(:@photos, nil)
-    end
-
-    # maybe a custom settings options would be nice
-    def gallery_allowed?
-      true
-    end
-
-    def process_gallery?
-      gallery_allowed? && @form.add_photos.any?
-    end
-
-    def gallery_attached_to
-      return @attached_to if @attached_to.present?
-      return form.current_organization if form.respond_to?(:current_organization)
-
-      form.current_component.organization if form.respond_to?(:current_component)
-    end
-
-    def photos_signed_id(photo)
-      return photo[:file] if photo.is_a?(Hash)
-
-      photo
-    end
-
-    def photos_title(photo)
-      return { I18n.locale => photo[:title] } if photo.is_a?(Hash) && photo.has_key?(:title)
-
-      { I18n.locale => "" }
-    end
-
-    def photos_content_type(photo)
-      blob(photos_signed_id(photo)).content_type
-    end
-
-    def blob(signed_id)
-      ActiveStorage::Blob.find_signed(signed_id)
-    end
-  end
-end