decidim-core 0.28.0 → 0.28.1

data/lib/decidim/form_builder.rb

@@ -79,7 +79,7 @@ module Decidim
       tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: tabs_id }) do
         locales.each_with_index.inject("".html_safe) do |string, (locale, index)|
           tab_content_id = "#{tabs_id}-#{name}-panel-#{index}"
-          string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id) do
+          string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id, "aria-hidden": tab_attr_aria_hidden_for(index)) do
             if hashtaggable
               hashtaggable_text_field(type, name, locale, options.merge(label: false))
             elsif type.to_sym == :editor
@@ -164,7 +164,7 @@ module Decidim
       tabs_content = content_tag(:div, class: "tabs-content", data: { tabs_content: tabs_id }) do
         handlers.each_with_index.inject("".html_safe) do |string, (handler, index)|
           tab_content_id = sanitize_tabs_selector "#{tabs_id}-#{name}-panel-#{index}"
-          string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id) do
+          string + content_tag(:div, class: tab_element_class_for("panel", index), id: tab_content_id, "aria-hidden": tab_attr_aria_hidden_for(index)) do
             send(type, "#{handler}_handler", options.merge(label: false))
           end
         end
@@ -746,6 +746,12 @@ module Decidim
       element_class
     end
 
+    def tab_attr_aria_hidden_for(index)
+      return "false" if index.zero?
+
+      "true"
+    end
+
     def locales
       @locales ||= if @template.respond_to?(:available_locales)
                      Set.new([@template.current_locale] + @template.available_locales).to_a

data/lib/decidim/has_category.rb

@@ -8,7 +8,7 @@ module Decidim
     extend ActiveSupport::Concern
 
     included do
