decidim-core 0.21.0 → 0.22.0

data/config/locales/tr-TR.yml

@@ -206,6 +206,7 @@ tr:
         explanation: '"A" ile başlayan bir pasaport numarası girerek doğrulanın.'
         fields:
           passport_number: Pasaport numarası
+          postal_code: Posta kodu
         name: Başka bir örnek yetkilendirme
       dummy_authorization_handler:
         explanation: '"X" ile biten bir belge numarası girerek doğrulanmış olsun'
@@ -384,6 +385,8 @@ tr:
           this_application_will_not_be_able_to: 'Bu uygulama mümkün olmayacaktır:'
           update_profile: profilinizi güncelleyin
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> hesabınızı kullanmak istiyor"
+    endorsable:
+      endorsements: Cirolar
     errors:
       internal_server_error:
         title: Sunucumuzla ilgili bir sorun oluştu
@@ -725,6 +728,7 @@ tr:
         create:
           error: Konuşma başlamadı. Daha sonra tekrar deneyin
         index:
+          close: Yakın kalıcı
           no_conversations: Henüz konuşma yok
           title: Konuşmalar
         reply:
@@ -990,8 +994,6 @@ tr:
         close_window: Pencereyi kapat
         share: Pay
         share_link: Linki paylaş
-      version_author:
-        deleted: Silinmiş kullanıcı
     user_activity:
       index:
         no_activities_warning: Bu kullanıcının henüz herhangi bir etkinliği olmadı.
@@ -1004,6 +1006,9 @@ tr:
       update:
         error: İlgi alanlarınız güncellenirken bir hata oluştu.
         success: İlgi alanlarınız başarıyla güncellendi.
+    version_author:
+      show:
+        deleted: Silinmiş kullanıcı
     welcome_notification:
       default_body: <p>Merhaba {{name}}, {{organization}} katıldığınız için teşekkürler ve hoş geldiniz!</p><ul><li>Burada neler yapabileceğiniz hakkında hızlı bir fikir edinmek istiyorsanız, <a href="{{help_url}}">Yardım</a> bölümüne bakın.</li><li>Okuduktan sonra ilk rozetinizi alacaksınız. İşte bu <a href="{{badges_url}}">tüm rozetlerle listesi</a> size katılmak olarak alabilirsiniz {{organization}}</li><li>onlarla Son ama en az, diğer insanları birleştirmek, paylaşmak yapan ve katılan olma deneyimi {{organization}}. Öneriler, yorumlar, tartışmalar yapın, ortak iyiliğe nasıl katkıda bulunacağınızı düşünün, ikna edeceğiniz argümanlar sunun, ikna olun, ikna olun, fikirlerinizi somut ve doğrudan bir şekilde ifade edin, sabır ve kararla karşılık verin, fikirlerinizi savunun ve saklayın. İşbirliği yapmak ve diğer insanların fikirlerine katılmak için açık bir zihin.</li></ul>
       default_subject: '{{organization}}katıldığınız için teşekkürler!'

data/config/locales/uk.yml

@@ -138,6 +138,7 @@ uk:
         explanation: Підтвердьте свою особу, ввівши номер паспорта, що починається з "А"
         fields:
           passport_number: Номер паспорта
+          postal_code: Поштовий індекс
         name: Ще один приклад підтвердження особи
       dummy_authorization_handler:
         explanation: Підтвердьте особу, ввівши номер документа, що закінчується на "X"
@@ -278,6 +279,8 @@ uk:
           this_application_will_not_be_able_to: 'Цей додаток не зможе:'
           update_profile: Оновлювати ваш профіль
           wants_to_use_your_account_html: "<strong>%{application_name}</strong> бажає використовувати ваш обліковий запис"
+    endorsable:
+      endorsements: Проявів підтримки
     errors:
       internal_server_error:
         title: При з'єднанні з нашим сервером сталася помилка
@@ -392,6 +395,7 @@ uk:
         create:
           error: Бесіда не розпочата. Спробуйте ще раз пізніше
         index:
+          close: Закрити віконце
           no_conversations: У вас ще немає бесід
         reply:
           title: Відповісти
@@ -568,7 +572,8 @@ uk:
         close_window: Закрити вікно
         share: Поділитися
         share_link: Поділитись посиланням
-      version_author:
+    version_author:
+      show:
         deleted: Видалений учасник
   devise:
     invitations:

data/config/routes.rb

@@ -48,6 +48,7 @@ Decidim::Core::Engine.routes.draw do
       end
     end
     resources :conversations, only: [:new, :create, :index, :show, :update], controller: "messaging/conversations"
