decidim-core 0.26.0.rc2 → 0.26.2

data/lib/decidim/middleware/rails_cookies.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# This is a backport for Rails 6.0 for the Same-Site option for the cookies
+# because this option was added in Rails 6.1.
+#
+# See:
+# https://github.com/decidim/decidim/pull/9051
+# https://github.com/rails/rails/issues/35822
+# https://github.com/rails/rails/commit/7ccaa125ba396d418aad1b217b63653d06044680
+module ActionDispatch
+  class Cookies
+    class CookieJar #:nodoc:
+      alias handle_options_original handle_options
+
+      def handle_options(options)
+        handle_options_original(options)
+
+        options[:same_site] ||= Rails.application.config.action_dispatch.cookies_same_site_protection || :lax
+        options[:same_site] = false if options[:same_site] == :none
+      end
+    end
+  end
+end

data/lib/decidim/resourceable.rb

@@ -51,6 +51,7 @@ module Decidim
 
         scope = manifest.resource_scope(component)
         scope = scope.where("#{self.class.table_name}.id != ?", id) if manifest.model_class == self.class
+        scope = scope.not_hidden if manifest.model_class.respond_to?(:not_hidden)
         scope.includes(:component).where.not(decidim_components: { published_at: nil })
       end
 

data/lib/decidim/searchable.rb

@@ -54,11 +54,12 @@ module Decidim
         end
       end
 
+      after_touch do |searchable|
+        remove_from_index(searchable) if searchable.respond_to?(:hidden?) && searchable.hidden?
+      end
+
       after_destroy do |searchable|
-        if self.class.search_resource_fields_mapper
-          org = self.class.search_resource_fields_mapper.retrieve_organization(searchable)
-          searchable.searchable_resources.by_organization(org.id).destroy_all
-        end
+        remove_from_index(searchable) if self.class.search_resource_fields_mapper
       end
       # after_create and after_update callbacks are dynamically setted in `searchable_fields` method.
 
@@ -70,6 +71,11 @@ module Decidim
         add_to_index_as_search_resource
       end
 
+      def remove_from_index(searchable)
+        org = self.class.search_resource_fields_mapper.retrieve_organization(searchable)
+        searchable.searchable_resources.by_organization(org.id).destroy_all
+      end
+
       # Forces the model to be indexed for the first time.
       def add_to_index_as_search_resource
         fields = self.class.search_resource_fields_mapper.mapped(self)

data/lib/decidim/view_model.rb

@@ -15,7 +15,6 @@ module Decidim
     include Decidim::ReplaceButtonsHelper
     include Cell::Caching::Notifications
     include Decidim::MarkupHelper
-    include Decidim::FilterParamsHelper
     include ::Webpacker::Helper
 
     delegate :current_organization, to: :controller

data/lib/devise/models/decidim_validatable.rb

@@ -11,7 +11,6 @@ module Devise
     # Validatable adds the following options to devise_for:
     #
     #   * +email_regexp+: the regular expression used to validate e-mails;
-    #   * +password_length+: a range expressing password length. Defaults to 8..72.
     #
     module DecidimValidatable
       # All validations used by this module.
@@ -33,7 +32,8 @@ module Devise
 
           validates_presence_of :password, if: :password_required?
           validates_confirmation_of :password, if: :password_required?
-          validates_length_of :password, within: password_length, allow_blank: true
+
+          validates :password, password: { name: :name, email: :email, username: :nickname }
         end
       end
 
@@ -61,7 +61,7 @@ module Devise
 
       # Methods to be injected at class level.
       module ClassMethods
-        Devise::Models.config(self, :email_regexp, :password_length)
+        Devise::Models.config(self, :email_regexp)
       end
     end
   end