-      has_one :categorization, as: :categorizable
+      has_one :categorization, as: :categorizable, class_name: "Decidim::Categorization", dependent: :destroy
       has_one :category, through: :categorization
 
       scope :with_category, lambda { |category|

data/lib/decidim/has_conversations.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module HasConversations
+    extend ActiveSupport::Concern
+
+    included do
+      def new_conversation(originator, user, conversation)
+        send_notification(
+          from: originator,
+          to: user,
+          conversation:,
+          message: conversation.messages.first.body,
+          action: "new_conversation"
+        )
+      end
+
+      def new_group_conversation(originator, manager, conversation, group)
+        send_notification(
+          from: originator,
+          to: manager,
+          conversation:,
+          message: conversation.messages.first.body,
+          action: "new_group_conversation",
+          third_party: group
+        )
+      end
+
+      def comanagers_new_conversation(group, user, conversation, manager)
+        send_notification(
+          from: group,
+          to: user,
+          conversation:,
+          message: conversation.messages.first.body,
+          action: "comanagers_new_conversation",
+          third_party: manager
+        )
+      end
+
+      def new_message(sender, user, conversation, message)
+        send_notification(
+          from: sender,
+          to: user,
+          conversation:,
+          message: message.body,
+          action: "new_message"
+        )
+      end
+
+      def new_group_message(sender, user, conversation, message, group)
+        send_notification(
+          from: sender,
+          to: user,
+          conversation:,
+          message: message.body,
+          action: "new_group_message",
+          third_party: group
+        )
+      end
+
+      def comanagers_new_message(sender, user, conversation, message, manager)
+        send_notification(
+          from: sender,
+          to: user,
+          conversation:,
+          message: message.body,
+          action: "comanagers_new_message",
+          third_party: manager
+        )
+      end
+
+      private
+
+      def get_subject(action:, sender:, third_party:)
+        I18n.t(
+          "conversation_mailer.#{action}.subject",
+          scope: "decidim.messaging",
+          sender: sender.name,
+          manager: third_party&.name,
+          group: third_party&.name
+        )
+      end
+
+      def send_notification
+        raise NotImplementedError, "You must define a send_notification method"
+      end
+    end
+  end
+end

data/lib/decidim/participable.rb

@@ -12,6 +12,23 @@ module Decidim
                :mounted_engine, :mounted_admin_engine, :admin_extension_module, :admins_query,
                to: :class
 
+      def skip_space_slug?(method_name)
+        [
+          "edit_#{underscored_name}_path".to_sym,
+          "edit_#{underscored_name}_url".to_sym,
+          "new_#{underscored_name}_path".to_sym,
+          "new_#{underscored_name}_url".to_sym,
+          "#{underscored_name}_path".to_sym,
+          "#{underscored_name}_url".to_sym,
+          "#{underscored_name.pluralize}_path".to_sym,
+          "#{underscored_name.pluralize}_url".to_sym
+        ].include?(method_name)
+      end
+
+      def slug_param_name
+        "#{underscored_name}_slug".to_sym
+      end
+
       def mounted_params
         {
           host: organization.host,

data/lib/decidim/upgrade/wysiwyg_migrator.rb

@@ -258,6 +258,9 @@ module Decidim
         parent
       end
 
+      # rubocop: disable Metrics/CyclomaticComplexity
+      # rubocop: disable Metrics/PerceivedComplexity
+
       # Quill.js did not support multi-level lists which is why it used a CSS
       # hack to make it visually look like the list has multiple levels. This
       # is not semantically correct but for users with no visual impairments it
@@ -321,6 +324,8 @@ module Decidim
         current_parent = parent
         current_level = 0
         list.children.each do |item|
+          next unless item.is_a?(Nokogiri::XML::Element) && item.name == "li"
+
           indent = detect_indent(item)
           if indent == current_level || li.nil?
             if item.child.name == "p"
@@ -356,6 +361,8 @@ module Decidim
 
         parent
       end
+      # rubocop: enable Metrics/CyclomaticComplexity
+      # rubocop: enable Metrics/PerceivedComplexity
 
       # Converts iframe embeds to the new format. We assume all iframes are
       # video embeds as this the only type of embed what Quill.js supported and

data/lib/decidim/view_model.rb

@@ -16,6 +16,7 @@ module Decidim
     include Cell::Caching::Notifications
     include Decidim::MarkupHelper
     include Decidim::LayoutHelper
+    include Decidim::SanitizeHelper
 
     delegate :current_organization, to: :controller
 

data/lib/decidim/webpacker/webpack/.modernizrrc

@@ -0,0 +1,9 @@
+{
+  "minify": true,
+    "options": [
+      "setClasses"
+    ],
+    "feature-detects": [
+      "css/transitions"
+    ]
+}

data/lib/premailer/adapter/decidim.rb

@@ -16,15 +16,16 @@ class Premailer
       # @return [String] a plain text.
       def to_plain_text
         html_src = begin
+          @doc.css("style").remove
           @doc.at("body").inner_html
         rescue StandardError
           ""
         end
 
-        html_src = @doc.to_html unless html_src && html_src.present?
-
-        # remove style tags and content
-        html_src.gsub!(%r{<style.*?/style>}m, "")
+        unless html_src && html_src.present?
+          @doc.css("style").remove
+          html_src = @doc.to_html
+        end
 
         convert_to_text(html_src, @options[:line_length], @html_encoding)
       end

data/lib/tasks/decidim_reminders_tasks.rake

@@ -2,6 +2,7 @@
 
 namespace :decidim do
   namespace :reminders do
+    desc "Sends all the email reminders defined in the manifests"
     task :all, [] => :environment do
       Decidim.reminders_registry.all.each do |reminder_manifest|
         call_reminder_job(reminder_manifest)

data/lib/tasks/upgrade/decidim_fix_categorization.rake

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    desc "Remove orphan categorizations"
+    task fix_orphan_categorizations: :environment do
+      logger = Logger.new($stdout)
+      logger.info("Removing orphan categorizations...")
+
+      Decidim::Categorization.find_each do |categorization|
+        categorization.destroy if categorization.categorizable.nil?
+      end
+    end
+  end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.28.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -390,20 +390,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.9'
-- !ruby/object:Gem::Dependency
-  name: mustache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: net-smtp
   requirement: !ruby/object:Gem::Requirement
@@ -778,28 +764,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
-  type: :runtime
+        version: 0.28.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: 0.28.1
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -931,6 +917,8 @@ files:
 - app/cells/decidim/content_blocks/participatory_space_extra_data_cell.rb
 - app/cells/decidim/content_blocks/participatory_space_hero/show.erb
 - app/cells/decidim/content_blocks/participatory_space_hero_cell.rb
+- app/cells/decidim/content_blocks/participatory_space_hero_settings_form/show.erb
+- app/cells/decidim/content_blocks/participatory_space_hero_settings_form_cell.rb
 - app/cells/decidim/content_blocks/participatory_space_images/content.erb
 - app/cells/decidim/content_blocks/participatory_space_images_cell.rb
 - app/cells/decidim/content_blocks/participatory_space_last_activity/content.erb
@@ -1185,6 +1173,7 @@ files:
 - app/commands/decidim/validate_upload.rb
 - app/constraints/decidim/current_component.rb
 - app/controllers/concerns/decidim/amendments_controller.rb
+- app/controllers/concerns/decidim/devise_authentication_methods.rb
 - app/controllers/concerns/decidim/devise_controllers.rb
 - app/controllers/concerns/decidim/disable_redirection_to_external_host.rb
 - app/controllers/concerns/decidim/filter_resource.rb
@@ -1462,6 +1451,7 @@ files:
 - app/models/decidim/participatory_space_role_config/participatory_space_admin.rb
 - app/models/decidim/participatory_space_role_config/valuator.rb
 - app/models/decidim/permission_action.rb
+- app/models/decidim/push_notification_message.rb
 - app/models/decidim/reminder.rb
 - app/models/decidim/reminder_delivery.rb
 - app/models/decidim/reminder_record.rb
@@ -1494,6 +1484,7 @@ files:
 - app/packs/entrypoints/decidim_map.scss
 - app/packs/entrypoints/decidim_map_provider_default.js
 - app/packs/entrypoints/decidim_map_provider_here.js
+- app/packs/entrypoints/decidim_overrides.scss
 - app/packs/entrypoints/decidim_sw.js
 - app/packs/entrypoints/decidim_widget.js
 - app/packs/fonts/decidim/source-sans-pro-v21-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-600.eot
@@ -1511,6 +1502,7 @@ files:
 - app/packs/fonts/decidim/source-sans-pro-v21-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.ttf
 - app/packs/fonts/decidim/source-sans-pro-v21-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff
 - app/packs/fonts/decidim/source-sans-pro-v21-cyrillic_cyrillic-ext_greek_greek-ext_latin_latin-ext_vietnamese-regular.woff2
+- app/packs/images/decidim/.keep
 - app/packs/images/decidim/avatar-multiuser.png
 - app/packs/images/decidim/brands/google.svg
 - app/packs/images/decidim/cc-badge.png
@@ -1879,6 +1871,7 @@ files:
 - app/services/decidim/notifications_digest_sending_decider.rb
 - app/services/decidim/notifications_subscriptions_persistor.rb
 - app/services/decidim/open_data_exporter.rb
+- app/services/decidim/push_notification_message_sender.rb
 - app/services/decidim/resource_search.rb
 - app/services/decidim/send_push_notification.rb
 - app/services/decidim/settings_change.rb
@@ -1889,6 +1882,7 @@ files:
 - app/uploaders/decidim/application_uploader.rb
 - app/uploaders/decidim/attachment_uploader.rb
 - app/uploaders/decidim/avatar_uploader.rb
+- app/uploaders/decidim/background_image_uploader.rb
 - app/uploaders/decidim/banner_image_uploader.rb
 - app/uploaders/decidim/cw/application_uploader.rb
 - app/uploaders/decidim/cw/attachment_uploader.rb
@@ -2032,7 +2026,6 @@ files:
 - app/views/decidim/searches/_filters.html.erb
 - app/views/decidim/searches/_resources_filter_block.html.erb
 - app/views/decidim/searches/index.html.erb
-- app/views/decidim/searches/index.js.erb
 - app/views/decidim/shared/_authorization_modal.html.erb
 - app/views/decidim/shared/_comments.html.erb
 - app/views/decidim/shared/_component_announcement.html.erb
@@ -2130,8 +2123,6 @@ files:
 - app/views/layouts/decidim/shared/_linked_resource.html.erb
 - app/views/layouts/decidim/user_profile.html.erb
 - config/assets.rb
-- config/brakeman.ignore
-- config/environment.rb
 - config/initializers/active_support.rb
 - config/initializers/browser.rb
 - config/initializers/carrierwave.rb
@@ -2172,6 +2163,7 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
+- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -2441,6 +2433,7 @@ files:
 - db/seeds/city2.jpeg
 - db/seeds/homepage_image.jpg
 - db/seeds/logo.png
+- decidim-core.gemspec
 - lib/decidim/action_authorization.rb
 - lib/decidim/acts_as_author.rb
 - lib/decidim/acts_as_tree.rb
@@ -2659,6 +2652,7 @@ files:
 - lib/decidim/core/test/shared_examples/reportable.rb
 - lib/decidim/core/test/shared_examples/reports_examples.rb
 - lib/decidim/core/test/shared_examples/resource_endorsed_event_examples.rb
+- lib/decidim/core/test/shared_examples/resource_locator_presenter_examples.rb
 - lib/decidim/core/test/shared_examples/resource_search_examples.rb
 - lib/decidim/core/test/shared_examples/resourceable.rb
 - lib/decidim/core/test/shared_examples/rich_text_editor_examples.rb
@@ -2743,6 +2737,7 @@ files:
 - lib/decidim/has_attachments.rb
 - lib/decidim/has_category.rb
 - lib/decidim/has_component.rb
+- lib/decidim/has_conversations.rb
 - lib/decidim/has_private_users.rb
 - lib/decidim/has_reference.rb
 - lib/decidim/has_resource_permission.rb
@@ -2836,6 +2831,7 @@ files:
 - lib/decidim/webpacker/postcss.config.js
 - lib/decidim/webpacker/runner.rb
 - lib/decidim/webpacker/shakapacker.yml
+- lib/decidim/webpacker/webpack/.modernizrrc
 - lib/decidim/webpacker/webpack/custom.js
 - lib/decidim/webpacker/webpack/webpack.config.js
 - lib/devise/models/decidim_newsletterable.rb
@@ -2857,6 +2853,7 @@ files:
 - lib/tasks/decidim_tasks.rake
 - lib/tasks/decidim_webpacker_tasks.rake
 - lib/tasks/upgrade/decidim_deduplicate_endorsements.rake
+- lib/tasks/upgrade/decidim_fix_categorization.rake
 - lib/tasks/upgrade/decidim_fix_nickname_uniqueness.rake
 - lib/tasks/upgrade/decidim_fix_short_url_resolver.rake
 - lib/tasks/upgrade/decidim_migrate_wysiwyg_content.rake
@@ -2871,23 +2868,23 @@ metadata:
   funding_uri: https://opencollective.com/decidim
   homepage_uri: https://decidim.org
   source_code_uri: https://github.com/decidim/decidim
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.5.9
+signing_key: 
 specification_version: 4
 summary: The core of the Decidim framework.
 test_files: []

data/app/views/decidim/searches/index.js.erb

@@ -1,7 +0,0 @@
-var $results = $('#results');
-var $filters = $('.search-filters');
-var $count = $('#search-count');
-
-$results.html('<%= j(cell("decidim/search_results", @sections, params:).show).strip.html_safe %>');
-$filters.html('<%= j(render partial: "filters").strip.html_safe %>');
-$count.html('<%= j(render partial: "count").strip.html_safe %>');

data/config/brakeman.ignore

@@ -1,37 +0,0 @@
-{
-  "ignored_warnings": [
-    {
-      "warning_type": "Cross-Site Scripting",
-      "warning_code": 2,
-      "fingerprint": "20249ac77f857a72a49d1e920e4cb6a8b08d133506cbc9d40fe1ec8ee5f5e7a3",
-      "check_name": "CrossSiteScripting",
-      "message": "Unescaped parameter value",
-      "file": "app/views/decidim/searches/index.js.erb",
-      "line": 5,
-      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
-      "code": "j(cell(\"decidim/search_results\", @sections, :params => params).show).strip",
-      "render_path": [
-        {
-          "type": "controller",
-          "class": "Decidim::SearchesController",
-          "method": "index",
-          "line": 15,
-          "file": "app/controllers/decidim/searches_controller.rb",
-          "rendered": {
-            "name": "decidim/searches/index",
-            "file": "app/views/decidim/searches/index.js.erb"
-          }
-        }
-      ],
-      "location": {
-        "type": "template",
-        "template": "decidim/searches/index"
-      },
-      "user_input": "params",
-      "confidence": "Weak",
-      "note": ""
-    }
-  ],
-  "updated": "2023-04-11 11:04:58 +0000",
-  "brakeman_version": "5.2.3"
-}

data/config/environment.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-# Empty line for playing nice with tpope/vim-rails