decidim-core 0.27.1 → 0.27.3

data/lib/decidim/api/types/localized_string_type.rb

@@ -8,6 +8,15 @@ module Decidim
 
       field :locale, GraphQL::Types::String, "The standard locale of this translation.", null: false
       field :text, GraphQL::Types::String, "The content of this translation.", null: true
+      field :machine_translated, GraphQL::Types::Boolean, "Whether this string is machine translated or not.", null: false
+
+      def machine_translated
+        if object.respond_to?(:machine_translated)
+          object.machine_translated.present?
+        else
+          false
+        end
+      end
     end
   end
 end

data/lib/decidim/api/types/translated_field_type.rb

@@ -17,19 +17,34 @@ module Decidim
       end
 
       def locales
-        object.keys
+        (defined_translations.keys + machine_translations.keys).uniq
       end
 
       def translation(locale: "")
-        translations = object.stringify_keys
-        translations[locale]
+        display_translations[locale]
       end
 
       def translations(locales: [])
-        translations = object.stringify_keys
+        translations = display_translations
         translations = translations.slice(*locales) unless locales.empty?
 
-        translations.map { |locale, text| OpenStruct.new(locale: locale, text: text) }
+        translations.map { |locale, text| OpenStruct.new(locale: locale, text: text, machine_translated: defined_translations[locale].blank?) }
+      end
+
+      private
+
+      def display_translations
+        @display_translations ||= locales.index_with do |locale|
+          defined_translations[locale].presence || machine_translations[locale]
+        end
+      end
+
+      def defined_translations
+        object.stringify_keys.except("machine_translations")
+      end
+
+      def machine_translations
+        object.stringify_keys["machine_translations"]&.stringify_keys || {}
       end
     end
   end