+    post "/conversations/check_multiple", to: "messaging/conversations#check_multiple"
     resources :notifications, only: [:index, :destroy] do
       collection do
         delete :read_all
@@ -99,6 +100,7 @@ Decidim::Core::Engine.routes.draw do
     get "members", to: "profiles#members", as: "profile_members"
     get "activity", to: "user_activities#index", as: "profile_activity"
     get "timeline", to: "user_timeline#index", as: "profile_timeline"
+    resources :conversations, except: [:destroy], controller: "user_conversations", as: "profile_conversations"
   end
 
   resources :pages, only: [:index, :show], format: false
@@ -120,6 +122,9 @@ Decidim::Core::Engine.routes.draw do
 
   resource :follow, only: [:create, :destroy]
   resource :report, only: [:create]
+  resources :endorsements, only: [:create, :destroy] do
+    get :identities, on: :member
+  end
   resources :amends, only: [:new, :reject, :accept], controller: :amendments do
     collection do
       post :create

data/db/migrate/20180810092428_move_organization_fields_to_hero_content_block.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class MoveOrganizationFieldsToHeroContentBlock < ActiveRecord::Migration[5.2]
-  class ::Decidim::Organization < ApplicationRecord
+  class Organization < ApplicationRecord
     self.table_name = :decidim_organizations
 
     mount_uploader :homepage_image, ::Decidim::HomepageImageUploader
@@ -9,7 +9,7 @@ class MoveOrganizationFieldsToHeroContentBlock < ActiveRecord::Migration[5.2]
 
   def change
     Decidim::ContentBlock.reset_column_information
-    Decidim::Organization.find_each do |organization|
+    Organization.find_each do |organization|
       content_block = Decidim::ContentBlock.find_by(organization: organization, scope: :homepage, manifest_name: :hero)
       settings = {}
       welcome_text = organization.welcome_text || {}

data/db/migrate/20191130151925_create_decidim_endorsements.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreateDecidimEndorsements < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_endorsements do |t|
+      t.references :resource, polymorphic: true
+      t.references :decidim_author, polymorphic: true, index: { name: "idx_endorsements_authors" }
+      t.integer :decidim_user_group_id, foreign_key: true
+      t.timestamps
+      t.index [:resource_type, :resource_id, :decidim_author_type, :decidim_author_id, :decidim_user_group_id], name: "idx_endorsements_rsrcs_and_authors", unique: true
+    end
+  end
+end

data/db/migrate/20191204075509_add_session_token_to_users.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSessionTokenToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_users, :session_token, :string
+  end
+end

data/db/migrate/20200211173227_add_direct_message_types_to_users.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddDirectMessageTypesToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_users, :direct_message_types, :string, default: "all"
+    # rubocop:disable Rails/SkipsModelValidations
+    Decidim::UserBaseEntity.update_all(direct_message_types: "all")
+    # rubocop:enable Rails/SkipsModelValidations
+
+    change_column_null :decidim_users, :direct_message_types, false
+  end
+end

data/db/migrate/20200320105904_index_foreign_keys_in_decidim_action_logs.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimActionLogs < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_action_logs, :decidim_area_id
+    add_index :decidim_action_logs, :decidim_scope_id
+    add_index :decidim_action_logs, :version_id
+  end
+end

data/db/migrate/20200320105905_index_foreign_keys_in_decidim_amendments.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimAmendments < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_amendments, :decidim_emendation_id
+  end
+end

data/db/migrate/20200320105909_index_foreign_keys_in_decidim_authorizations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimAuthorizations < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_authorizations, :unique_id
+  end
+end

data/db/migrate/20200320105917_index_foreign_keys_in_decidim_contextual_help_sections.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimContextualHelpSections < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_contextual_help_sections, :section_id
+  end
+end

data/db/migrate/20200320105919_index_foreign_keys_in_decidim_endorsements.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimEndorsements < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_endorsements, :decidim_user_group_id
+  end
+end

data/db/migrate/20200320105923_index_foreign_keys_in_decidim_notifications.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimNotifications < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_notifications, :decidim_resource_id
+  end
+end

data/db/migrate/20200320105927_index_foreign_keys_in_oauth_access_grants.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInOAuthAccessGrants < ActiveRecord::Migration[5.2]
+  def change
+    add_index :oauth_access_grants, :resource_owner_id
+  end
+end

data/db/migrate/20200323094443_add_id_to_content_blocks_scope.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIdToContentBlocksScope < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_content_blocks, :scoped_resource_id, :integer
+  end
+end

