decidim-core 0.28.1 → 0.28.3

data/config/locales/tr-TR.yml

@@ -71,6 +71,7 @@ tr:
     accessibility:
       external_link: Dış bağlantı
       logo: "%{organization} resmi logosu"
+      opens_in_new_tab: Yeni Seçmede Aç
       skip_button: Ana içeriğe geç
     account:
       delete:
@@ -416,6 +417,7 @@ tr:
           hide_password: Şifrenizi Gizleyin
           show_password: Şifreyi Göster
           shown_password: Şifreniz Gösteriliyor
+        placeholder_email: selam@example.org
     doorkeeper:
       authorizations:
         new:
@@ -746,6 +748,7 @@ tr:
           admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
           greeting: Merhaba, %{recipient}!
           intro: "%{manager}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: "%{manager}, %{group} olarak yeni bir görüşme başlattı"
         comanagers_new_message:
           admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
@@ -755,20 +758,24 @@ tr:
         new_conversation:
           greeting: Merhaba %{recipient}!
           intro: "%{sender} sizinle yeni bir sohbet başlattı. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: "%{sender} sizinle bir konuşma başlattı"
         new_group_conversation:
           admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
           greeting: Merhaba, %{recipient}!
           intro: "%{sender}, %{group} adına yeni bir görüşme başlattı. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: "%{sender}, %{group} olarak yeni bir görüşme başlattı"
         new_group_message:
           admin_in_group: Bunu, %{group} grubunun yöneticisi olduğunuz için alıyorsunuz.
           greeting: Merhaba, %{recipient}!
           intro: "%{sender}, %{group} grubuyla bir görüşmede yeni mesajlar yayınladı. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: "%{group}, %{sender} adlı kişiden yeni mesajlar aldı"
         new_message:
           greeting: Merhaba %{recipient}!
           intro: "%{sender}, konuşmanıza yeni mesajlar gönderdi. Görmek için buraya tıklayın:"
+          outro: Platformun tadını çıkarın!
           subject: '%{sender}, size yeni mesaj gönderdi'
       conversations:
         add_conversation_users:
@@ -844,6 +851,8 @@ tr:
         subject: '%{organization_name} ile ilgili bilgileri almaya devam etmek istiyor musunuz?'
     notifications:
       no_notifications: Henüz bildirim yok.
+      show:
+        moderated: İçerik Denetlendi
     notifications_settings:
       show:
         direct_messages: Herkesten doğrudan mesaj alın
@@ -1019,6 +1028,7 @@ tr:
         filters:
           areas: alanlar
           select_an_area: Bir bölge seçin
+      progress: "Süreç\nİlerleme"
       reference:
         reference: 'Referans: %{reference}'
       represent_user_group:
@@ -1182,13 +1192,13 @@ tr:
     sessions:
       already_signed_out: Başarıyla Çıkış Yapıldı
       new:
-        log_in: Giriş Yapın
+        log_in: "Giriş \nGiriş Yapın "
       signed_out:
     shared:
       links:
         back: Geri
         forgot_your_password: Parolanızı mı unuttunuz?
-        log_in: Giriş Yapın
+        log_in: "Giriş \nGiriş Yapın "
         log_in_with_provider: '%{provider} ile giriş yapın'
         sign_up: kaydol
       minimum_password_length:
@@ -1229,6 +1239,8 @@ tr:
     timestamp_error_message: Üzgünüm, bu çok hızlıydı! Lütfen yeniden gönderin.
   layouts:
     decidim:
+      announcements:
+        view_less: Daha Az Göster
       data_consent:
         details:
           columns:
@@ -1239,11 +1251,11 @@ tr:
         cc_by_license: Kar Amaçsız Lisanslama (Creative Commons License)
         decidim_logo: Decidim Logo
         download_open_data: Açık Veri dosyalarını indir
-        log_in: Giriş Yapın
+        log_in: "Giriş \nGiriş Yapın "
         made_with_open_source: Web sitesi <a target="_blank" href="https://github.com/decidim/decidim">ücretsiz yazılımla yapılmıştır</a>.
         sign_up: Kaydol
       header:
-        log_in: Giriş Yapın
+        log_in: "Giriş \nGiriş Yapın "
       impersonation_warning:
         close_session: Oturumu kapat
         description_html: Kullanıcının kimliğine bürünüyorsunuz <b>%{user_name}</b>.