data/lib/decidim/asset_router/pipeline.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AssetRouter
+    # The pipeline asset router provides global access to the asset routers for
+    # assets that are precompiled through the Rails assets pipeline (or webpack)
+    # and stored locally or in a remote CDN. This handles the configuration
+    # options for the asset routes so that they don't have to be always manually
+    # created.
+    class Pipeline
+      # Initializes the router.
+      #
+      # @param asset [String] The asset to route to
+      # @param model [ActiveRecord::Base, nil] The model that provides the
+      #   organizational context. When nil, the host will be included in the URL
+      #   when it is available through other configurations. Otherwise, the host
+      #   will not be part of the URL.
+      def initialize(asset, model: nil)
+        @asset = asset
+        @model = model
+      end
+
+      # Generates the correct URL to the asset with the provided options.
+      #
+      # @param options [Hash] The options for the URL that are the normal route
+      #   options Rails route helpers accept
+      # @return [String] The full URL to the asset or when host cannot be
+      #   resolved, the asset path.
+      def url(**options)
+        path = ActionController::Base.helpers.asset_pack_path(asset, **options)
+        return path if path.match?(%r{\A(https?:)?//})
+
+        "#{asset_host}#{path}"
+      end
+
+      private
+
+      attr_reader :asset, :model
+
+      # Fetches the organization from the model or returns the model itself if
+      # it is an organization.
+      #
+      # @return [Decidim::Organization]
+      def organization
+        @organization ||=
+          if model.is_a?(Decidim::Organization)
+            model
+          else
+            model.try(:organization)
+          end
+      end
+
+      # Resolves the full asset host with the resolved options and also adds the
+      # port at the end of the URL unless it is the default port 80 or 443.
+      #
+      # @return [String] The hostname with protocol and port or an empty string
+      #   when the host cannot be resolved.
+      def asset_host
+        return "" if default_options[:host].blank?
+
+        base_host = ActionController::Base.helpers.compute_asset_host("", **default_options)
+        return "" if base_host.blank?
+        return base_host if option_resolver.default_port?
+
+        "#{base_host}:#{option_resolver.port}"
+      end
+
+      # Determines the default options to be passed to the route helper.
+      #
+      # @return [Hash] The default options hash to pass to the route helper
+      def default_options
+        @default_options ||= option_resolver.options.tap do |opts|
+          opts[:host] = default_host if default_host
+        end
+      end
+
+      # Determines the default host for the pipeline assets. Either the
+      # configured assets host or the organization host when available. When the
+      # default host is not available, the host returned by the
+      # UrlOptionResolver will be used.
+      #
+      # @return [String, nil]
+      def default_host
+        @default_host ||= Rails.configuration.action_controller.asset_host || organization&.host
+      end
+
+      # Stores an instance of UrlOptionResolver for convenience.
+      #
+      # @return [Decidim::UrlOptionResolver]
+      def option_resolver
+        @option_resolver ||= UrlOptionResolver.new
+      end
+    end
+  end
+end

data/lib/decidim/asset_router/storage.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AssetRouter
+    # Storage asset router provides global access to the asset routes for assets
+    # saved through ActiveStorage. This handles the different cases for routing
+    # to the remote routes when using an assets CDN or to local routes when
+    # using the local disk storage driver.
+    class Storage
+      # Initializes the router.
+      #
+      # @param [ActiveStorage::Attached, ActiveStorage::Blob] The asset to route
+      #   to
+      def initialize(asset)
+        @asset = asset
+      end
+
+      # Generates the correct URL to the asset with the provided options.
+      #
+      # @param options The options for the URL that are the normal route options
+      #   Rails route helpers accept
+      def url(**options)
+        if asset.is_a? ActiveStorage::Attached
+          routes.rails_blob_url(asset.blob, **default_options.merge(options))
+        else
+          routes.rails_representation_url(asset, **default_options.merge(options))
+        end
+      end
+
+      private
+
+      attr_reader :asset
+
+      # Provides the route helpers depending on whether the URL is generated to
+      # the local host or an external CDN (remote).
+      #
+      # @return [Module, Decidim::EngineRouter] The correct route helpers based
+      #   on the configuration
+      def routes
+        @routes ||=
+          if remote?
+            Rails.application.routes.url_helpers
+          else
+            EngineRouter.new("main_app", {})
+          end
+      end
+
+      # Determines whether the assets call should be to a remote CDN or to the
+      # local server based on the storage options.
+      #
+      # @return [Boolean] A boolean indicating whether the assets are served
+      #   through a remote CDN
+      def remote?
+        remote_storage_options.present?
+      end
+
+      # Determines the default options to be passed to the route helper. For the
+      # remote storage, returns the remote storage options and for the local
+      # disk storage returns an empty hash.
+      #
+      # @return [Hash] The default options hash to pass to the route helper
+      def default_options
+        @default_options ||=
+          if remote?
+            remote_storage_options
+          else
+            {}
+          end
+      end
+
+      # The remote storage options when using a remote CDN. An empty hash in
+      # case using the local disk storage.
+      #
+      # @return [Hash] The remote storage options hash
+      def remote_storage_options
+        @remote_storage_options ||= {
+          host: Rails.application.secrets.dig(:storage, :cdn_host)
+        }.compact
+      end
+    end
+  end
+end

data/lib/decidim/asset_router.rb

@@ -1,80 +1,8 @@
 # frozen_string_literal: true
 
 module Decidim
-  # Asset router provides global access to the asset routes for assets saved
-  # through ActiveStorage. This handles the different cases for routing to the
-  # remote routes when using an assets CDN or to local routes when using the
-  # local disk storage driver.
-  class AssetRouter
-    # Initializes the router.
-    #
-    # @param [ActiveStorage::Attached, ActiveStorage::Blob] The asset to route
-    #   to
-    def initialize(asset)
-      @asset = asset
-    end
-
-    # Generates the correct URL to the asset with the provided options.
-    #
-    # @param options The options for the URL that are the normal route options
-    #   Rails route helpers accept
-    def url(**options)
-      if asset.is_a? ActiveStorage::Attached
-        routes.rails_blob_url(asset.blob, **default_options.merge(options))
-      else
-        routes.rails_representation_url(asset, **default_options.merge(options))
-      end
-    end
-
-    private
-
-    attr_reader :asset
-
-    # Provides the route helpers depending on whether the URL is generated to
-    # the local host or an external CDN (remote).
-    #
-    # @return [Module, Decidim::EngineRouter] The correct route helpers based
-    #   on the configuration
-    def routes
-      @routes ||=
-        if remote?
-          Rails.application.routes.url_helpers
-        else
-          EngineRouter.new("main_app", {})
-        end
-    end
-
-    # Determines whether the assets call should be to a remote CDN or to the
-    # local server based on the storage options.
-    #
-    # @return [Boolean] A boolean indicating whether the assets are served
-    #   through a remote CDN
-    def remote?
-      remote_storage_options.present?
-    end
-
-    # Determines the default options to be passed to the route helper. For the
-    # remote storage, returns the remote storage options and for the local disk
-    # storage returns an empty hash.
-    #
-    # @return [Hash] The default options hash to pass to the route helper
-    def default_options
-      @default_options ||=
-        if remote?
-          remote_storage_options
-        else
-          {}
-        end
-    end
-
-    # The remote storage options when using a remote CDN. An empty hash in case
-    # using the local disk storage.
-    #
-    # @return [Hash] The remote storage options hash
-    def remote_storage_options
-      @remote_storage_options ||= {
-        host: Rails.application.secrets.dig(:storage, :cdn_host)
-      }.compact
-    end
+  module AssetRouter
+    autoload :Pipeline, "decidim/asset_router/pipeline"
+    autoload :Storage, "decidim/asset_router/storage"
   end
 end

data/lib/decidim/attribute_object/form.rb

@@ -48,6 +48,15 @@ module Decidim
               value.attachment.try(:blob)
             when ActiveStorage::Attached::Many
               value.attachments.map(&:blob)
+            when ActiveRecord::Associations::CollectionProxy, ActiveRecord::Relation, Array
+              if attribute_types[key].type == :array
+                value
+              else
+                # This is a sub-form that needs to read the properties directly
+                # from the original model. We cannot pass an array here as it
+                # would be passed to the form constructor causing an error.
+                model
+              end
             else
               value
             end

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

@@ -234,13 +234,20 @@ FactoryBot.define do
       confirmed_at { Time.current }
     end
 
+    trait :blocked do
+      blocked { true }
+      blocked_at { Time.current }
+      extended_data { { user_name: generate(:name) } }
+      name { "Blocked user group" }
+    end
+
     after(:build) do |user_group, evaluator|
-      user_group.extended_data = {
-        document_number: evaluator.document_number,
-        phone: evaluator.phone,
-        rejected_at: evaluator.rejected_at,
-        verified_at: evaluator.verified_at
-      }
+      user_group.extended_data = user_group.extended_data.merge({
+                                                                  document_number: evaluator.document_number,
+                                                                  phone: evaluator.phone,
+                                                                  rejected_at: evaluator.rejected_at,
+                                                                  verified_at: evaluator.verified_at
+                                                                })
     end
 
     after(:create) do |user_group, evaluator|

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

@@ -416,6 +416,42 @@ shared_examples "comments" do
         )
       end
 
+      context "when user can hide replies on a thread" do
+        let(:thread) { comments.first }
+        let(:new_reply_body) { "Hey, I just jumped inside the thread!" }
+        let!(:new_reply) { create(:comment, commentable: thread, root_commentable: commentable, body: new_reply_body) }
+
+        it "displays the hide button" do
+          visit current_path
+          within "#comment_#{thread.id}" do
+            expect(page).to have_content("Hide replies")
+            expect(page).to have_content(new_reply_body)
+          end
+        end
+
+        it "displays the show button" do
+          visit current_path
+          within "#comment_#{thread.id}" do
+            click_button "Hide replies"
+            expect(page).to have_content("Show reply")
+            expect(page).not_to have_content(new_reply_body)
+          end
+        end
+
+        context "when are more replies" do
+          let!(:new_replies) { create_list(:comment, 2, commentable: thread, root_commentable: commentable, body: new_reply_body) }
+
+          it "displays the show button" do
+            visit current_path
+            within "#comment_#{thread.id}" do
+              click_button "Hide replies"
+              expect(page).to have_content("Show 3 replies")
+              expect(page).not_to have_content(new_reply_body)
+            end
+          end
+        end
+      end
+
       context "when inside a thread reply form" do
         let(:thread) { comments.first }
         let(:new_reply_body) { "Hey, I just jumped inside the thread!" }

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+shared_context "when sends the notification digest" do
+  context "when daily notification mail" do
+    let(:user) { create(:user, :admin, organization: organization, notifications_sending_frequency: "daily") }
+
+    it_behaves_like "notification digest mail"
+  end
+
+  context "when weekly notification mail" do
+    let(:user) { create(:user, :admin, organization: organization, notifications_sending_frequency: "weekly") }
+
+    it_behaves_like "notification digest mail"
+  end
+end
+
+shared_examples_for "notification digest mail" do
+  context "when a notificable event takes place" do
+    let!(:organization) { create(:organization) }
+    let!(:participatory_space) { create(:participatory_process, organization: organization) }
+
+    it "sends a notification to the user's email" do
+      perform_enqueued_jobs do
+        expect(command.call).to broadcast(:ok)
+        Decidim::Notification.last.update(created_at: 1.day.ago)
+        Decidim::EmailNotificationsDigestGeneratorJob.perform_now(user.id, user.notifications_sending_frequency)
+      end
+
+      expect(last_email_body.length).to be_positive
+      expect(last_email_body).not_to include("translation missing")
+    end
+  end
+end

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-shared_examples_for "has embedded video in description" do |description_attribute_name|
+shared_examples_for "has embedded video in description" do |description_attribute_name, count: 1|
   let(description_attribute_name) { { en: %(Description <iframe class="ql-video" allowfullscreen="true" src="#{iframe_src}" frameborder="0"></iframe>) } }
   let(:iframe_src) { "http://www.example.org" }
+  let!(:cookie_warning) { "You need to enable all cookies in order to see this content" }
 
   context "when cookies are rejected" do
     before do
@@ -11,7 +12,7 @@ shared_examples_for "has embedded video in description" do |description_attribut
     end
 
     it "disables iframe" do
-      expect(page).to have_content("You need to enable all cookies in order to see this content")
+      expect(page).to have_content(cookie_warning)
       expect(page).not_to have_selector("iframe")
     end
   end
@@ -23,8 +24,8 @@ shared_examples_for "has embedded video in description" do |description_attribut
     end
 
     it "shows iframe" do
-      expect(page).not_to have_content("You need to enable all cookies in order to see this content")
-      expect(page).to have_selector("iframe", count: 1)
+      expect(page).not_to have_content(cookie_warning)
+      expect(page).to have_selector("iframe", count: count)
     end
   end
 end

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

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
-shared_examples "having a rich text editor" do |css, toolbar|
-  it "has a form with a rich text editor" do
-    within "form.#{css}" do
+shared_examples "having a rich text editor for field" do |selector, toolbar|
+  it "has a rich text editor" do
+    within selector do
       expect(page).to have_selector("div.editor-container[data-toolbar='#{toolbar}']", visible: :all)
     end
   end
 end
 
+shared_examples "having a rich text editor" do |css, toolbar|
+  it_behaves_like "having a rich text editor for field", "form.#{css}", toolbar
+end
+
 shared_context "with rich text editor content" do
   let(:content) { "<p>#{safe_tags}</p>#{script}" }
   let(:safe_tags) { em + u + strong }

data/lib/decidim/core/test.rb

@@ -75,3 +75,4 @@ require "decidim/core/test/shared_examples/conversations_examples"
 require "decidim/core/test/shared_examples/resource_endorsed_event_examples"
 require "decidim/core/test/shared_examples/versions_controller_examples"
 require "decidim/core/test/shared_examples/mcell_examples"
+require "decidim/core/test/shared_examples/digest_mail_examples"

data/lib/decidim/core/version.rb

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

data/lib/decidim/dependency_resolver.rb

@@ -28,11 +28,9 @@ module Decidim
     # specs which means any gems available in the gem install folder.
     #
     # @param gem [String] The name for the gem to be looked up.
-    # @return [Bundler::LazySpecification, Gem::Specification, nil] When bundler
-    #   is available, returns `Bundler::LazySpecification`. When bundler is not
-    #   available, returns `Gem::Specification`. Both of these implement the
-    #   necessary methods for the other checks. In both cases returns nil if
-    #   the gem is not found.
+    # @return [Gem::Specification, nil] Returns the gem specification for the
+    #   given gem name. The specification implements the necessary methods for
+    #   the other checks. In both cases returns nil if the gem is not found.
     def lookup(gem)
       # In case the lookup method is called with a spec definition, return the
       # definition itself.
@@ -217,10 +215,18 @@ module Decidim
       # Gemfile, e.g. when the Decidim gems are installed through git.
       #
       # @param name [String] The name of the gem to find.
-      # @return [Bundler::LazySpecification, nil] The specification for the gem
-      #   or nil if the gem is not listed in the locked gems.
+      # @return [Gem::Specification, nil] The specification for the gem
+      #   or nil if the gem is not listed in the locked gems or nil when the
+      #   returned spec is not installed in the current gem environment.
       def spec(name)
-        Bundler.definition.locked_gems.specs.find { |s| s.name == name }
+        sp = Bundler.definition.locked_gems.specs.find { |s| s.name == name }
+
+        # Fetching the gem through Gem.loaded_specs ensures we are not returning
+        # a lazy specification which does not respond to `#full_gem_path` which
+        # is needed for the resolver.
+        return Gem.loaded_specs[sp.name] if sp
+
+        nil
       end
 
       private

data/lib/decidim/form_builder.rb

@@ -47,7 +47,7 @@ module Decidim
     # rubocop:enable Metrics/ParameterLists
 
     def create_language_selector(locales, tabs_id, name)
-      if Decidim.available_locales.count > 4
+      if locales.count > 4
         language_selector_select(locales, tabs_id, name)
       else
         language_tabs(locales, tabs_id, name)
@@ -444,7 +444,7 @@ module Decidim
     #              * resouce_name: Name of the resource (e.g. user)
     #              * resource_class: Attribute's resource class (e.g. Decidim::User)
     #              * resouce_class: Class of the resource (e.g. user)
-    #              * optional: Whether the file can be optional or not.
+    #              * required: Whether the file is required or not (false by default).
     #              * titled: Whether the file can have title or not.
     #              * show_current: Whether the current file is displayed next to the button.
     #              * help: Array of help messages which are displayed inside of the upload modal.
@@ -464,7 +464,7 @@ module Decidim
         attribute: attribute,
         resource_name: @object_name,
         resource_class: options[:resource_class]&.to_s || resource_class(attribute),
-        optional: true,
+        required: false,
         titled: false,
         show_current: true,
         max_file_size: max_file_size,
@@ -712,6 +712,8 @@ module Decidim
                safe_join([yield, text.html_safe])
              elsif block_given?
                safe_join([text.html_safe, yield])
+             else
+               text
              end
 
       label(attribute, text, options || {})
@@ -928,7 +930,6 @@ module Decidim
       return {} unless options[:editor_images]
 
       {
-        editor_images: true,
         upload_images_path: Decidim::Core::Engine.routes.url_helpers.editor_images_path,
         drag_and_drop_help_text: I18n.t("drag_and_drop_help", scope: "decidim.editor_images")
       }

data/lib/decidim/participatory_space_resourceable.rb

@@ -47,7 +47,13 @@ module Decidim
              .joins(:participatory_space_resource_links_to)
              .where(decidim_participatory_space_links: { name: link_name, from_id: id, from_type: self.class.name })
 
-        klass.where(id: from).or(klass.where(id: to))
+        query = klass.where(id: from).or(klass.where(id: to)).published
+
+        if klass.column_names.include?("weight")
+          query.order(:weight)
+        else
+          query.order(created_at: :desc)
+        end
       end
 
       def participatory_space_sibling_scope(participatory_space_name)

data/lib/decidim/publicable.rb

@@ -45,5 +45,9 @@ module Decidim
     def unpublish!
       update!(published_at: nil)
     end
+
+    def previously_published?
+      respond_to?(:versions) && versions.where(event: "update").where("object ->> 'published_at' IS NOT NULL").any?
+    end
   end
 end