data/db/migrate/20200326102407_rename_scope_column.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RenameScopeColumn < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :decidim_content_blocks, :scope, :scope_name
+  end
+end

data/db/migrate/20200327082257_migrate_newsletters_to_templates.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+class MigrateNewslettersToTemplates < ActiveRecord::Migration[5.2]
+  class ContentBlock < ApplicationRecord
+    self.table_name = :decidim_content_blocks
+  end
+
+  class Newsletter < ApplicationRecord
+    self.table_name = :decidim_newsletters
+  end
+
+  def change
+    remove_index :decidim_content_blocks, name: "idx_dcdm_content_blocks_uniq_org_id_scope_manifest_name"
+
+    Newsletter.find_each do |newsletter|
+      existing_content_block = ContentBlock
+                               .where(decidim_organization_id: newsletter.organization_id)
+                               .where(scope_name: :newsletter_template)
+                               .find_by(scoped_resource_id: newsletter.id)
+
+      next if existing_content_block
+
+      content_block = ContentBlock.new(
+        decidim_organization_id: newsletter.organization_id,
+        manifest_name: :basic_only_text,
+        scope_name: :newsletter_template,
+        scoped_resource_id: newsletter.id,
+        settings: newsletter.body.transform_keys { |key| "body_#{key}" }
+      )
+      content_block.save!
+    end
+  end
+end

data/db/migrate/20200327082954_remove_newsletter_body.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveNewsletterBody < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :decidim_newsletters, :body
+  end
+end

data/db/migrate/20200401073419_add_index_on_content_block_scope_id.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddIndexOnContentBlockScopeId < ActiveRecord::Migration[5.2]
+  def change
+    add_index(
+      :decidim_content_blocks,
+      [:decidim_organization_id, :scope_name, :scoped_resource_id, :manifest_name],
+      name: "idx_decidim_content_blocks_org_id_scope_scope_id_manifest"
+    )
+  end
+end

data/db/seeds.rb

@@ -199,7 +199,7 @@ if !Rails.env.production? || ENV["SEED"]
 
   Decidim::System::CreateDefaultContentBlocks.call(organization)
 
-  hero_content_block = Decidim::ContentBlock.find_by(organization: organization, manifest_name: :hero, scope: :homepage)
+  hero_content_block = Decidim::ContentBlock.find_by(organization: organization, manifest_name: :hero, scope_name: :homepage)
   hero_content_block.images_container.background_image = File.new(File.join(seeds_root, "homepage_image.jpg"))
   settings = {}
   welcome_text = Decidim::Faker::Localized.sentence(5)

data/lib/decidim/api/author_interface.rb

@@ -7,12 +7,16 @@ module Decidim
       name "Author"
       description "An author"
 
+      field :id, !types.ID, "The author ID"
       field :name, !types.String, "The author's name"
       field :nickname, !types.String, "The author's nickname"
 
       field :avatarUrl, !types.String, "The author's avatar url"
       field :profilePath, !types.String, "The author's profile path"
       field :badge, !types.String, "The author's badge icon"
+      field :organizationName, !types.String, "The authors's organization name" do
+        resolve ->(obj, _args, _ctx) { obj.organization.name }
+      end
 
       field :deleted, !types.Boolean, "Whether the author's account has been deleted or not"
 

data/lib/decidim/api/endorsable_interface.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Core
+    # This interface represents an object capable of endorsements.
+    EndorsableInterface = GraphQL::InterfaceType.define do
+      name "EndorsableInterface"
+      description "An interface that can be used in objects with endorsements"
+
+      field :endorsements, !types[Decidim::Core::AuthorInterface], "The endorsements of this object." do
+        resolve ->(object, _, _) {
+          object.endorsements.map(&:normalized_author)
+        }
+      end
+
+      field :endorsementsCount, types.Int do
+        description "The total amount of endorsements the object has received"
+        property :endorsements_count
+      end
+    end
+  end
+end

data/lib/decidim/api/participatory_space_interface.rb