@@ -1253,6 +1265,9 @@ tr:
       notifications_dashboard:
         mark_all_as_read: Tümünü okundu olarak işaretle
         mark_as_read: Okundu olarak işaretle
+      shared:
+        layout_item:
+          prev: Önceki
       social_media_links:
         facebook: "Facebook'ta %{organization}"
         github: "GitHub'da %{organization}"
@@ -1332,6 +1347,7 @@ tr:
       long_dashed: "%Y-%m-%d %H:%M:%S"
       short: "%d/%m/%Y %H:%M"
       time_of_day: "%H:%M"
+      tooltip: "%d-%m-%Y %H:%M %p %Z (GMT %:z)\n%Gün-%Ay-%Yıl %Saat:%Dakika %p %Zone (GMT %:z)"
   versions:
     directions:
       left: Silme
@@ -1343,6 +1359,7 @@ tr:
       option_split: Yan yana
       option_unescaped: Yakalandı
       option_unified: Birleşik
+      toggle: Görünümü değiştir
   views:
     pagination:
       next_title: Sonraki sayfaya git

data/config/locales/uk.yml

@@ -201,6 +201,7 @@ uk:
       registrations:
         new:
           already_have_an_account?: Вже маєте обліковий запис?
+          log_in: Увійти
           newsletter: Отримувати іноді розсилання зі свіжими новинами
           newsletter_title: Дозвіл на зв'язок
           sign_up: Зареєструватися
@@ -476,6 +477,12 @@ uk:
     passwords:
       edit:
         new_password: Пароль
+    sessions:
+      new:
+        log_in: Увійти
+    shared:
+      links:
+        log_in: Увійти
   doorkeeper:
     scopes:
       public: Оприлюднені відомості про вас.
@@ -493,8 +500,11 @@ uk:
       edit_link:
         edit: Редагувати
       footer:
+        log_in: Увійти
         made_with_open_source: Цей веб-сайт створено за допомогою <a target="_blank" href="https://github.com/decidim/decidim">безкоштовного програмного забезпечення</a>.
         sign_up: Зареєструватися
+      header:
+        log_in: Увійти
       impersonation_warning:
         close_session: Завершити сеанс
         description_html: Ви виступаєте в ролі учасника <b>%{user_name}</b>.

data/config/locales/zh-CN.yml

@@ -192,7 +192,6 @@ zh-CN:
           '1': 创建您的修改
           '2': 比较您的修改
           '3': 完成您的修改
-          '4': 发布您的修改
     anonymous_user: 匿名的
     application:
       document:

data/config/locales/zh-TW.yml

@@ -315,7 +315,6 @@ zh-TW:
           '1': 創建您的修正案
           '2': 比較您的修正案
           '3': 完成您的修正案
-          '4': 發佈您的修正案
     anonymous_user: 匿名
     application:
       document:
@@ -514,6 +513,7 @@ zh-TW:
       registrations:
         new:
           already_have_an_account?: 已經有帳號了嗎？
+          log_in: 登入
           newsletter: 偶爾收到包含相關信息的時事通訊。
           newsletter_title: 聯絡人權限
           sign_up: 註冊登記
@@ -819,6 +819,7 @@ zh-TW:
           filename: 檔案名稱
           remove: 移除
           replace: 替換
+          save: 儲存
           title: 標題
           title_required: 標題為必填欄位！
           uploaded: 已上傳
@@ -1565,12 +1566,16 @@ zh-TW:
       signed_up_but_unconfirmed: 確認信件已送至您的 Email 信箱，請點擊信件內連結以啓動您的帳號。
       update_needs_confirmation: 您已經成功的更新帳號資訊，但我們仍需確認您的電子信箱，請至新信箱收信並點擊連結以確認您的新電子郵件帳號。
       updated: 您的帳號已成功升級。
+    sessions:
+      new:
+        log_in: 登入
     shared:
       links:
         back: 返回
         didn_t_receive_confirmation_instructions: 沒有收到確認的說明嗎？
         didn_t_receive_unlock_instructions: 沒有收到解鎖說明？
         forgot_your_password: 忘記密碼了嗎？