data/lib/tasks/upgrade/decidim_moderation_tasks.rake

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+namespace :decidim do
+  namespace :upgrade do
+    namespace :moderation do
+      desc "Exclude all moderated content from search"
+      task remove_from_search: :environment do
+        query = Decidim::Moderation.hidden
+
+        log_info "Found #{query.count} hidden resources that needs to be handled"
+
+        query.find_each do |moderation|
+          moderation.reportable.remove_from_index(moderation.reportable)
+        rescue NameError => e
+          log_error "Could not process moderation id #{moderation.id} : #{e.message}"
+        end
+      end
+
+      private
+
+      def log_info(msg)
+        puts msg
+        Rails.logger.info(msg)
+      end
+
+      def log_error(msg)
+        puts msg
+        Rails.logger.error(msg)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.26.0.rc2
+  version: 0.26.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -256,14 +256,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: hashdiff
   requirement: !ruby/object:Gem::Requirement
@@ -754,28 +754,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.0.rc2
+        version: 0.26.2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -1065,6 +1065,7 @@ files:
 - app/controllers/concerns/decidim/resource_versions_concern.rb
 - app/controllers/concerns/decidim/safe_redirect.rb
 - app/controllers/concerns/decidim/settings.rb
+- app/controllers/concerns/decidim/skip_timeoutable.rb
 - app/controllers/concerns/decidim/use_organization_time_zone.rb
 - app/controllers/concerns/decidim/user_blocked_checker.rb
 - app/controllers/concerns/decidim/user_groups.rb
@@ -1188,7 +1189,6 @@ files:
 - app/helpers/decidim/decidim_form_helper.rb
 - app/helpers/decidim/endorsable_helper.rb
 - app/helpers/decidim/external_domain_helper.rb
-- app/helpers/decidim/filter_params_helper.rb
 - app/helpers/decidim/filters_helper.rb
 - app/helpers/decidim/followable_helper.rb
 - app/helpers/decidim/humanize_booleans_helper.rb
@@ -1218,6 +1218,7 @@ files:
 - app/helpers/decidim/tooltip_helper.rb
 - app/helpers/decidim/traceability_helper.rb
 - app/helpers/decidim/translations_helper.rb
+- app/helpers/decidim/twitter_search_helper.rb
 - app/helpers/decidim/user_group_helper.rb
 - app/helpers/decidim/user_profile_helper.rb
 - app/helpers/decidim/view_hooks_helper.rb
@@ -1382,6 +1383,7 @@ files:
 - app/packs/src/decidim/ajax_modals.js
 - app/packs/src/decidim/append_elements.js
 - app/packs/src/decidim/append_redirect_url_to_modals.js
+- app/packs/src/decidim/back_to_list.js
 - app/packs/src/decidim/callout.js
 - app/packs/src/decidim/check_boxes_tree.js
 - app/packs/src/decidim/clipboard.js
@@ -1406,11 +1408,13 @@ files:
 - app/packs/src/decidim/external_domain_warning.js
 - app/packs/src/decidim/external_link.js
 - app/packs/src/decidim/floating_help.js
+- app/packs/src/decidim/focus_guard.js
 - app/packs/src/decidim/form_attachments.js
 - app/packs/src/decidim/form_datepicker.js
 - app/packs/src/decidim/form_filter.component.test.js
 - app/packs/src/decidim/form_filter.component_for_testing.js
 - app/packs/src/decidim/form_filter.js
+- app/packs/src/decidim/form_remote.js
 - app/packs/src/decidim/form_validator.js
 - app/packs/src/decidim/foundation-datepicker/js/locales/foundation-datepicker.lb.js
 - app/packs/src/decidim/foundation_datepicker_locales.js
@@ -1461,6 +1465,7 @@ files:
 - app/packs/src/decidim/vendor/jquery-tmpl.js
 - app/packs/src/decidim/vendor/leaflet-tilelayer-here.js
 - app/packs/src/decidim/vendor/modernizr.js
+- app/packs/src/decidim/vendor/social-share-button.js
 - app/packs/src/decidim/vendor/tribute.js
 - app/packs/src/decidim/vizzs.js
 - app/packs/src/decidim/vizzs/areachart.js