@@ -24,6 +24,8 @@ module Decidim
 
       field :stats, types[Decidim::Core::StatisticType] do
         resolve ->(participatory_space, _args, _ctx) {
+          return if participatory_space.respond_to?(:show_statistics) && !participatory_space.show_statistics
+
           published_components = Component.where(participatory_space: participatory_space).published
 
           stats = Decidim.component_manifests.map do |component_manifest|

data/lib/decidim/api/timestamps_interface.rb

@@ -2,10 +2,10 @@
 
 module Decidim
   module Core
-    # This interface represents a attachable object.
+    # This interface represents an object with standard create_at and updated_at timestamps.
     TimestampsInterface = GraphQL::InterfaceType.define do
       name "TimestampsInterface"
-      description "An interface that can be used in objects created_at and updated_at attributes"
+      description "An interface that can be used in objects with created_at and updated_at attributes"
 
       field :createdAt, Decidim::Core::DateTimeType do
         description "The date and time this object was created"

data/lib/decidim/coauthorable.rb

@@ -76,7 +76,7 @@ module Decidim
       #
       # Returns an Array of User, UserGroups or any other entity capable object (such as Organization).
       def identities
-        coauthorships.order(:created_at).collect(&:identity)
+        coauthorships.includes(:author, :user_group).order(:created_at).collect(&:identity)
       end
 
       # Returns the identities for the authors, only if they are user groups or users.

data/lib/decidim/component_manifest.rb

@@ -58,6 +58,11 @@ module Decidim
     # probably have the form of `Decidim::<MyComponent>::Permissions`.
     attribute :permissions_class_name, String, default: "Decidim::DefaultPermissions"
 
+    # The name of the class that handles extra logic on settings for this component.
+    # Optional class, that if present receives the settings and validates them.
+    # The suggested naming is `Decidim::<MyComponent>::Admin::ComponentForm`.
+    attribute :component_form_class_name, String, default: "Decidim::Admin::ComponentForm"
+
     # Does this component have specific data to serialize and import?
     # Beyond the attributes in decidim_component table.
     attribute :serializes_specific_data, Boolean, default: false
@@ -215,6 +220,15 @@ module Decidim
       permissions_class_name&.constantize
     end
 
+    # Public: Finds the form class from its component, using the
+    # `component_form_class_name` attribute. If the class does not exist,
+    # it raises an exception. If the class name is not set, it returns nil.
+    #
+    # Returns a Class.
+    def component_form_class
+      component_form_class_name&.constantize
+    end
+
     # Public: Finds the specific data serializer class from its name, using the
     # `specific_data_serializer_class_name` attribute. If the class does not exist,
     # it raises an exception. If the class name is not set, it returns nil.

data/lib/decidim/content_parsers.rb

@@ -4,6 +4,7 @@ module Decidim
   module ContentParsers
     autoload :BaseParser, "decidim/content_parsers/base_parser"
     autoload :UserParser, "decidim/content_parsers/user_parser"
+    autoload :UserGroupParser, "decidim/content_parsers/user_group_parser"
     autoload :HashtagParser, "decidim/content_parsers/hashtag_parser"
     autoload :NewlineParser, "decidim/content_parsers/newline_parser"
     autoload :LinkParser, "decidim/content_parsers/link_parser"

data/lib/decidim/content_parsers/user_group_parser.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ContentParsers
+    # A parser that searches user groups mentions in content.
+    #
+    # A word starting with `@` will be considered as a possible mention if
+    # they only contains letters, numbers or underscores.
+    #
+    # @see BaseParser Examples of how to use a content parser
+    class UserGroupParser < BaseParser
+      # Class used as a container for metadata
+      #
+      # @!attribute groups
+      #   @return [Array] an array of Decidim::UserGroup mentioned in content
+      Metadata = Struct.new(:groups)
+
+      # Matches a nickname if contains letters, numbers or underscores.
+      MENTION_REGEX = /\B@(\w*)\b/.freeze
+
+      # Replaces found mentions matching a nickname of an existing
+      # group in the current organization with a global id. Other
+      # mentions found that doesn't match an existing group are
+      # returned as is.
+      #
+      # @return [String] the content with the valid mentions replaced by a global id
+      def rewrite
+        content.gsub(MENTION_REGEX) do |match|
+          groups[match[1..-1]]&.to_global_id&.to_s || match
+        end
+      end
+
+      # (see BaseParser#metadata)
+      def metadata
+        Metadata.new(existing_groups)
+      end
+
+      private
+
+      def groups
+        @groups ||= Hash[
+          existing_groups.map do |group|
+            [group.nickname, group]
+          end
+        ]
+      end
+
+      def existing_groups
+        @existing_groups ||= Decidim::UserGroup.where(organization: current_organization, nickname: content_nicknames)
+      end
+
+      def content_nicknames
+        @content_nicknames ||= content.scan(MENTION_REGEX).flatten.uniq
+      end
+
+      def current_organization
+        @current_organization ||= context[:current_organization]
+      end
+    end
+  end
+end