+        log_in: 登入
         sign_up: 註冊登記
       minimum_password_length:
         other: "One\n(最少%{count} 個字符)\n\nOther\n(最少%{count} 個字符)"
@@ -1695,9 +1700,11 @@ zh-TW:
         data_consent_settings: Cookie 設定
         decidim_logo: Decidim 商標
         download_open_data: 下載開放數據檔案
+        log_in: 登入
         made_with_open_source: 使用<a target="_blank" href="https://github.com/decidim/decidim">自由軟體</a>建立的網站。
         sign_up: 註冊
       header:
+        log_in: 登入
         main_menu: 主選單
         user_menu: 使用者選單
       impersonation_warning:

data/db/migrate/20181025082245_add_timestamps_to_components.rb

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 class AddTimestampsToComponents < ActiveRecord::Migration[5.2]
+  class Component < ApplicationRecord
+    self.table_name = :decidim_components
+  end
+
   def change
     add_timestamps :decidim_components, null: true
     # rubocop:disable Rails/SkipsModelValidations
-    Decidim::Component.update_all(created_at: Time.current, updated_at: Time.current)
+    Component.update_all(created_at: Time.current, updated_at: Time.current)
     # rubocop:enable Rails/SkipsModelValidations
     change_column_null :decidim_components, :created_at, false
     change_column_null :decidim_components, :updated_at, false

data/decidim-core.gemspec

@@ -79,7 +79,6 @@ Gem::Specification.new do |s|
   s.add_dependency "request_store", "~> 1.5.0"
   s.add_dependency "rubyXL", "~> 3.4"
   s.add_dependency "rubyzip", "~> 2.0"
-  s.add_dependency "seven_zip_ruby", "~> 1.3"
   s.add_dependency "shakapacker", "~> 7.1.0"
   s.add_dependency "valid_email2", "~> 4.0"
   s.add_dependency "web-push", "~> 3.0"

data/lib/decidim/asset_router/storage.rb

@@ -6,6 +6,23 @@ module Decidim
     # 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.
+    #
+    # Note that when the assets are stored in a remote storage service, such as
+    # Amazon S3, Google Cloud Storage or Azure Storage, this generates the asset
+    # URL directly to the storage service itself bypassing the Rails server and
+    # saving CPU time from serving the asset redirect requests. This causes a
+    # significant performance improvement on pages that display a lot of images.
+    # It will also produce a less significant performance improvement when using
+    # the local disk storage because in this situation, the images are served
+    # using one request instead of two when served directly from the storage
+    # service rather than through the asset redirect URL.
+    #
+    # When implementing changes to the logic, please keep the remote storage
+    # options and performance implications in mind because the specs for this
+    # utility do not cover the remote storage options because the extra
+    # configuration needed to test, the service itself needed for testing and
+    # the extra dependency overhead for adding these remote storage gems when
+    # they are not needed.
     class Storage
       # Initializes the router.
       #
@@ -13,25 +30,36 @@ module Decidim
       #   to
       def initialize(asset)
         @asset = asset
+        @blob =
+          case asset
+          when ActiveStorage::Blob
+            asset
+          else
+            asset&.blob
+          end
       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
+      # @return [String] The URL of the asset
       def url(**options)
-        if asset.is_a? ActiveStorage::Attached
-          routes.rails_blob_url(asset.blob, **default_options.merge(options))
-        elsif asset.is_a? ActiveStorage::Blob
-          routes.rails_blob_url(asset, **default_options.merge(options))
-        else
+        case asset
+        when ActiveStorage::Attached
+          ensure_current_host(asset.record, **options)
+          blob_url(**options)
+        when ActiveStorage::Blob
+          blob_url(**options)
+        else # ActiveStorage::VariantWithRecord, ActiveStorage::Variant
+          ensure_current_host(nil, **options)
           representation_url(**options)
         end
       end
 
       private
 
-      attr_reader :asset
+      attr_reader :asset, :blob
 
       # Provides the route helpers depending on whether the URL is generated to
       # the local host or an external CDN (remote).
@@ -80,24 +108,199 @@ module Decidim
         }.compact
       end
 