@@ -1938,7 +1943,6 @@ files:
 - config/initializers/devise.rb
 - config/initializers/foundation_rails_helper.rb
 - config/initializers/invisible_captcha.rb
-- config/initializers/mail_previews.rb
 - config/initializers/omniauth.rb
 - config/initializers/rack_attack.rb
 - config/locales/am-ET.yml
@@ -2304,6 +2308,7 @@ files:
 - lib/decidim/content_parsers/inline_images_parser.rb
 - lib/decidim/content_parsers/link_parser.rb
 - lib/decidim/content_parsers/newline_parser.rb
+- lib/decidim/content_parsers/resource_parser.rb
 - lib/decidim/content_parsers/user_group_parser.rb
 - lib/decidim/content_parsers/user_parser.rb
 - lib/decidim/content_processor.rb
@@ -2311,6 +2316,7 @@ files:
 - lib/decidim/content_renderers/base_renderer.rb
 - lib/decidim/content_renderers/hashtag_renderer.rb
 - lib/decidim/content_renderers/link_renderer.rb
+- lib/decidim/content_renderers/resource_renderer.rb
 - lib/decidim/content_renderers/user_group_renderer.rb
 - lib/decidim/content_renderers/user_renderer.rb
 - lib/decidim/core.rb
@@ -2350,9 +2356,11 @@ files:
 - lib/decidim/core/test/shared_examples/comments_reports_examples.rb
 - lib/decidim/core/test/shared_examples/component_type.rb
 - lib/decidim/core/test/shared_examples/controller_render_views.rb
+- lib/decidim/core/test/shared_examples/conversations_examples.rb
 - lib/decidim/core/test/shared_examples/counts_commentators_as_newsletter_participants.rb
 - lib/decidim/core/test/shared_examples/edit_link_shared_examples.rb
 - lib/decidim/core/test/shared_examples/embed_resource_examples.rb
+- lib/decidim/core/test/shared_examples/endorsable.rb
 - lib/decidim/core/test/shared_examples/endorsable_interface_examples.rb
 - lib/decidim/core/test/shared_examples/endorsements_controller_shared_context.rb
 - lib/decidim/core/test/shared_examples/errors.rb
@@ -2498,6 +2506,7 @@ files:
 - lib/decidim/metric_operation_manifest.rb
 - lib/decidim/metric_registry.rb
 - lib/decidim/middleware/current_organization.rb
+- lib/decidim/middleware/rails_cookies.rb
 - lib/decidim/middleware/strip_x_forwarded_host.rb
 - lib/decidim/newsletter_encryptor.rb
 - lib/decidim/newsletter_participant.rb
@@ -2555,6 +2564,7 @@ files:
 - lib/tasks/decidim_open_data_tasks.rake
 - lib/tasks/decidim_tasks.rake
 - lib/tasks/decidim_webpacker_tasks.rake
+- lib/tasks/upgrade/decidim_moderation_tasks.rake
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
@@ -2570,9 +2580,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: 

data/app/helpers/decidim/filter_params_helper.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  # A helper to allow only Decidim params to be added to a link.
-  # This is useful when we want to preserve the params from a search, ordering
-  # or paginating results. Using this, we can link back to where the user was
-  # at the show page.
-  module FilterParamsHelper
-    # Public: Builds a hash to be added to a _path or _url method with only
-    # allowed params.
-    #
-    # params - An optional Hash with the values of the params. It will try to
-    # get them from the controller if none are present.
-    #
-    # Returns a Hash.
-    def filter_link_params(params = nil)
-      return {} if params.blank? && (!respond_to?(:controller) || !controller.respond_to?(:params))
-
-      params = controller.params.to_unsafe_h if params.blank?
-
-      params.stringify_keys.slice(
-        "order",
-        "filter",
-        "page",
-        "per_page",
-        "locale"
-      )
-    end
-  end
-end

data/config/initializers/mail_previews.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-Rails.application.configure do
-  config.action_mailer.preview_path = Decidim::Core::Engine.root.join("spec/mailers")
-end