decidim-core 0.27.1 → 0.27.2

data/config/locales/tr-TR.yml

@@ -322,7 +322,7 @@ tr:
           request_confirmation_instructions: Onaylama talimatlarını tekrar gönder
           title: E-posta adresinizi doğrulayın
       show:
-        close_modal: Pencereyi kapat
+        close_modal: Yakın kalıcı
     block_user_mailer:
       notify:
         body_1: Hesabınız kilitlendi.
@@ -825,6 +825,9 @@ tr:
       index:
         last_activity: Son Aktivite
         resource_type: Türü
+    links:
+      warning:
+        close_modal: Yakın kalıcı
     log:
       base_presenter:
         create: "%{user_name}, %{resource_name} oluşturdu"
@@ -951,7 +954,6 @@ tr:
     newsletter_mailer:
       newsletter:
         note: Bu e-postayı, %{organization_name} bültenlere abone olduğunuz için aldınız. Eğer ayarlarınızı değiştirebilirsiniz <a href="%{link}">bildirimleri sayfa</a>.
-        see_on_website: Bu e-postayı doğru göremiyor musunuz? Onu <a href="%{link}" target="_blank">web sitesinde görüntüle</a>.
         unsubscribe: Bu tür bir e-posta almayı iptal etmek için, <a href="%{link}" target="_blank" class="unsubscribe">Abonelikten Ayrıl</a>.
     newsletter_templates:
       basic_only_text:
@@ -1239,9 +1241,6 @@ tr:
       help_text: "<strong> Uyarı: </strong> İçerik otomatik olarak çevrilebilir ve %100 doğru olmayabilir."
       show_original: Orijinal metni göster
       show_translated: Otomatik olarak çevrilmiş metni göster
-    user_activity:
-      index:
-        no_activities_warning: Bu kullanıcının henüz herhangi bir etkinliği olmadı.
     user_contact_disabled: Bu katılımcı doğrudan mesajları kabul etmiyor.
     user_conversations:
       create:

data/config/locales/uk.yml

@@ -171,6 +171,8 @@ uk:
           invalid_field: "Для поля %{field} значення %{value} неприпустиме."
           ok: Гаразд
           title: Недостатньо прав через відсутність підтвердження особи
+      show:
+        close_modal: Закрити віконце
     collapsible_list:
       see_less: "(читати менше)"
       see_more: "(читати далі)"
@@ -339,6 +341,9 @@ uk:
       default_image: Зображення за замовчуванням
       errors:
         error: У цьому полі є помилка.
+    links:
+      warning:
+        close_modal: Закрити віконце
     log:
       base_presenter:
         create: "%{user_name} створив %{resource_name}"
@@ -387,7 +392,6 @@ uk:
     newsletter_mailer:
       newsletter:
         note: Ви отримали цього електронного листа, оскільки ви підписалися на новини щодо %{organization_name}. Ви можете змінити свої налаштування на <a href="%{link}">сторінці сповіщень</a>.
-        see_on_website: Не вдається до пуття переглянути це повідомлення? Перегляньте його на сайті <a href="%{link}" target="_blank"></a>.
         unsubscribe: Щоб відмовитися від отримання таких повідомлень, клацніть на <a href="%{link}" target="_blank" class="unsubscribe">Відмовитися</a>.
     newsletters:
       unsubscribe:

data/config/locales/zh-CN.yml

@@ -753,6 +753,9 @@ zh-CN:
       index:
         last_activity: 上次活动
         resource_type: 类型
+    links:
+      warning:
+        close_modal: 关闭模式
     log:
       base_presenter:
         create: "%{user_name} 创建了 %{resource_name}"
@@ -877,7 +880,6 @@ zh-CN:
     newsletter_mailer:
       newsletter:
         note: 您收到这封邮件是因为您订阅了 %{organization_name}的新闻通讯。您可以在您的 <a href="%{link}">通知页面</a> 更改您的设置。
-        see_on_website: 找不到正确的电子邮件？在 <a href="%{link}" target="_blank">网站</a> 上查看。
         unsubscribe: 选择不接收这种类型的电子邮件， <a href="%{link}" target="_blank" class="unsubscribe">取消订阅</a>。
     newsletter_templates:
       basic_only_text:
@@ -1151,9 +1153,6 @@ zh-CN:
       help_text: "<strong>警告：</strong> 内容可能会被自动翻译而不是100%的准确性。"
       show_original: 显示原始文本
       show_translated: 显示自动翻译的文本
-    user_activity:
-      index:
-        no_activities_warning: 此参与者尚未有任何活动。
     user_contact_disabled: 此参与者不接受私信。
     user_conversations:
       create:

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,93 @@
+# 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)
+        "#{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/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-core version.
   module Core
     def self.version
-      "0.27.1"
+      "0.27.2"
     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)

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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-core
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.27.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2023-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -740,28 +740,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.27.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.27.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.27.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.27.2
 description: Adds core features so other engines can hook into the framework.
 email:
 - josepjaume@gmail.com
@@ -2042,6 +2042,7 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
+- config/locales/ka-GE.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
@@ -2361,6 +2362,8 @@ files:
 - lib/decidim/api/types/user_group_type.rb
 - lib/decidim/api/types/user_type.rb
 - lib/decidim/asset_router.rb
+- lib/decidim/asset_router/pipeline.rb
+- lib/decidim/asset_router/storage.rb
 - lib/decidim/attachment_attributes.rb
 - lib/decidim/attribute_encryptor.rb
 - lib/decidim/attribute_object.rb
@@ -2696,7 +2699,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: The core of the Decidim framework.