-      # Converts the variation URLs last part to the correct file extension in
-      # case the variation has a different format than the original image.
+      # Most of the times the current host should be set through the controller
+      # already when the logic below is unnecessary. This logic is needed e.g.
+      # for serializers where the request context is not available.
+      #
+      # @param record The record for which to check the organization
+      # @param opts Options for building the URL
+      # @return [void]
+      def ensure_current_host(record, **opts)
+        return if asset_url_available?
+
+        options = remote? ? remote_storage_options : routes.default_url_options
+        options = options.merge(opts)
+
+        if opts[:host].blank? && record.present?
+          organization = organization_for(record)
+          options[:host] = organization.host if organization
+        end
+
+        uri =
+          if options[:protocol] == "https" || options[:scheme] == "https"
+            URI::HTTPS.build(options)
+          else
+            URI::HTTP.build(options)
+          end
+
+        ActiveStorage::Current.host = uri.to_s
+      end
+
+      # Determines the organization for the passed record.
       #
-      # @return [String] The converted representation URL
+      # @param record The record for which to fetch the organization
+      # @return [Decidim::Organization, nil] The organization for the record or
+      #   `nil` if the organization cannot be determined
+      def organization_for(record)
+        if record.is_a?(Decidim::Organization)
+          record
+        elsif record.respond_to?(:organization)
+          record.organization
+        end
+      end
+
+      # Returns the URL for the given blob object.
+      #
+      # @param blob The blob object
+      # @param options Options for building the URL
+      # @return [String, nil] The URL to the blob object or `nil` if the blob is
+      #   not defined.
+      def blob_url(**options)
+        return unless blob
+
+        if options[:only_path] || remote? || !asset_url_available?
+          routes.rails_blob_url(blob, **default_options.merge(options))
+        else
+          blob.url(**options)
+        end
+      end
+
+      # Returns a representation URL for the asset either directly through the
+      # storage service or through the Rails representation URL in case the
+      # path URL is requested or if the asset variant has not been processed yet
+      # and is not therefore yet stored at the storage service.
+      #
+      # @return [String] The representation URL for the image variant
       def representation_url(**options)
+        return rails_representation_url(**options) if options[:only_path] || remote?
+
+        representation_url = variant_url(**options)
+        return representation_url if representation_url.present?
+
+        # In case the representation has not been processed yet, it may not have
+        # a representation URL yet and it therefore needs to be served through
+        # the local representation URL for the first time (or until it has been
+        # processed).
+        if options[:host]
+          rails_representation_url(**options)
+        else
+          representation_url(**options.merge(only_path: true))
+        end
+      end
+
+      # Returns the local Rails representation URL meaning that the asset will
+      # be served through the service itself. This may be necessary if the asset
+      # variant (e.g. a thumbnail) has not been processed yet because the
+      # variant representation has not been requested before.
+      #
+      # Due to performance reasons it is advised to avoid requesting the assets
+      # through the Rails representation URLs when possible because that causes
+      # a lot of requests to the Rails backend and slowness to the service under
+      # heavy loads.
+      #
+      # Converts the variation URLs last part to the correct file extension in
+      # case the variation has a different format than the original image. The
+      # conversion needs to be only done for the Rails representation URLs
+      # because once the image is stored at the storage service, it already has
+      # the correct file extension.
+      #
+      # @param options The options for building the URL
+      # @return [String, nil] The converted representation URL or `nil` if the
+      #   asset is not defined.
+      def rails_representation_url(**options)
+        return unless asset
+
         representation_url = routes.rails_representation_url(asset, **default_options.merge(options))
+
         variation = asset.try(:variation)
         return representation_url unless variation
 
         format = variation.try(:format)
         return representation_url unless format
+        return unless blob
 
-        original_ext = File.extname(asset.blob.filename.to_s)
+        original_ext = File.extname(blob.filename.to_s)
         return representation_url if original_ext == ".#{format}"
 
-        basename = File.basename(asset.blob.filename.to_s, original_ext)
+        basename = File.basename(blob.filename.to_s, original_ext)
         representation_url.sub(/#{basename}\.#{original_ext.tr(".", "")}$/, "#{basename}.#{format}")
       end
+
+      # Fetches the image variant's URL at the storage service if the variant
+      # has already been processed and is stored at the storage service. If the
+      # variant has not been processed yet, returns `nil` in which case the
+      # variant has to be served through the service's own representation URL
+      # causing it to be processed and stored at the storage service.
+      #
+      # @param options The options for building the URL
+      # @return [String, nil] The variant URL at the storage service or `nil` if
+      #   the variant has not been processed yet and does not yet exist at the
+      #   storage service or `nil` when the asset is not defined
+      def variant_url(**options)
+        return unless asset
+        return unless asset_url_available?
+        return unless asset_exist?
+
+        case asset
+        when ActiveStorage::VariantWithRecord
+          # This is used when `ActiveStorage.track_variants` is enabled through
+          # `config.active_storage.track_variants`. In case the variant has not
+          # been processed yet, the `#url` method would return nil.
+          #
+          # Note that if the `asset.processed?` returns `true`, the variant
+          # record has been created in the database but it does not mean that
+          # it has been uploaded to the storage service yet. Likely a bug in
+          # ActiveStorage but to be sure that the asset is uploaded to the
+          # storage service, we also check that.
+          asset.url(**options) if asset.processed?
+        else # ActiveStorage::Variant
+          # Check whether the variant exists at the storage service before
+          # returning its URL. Otherwise the URL would be returned even when the
+          # variant is not yet processed causing 404 errors for the images on
+          # the page.
+          #
+          # Note that the `ActiveStorage::Variant#url` method only accepts
+          # certain keyword arguments where as the other objects allow any
+          # keyword arguments.
+          possible_kwargs = asset.method(:url).parameters.select { |p| p[0] == :key }.map { |p| p[1] }
+          asset.url(**options.slice(*possible_kwargs))
+        end
+      end
+
+      # Determines if the asset exists at the storage service.
+      #
+      # @return [Boolean] A boolean answering the question "does this asset
+      # exist at the storage service?".
+      def asset_exist?
+        return false if asset.key.blank?
+
+        blob.service.exist?(asset.key)
+      end
+
+      # Determines if the current host is required to build the asset URL.
+      #
+      # @return [Boolean] A boolean indicating if the current host is required
+      #   to build the asset URL.
+      def current_host_required?
+        return false unless blob
+        return false unless defined?(ActiveStorage::Service::DiskService)
+
+        blob.service.is_a?(ActiveStorage::Service::DiskService)
+      end
+
+      # Determines if the asset URL can be generated.
+      #
+      # @return [Boolean] A boolean indicating if the asset URL can be
+      #   generated.
+      def asset_url_available?
+        # If the service is an external service, the URL can be generated
+        # regardless of the current host being set.
+        return true unless current_host_required?
+
+        # For the disk service, the URL can be only generated if the current
+        # host has been set.
+        ActiveStorage::Current.host.present?
+      end
     end
   end
 end

data/lib/decidim/core/engine.rb

@@ -237,6 +237,14 @@ module Decidim
         app.config.action_mailer.deliver_later_queue_name = :mailers
       end
 
+      initializer "decidim_core.signed_global_id", after: "global_id" do |app|
+        next if app.config.global_id.fetch(:expires_in, nil).present?
+
+        config.after_initialize do
+          SignedGlobalID.expires_in = nil
+        end
+      end
+
       initializer "decidim_core.middleware" do |app|
         if app.config.public_file_server.enabled
           headers = app.config.public_file_server.headers || {}

data/lib/decidim/core/seeds.rb

@@ -209,7 +209,7 @@ module Decidim
 
         oauth_application.organization_logo.attach(io: File.open(File.join(seeds_root, "homepage_image.jpg")), filename: "organization_logo.jpg", content_type: "image/jpeg")
 
-        Decidim::System::CreateDefaultContentBlocks.call(organization)
+        Decidim::ContentBlocksCreator.new(organization).create_default!
 
         hero_content_block = Decidim::ContentBlock.find_by(organization:, manifest_name: :hero, scope_name: :homepage)
         hero_content_block.images_container.background_image = create_blob!(seeds_file: "homepage_image.jpg", filename: "homepage_image.jpg", content_type: "image/jpeg")

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

@@ -10,7 +10,7 @@ shared_examples_for "attachable interface" do
 
     it "includes the attachment urls" do
       attachment_urls = response["attachments"].map { |attachment| attachment["url"] }
-      expect(attachment_urls).to include(*attachments.map(&:url))
+      expect(attachment_urls).to include_blob_urls(*attachments.map(&:file).map(&:blob))
     end
   end
 end