decidim-conferences 0.30.1 → 0.31.0.rc1

data/config/locales/sv.yml

@@ -6,13 +6,9 @@ sv:
         assemblies_ids: Relaterade samråd
         available_slots: Tillgängliga platser
         banner_image: Bannerbild
-        copy_categories: Kopiera kategorier
-        copy_components: Kopiera komponenter
-        copy_features: Kopiera funktioner
         decidim_scope_id: Indelning
         description: Beskrivning
         end_date: Slutdatum
-        hashtag: Hashtag
         hero_image: Bild till startsida
         location: Plats
         main_logo: Logotyp
@@ -99,11 +95,6 @@ sv:
         new_speaker: Ny talare
         send_diplomas: Skicka deltagarbevis
         view_deleted_conferences: Visa raderade konferenser
-      conference_copies:
-        new:
-          copy: Kopiera
-          select: Välj vilka data som du vill duplicera
-          title: Duplicera konferens
       conference_publications:
         create:
           error: Det gick inte att publicera konferensen.
@@ -164,7 +155,13 @@ sv:
         exports:
           registrations: Registreringar
         form:
+          duration: Tid
+          images: Bilder
+          metadata: Metadata
+          registrations: Anmälningar
+          related_spaces: Relaterade utrymmen
           title: Allmän information
+          visibility: Synlighet
         index:
           published: Publicerad
           unpublished: Ej publicerad
@@ -172,14 +169,10 @@ sv:
           title: Borttagna konferenser
         new:
           create: Skapa
-          title: Konferens
+          title: Ny konferens
         update:
           error: Det gick inte att uppdatera konferensen.
           success: Konferensen har uppdaterats.
-      conferences_copies:
-        create:
-          error: Det gick inte att duplicera konferensen.
-          success: Konferensen har duplicerats.
       media_links:
         create:
           error: Det gick inte att skapa en ny medialänk.
@@ -219,17 +212,20 @@ sv:
       models:
         conference:
           fields:
+            actions: Åtgärder
             created_at: Skapad
             published: Publicerad
             title: Titel
         conference_speaker:
           fields:
+            actions: Handlingar
             affiliation: Anknytning
             full_name: Fullständigt namn
             position: Position
           name: Talare
         conference_user_role:
           fields:
+            actions: Handlingar
             email: E-post
             name: Namn
             role: Roll
@@ -237,16 +233,18 @@ sv:
           roles:
             admin: Administratör
             collaborator: Medarbetare
+            evaluator: Utvärderare
             moderator: Moderator
-            valuator: Handläggare
         media_link:
           fields:
+            actions: Handlingar
             date: Datum
             link: Länk
             title: Titel
           name: Medialänk
         partner:
           fields:
+            actions: Handlingar
             link: Länk
             logo: Logotyp
             name: Namn
@@ -257,6 +255,7 @@ sv:
             main_promotor: Huvudarrangör
         registration_type:
           fields:
+            actions: Handlingar
             conference_meetings: Konferensmöten
             price: Pris
             registrations_count: Antal registreringar
@@ -351,9 +350,6 @@ sv:
         title: Talare
     conferences:
       admin:
-        conference_copies:
-          form:
-            slug_help_html: 'URL-slugs används till att generera URL:er till konferensen. Använd bara bokstäver, siffror och bindestreck, och de måste börja med en bokstav. Exempel: %{url}'
         conference_invites:
           create:
             error: Det gick inte att bjuda in deltagaren till konferensen.
@@ -516,6 +512,7 @@ sv:
             sent: Skickad
         conference_registration:
           fields:
+            actions: Handlingar
             email: E-post
             name: Namn
             registration_type: Registreringstyp
@@ -614,10 +611,10 @@ sv:
           description: Längre beskrivning av konferensen
           end_date: Det datum då konferens avslutas.
           follows_count: Antal följare
-          hashtag: Konferensens hashtag, används för Twitter/X
           id: Unikt id för konferensen
     statistics:
       conferences_count: Konferenser
+      conferences_count_tooltip: Antalet publicerade konferenser.
   devise:
     mailer:
       join_conference:

data/config/locales/tr-TR.yml

@@ -3,14 +3,9 @@ tr:
   activemodel:
     attributes:
       conference:
-        assemblies_ids: İlgili kurullar
         banner_image: Banner resmi
-        copy_categories: Kategorileri kopyala
-        copy_components: Bileşenleri kopyala
-        copy_features: Özellikleri kopyala
         decidim_scope_id: Kapsam
         description: Açıklama
-        hashtag: Etiket
         hero_image: Ana resim
         participatory_processes_ids: İlgili katılımcı süreçleri
         promoted: Vurgulanan
@@ -48,11 +43,6 @@ tr:
         new_registration_type: Yeni kayıt türü
         new_speaker: Yeni Konuşmacı
         send_diplomas: Katılım sertifikaları gönder
-      conference_copies:
-        new:
-          copy: Kopyala
-          select: Çoğaltmak istediğiniz verileri seçin
-          title: Konferansı çoğalt
       conference_publications:
         create:
           error: Bu konferansı yayınlarken bir sorun oluştu.
@@ -101,19 +91,15 @@ tr:
         exports:
           registrations: Kayıtlar
         form:
+          images: Fotoğraflar
           title: Genel bilgi
         index:
           published: Yayınlandı
         new:
           create: Oluştur
-          title: Konferans
         update:
           error: Bu konferans güncellenirken bir hata oluştu.
           success: Konferans başarıyla güncellendi.
-      conferences_copies:
-        create:
-          error: Bu konferansı çoğaltırken bir hata oluştu.
-          success: Konferans başarıyla kopyalandı.
       media_links:
         create:
           error: Yeni bir medya bağlantısı oluştururken bir hata oluştu.
@@ -158,7 +144,6 @@ tr:
             admin: Yönetici
             collaborator: İşbirlikçi
             moderator: Moderatör
-            valuator: Bilirkişi
         media_link:
           fields:
             date: Tarih

data/config/locales/zh-CN.yml

@@ -3,14 +3,9 @@ zh-CN:
   activemodel:
     attributes:
       conference:
-        assemblies_ids: 相关程序集
         banner_image: 横幅图像
-        copy_categories: 复制类别
-        copy_components: 复制组件
-        copy_features: 复制功能
         decidim_scope_id: 范围
         description: 描述
-        hashtag: 标签
         hero_image: 首页图像
         participatory_processes_ids: 相关的参与进程
         promoted: 高亮
@@ -39,11 +34,6 @@ zh-CN:
       actions:
         confirm: 确认
         send_diplomas: 发送出勤证书
-      conference_copies:
-        new:
-          copy: 复制
-          select: 选择要重复的数据
-          title: 复制会议
       conference_publications:
         create:
           error: 发布此会议时出现问题。
@@ -92,19 +82,15 @@ zh-CN:
         exports:
           registrations: 注册
         form:
+          images: 图像
           title: 一般信息
         index:
           published: 已发布
         new:
           create: 创建
-          title: 'Original: ENGLISH'
         update:
           error: 更新此会议时出现问题。
           success: 会议已成功更新。
-      conferences_copies:
-        create:
-          error: 复制此会议时出现问题。
-          success: 会议成功重复。
       media_links:
         create:
           error: 创建新媒体链接时出现问题。
@@ -149,7 +135,6 @@ zh-CN:
             admin: 管理员
             collaborator: 协作者
             moderator: 版主
-            valuator: 值者
         media_link:
           fields:
             date: 日期

data/config/locales/zh-TW.yml

@@ -3,16 +3,11 @@ zh-TW:
   activemodel:
     attributes:
       conference:
-        assemblies_ids: 相關大會
         available_slots: 可用時段
         banner_image: 橫幅圖片
-        copy_categories: 複製類別
-        copy_components: 複製組件
-        copy_features: 複製功能
         decidim_scope_id: 範圍
         description: 說明
         end_date: 結束日期
-        hashtag: 主題標籤
         hero_image: 首頁圖片
         location: 位置
         main_logo: 主要標誌
@@ -85,11 +80,6 @@ zh-TW:
       actions:
         confirm: 確認
         send_diplomas: 發送出席證明書
-      conference_copies:
-        new:
-          copy: 複製
-          select: 請選擇您想要複製的資料
-          title: 複製研討會
       conference_publications:
         create:
           error: 發布此研討會時出現問題。
@@ -140,19 +130,15 @@ zh-TW:
         exports:
           registrations: 註冊
         form:
+          images: 圖片
           title: 基本資訊
         index:
           published: 已發佈
         new:
           create: 建立
-          title: 研討會
         update:
           error: 更新此研討會時發生問題。
           success: 研討會更新成功。
-      conferences_copies:
-        create:
-          error: 複製此研討會時發生問題。
-          success: 研討會複製成功。
       media_links:
         create:
           error: 創建新的媒體連結時出現問題。
@@ -197,7 +183,6 @@ zh-TW:
             admin: 管理員
             collaborator: 合作者
             moderator: 版主
-            valuator: 評價者
         media_link:
           fields:
             date: 日期

data/db/migrate/20250605094623_remove_hashtag_column_conferences.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveHashtagColumnConferences < ActiveRecord::Migration[7.1]
+  def change
+    remove_column :decidim_conferences, :hashtag, :string, if_exists: true
+  end
+end

data/lib/decidim/api/conference_registration_type_type.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This type represents a registration type
+    class ConferenceRegistrationTypeType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::TimestampsInterface
+
+      description "A conference registration type"
+
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this registration type.", null: true
+      field :id, GraphQL::Types::ID, "Internal ID of the registration type.", null: false
+      field :price, GraphQL::Types::Float, "The budget amount for this project", null: true
+      field :published_at, Decidim::Core::DateTimeType, "The time this conference was published", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this registration type.", null: false
+      field :weight, GraphQL::Types::Int, "The weight for this object", null: false
+
+      def self.authorized?(object, context)
+        chain = [
+          allowed_to?(:list, :registration_types, object, context),
+          object.visible?
+        ].all?
+
+        super && chain
+      rescue Decidim::PermissionAction::PermissionNotSetError
+        false
+      end
+    end
+  end
+end

data/lib/decidim/api/conference_speaker_type.rb

@@ -14,6 +14,7 @@ module Decidim
       field :id, GraphQL::Types::ID, "Internal ID of the speaker", null: false
       field :personal_url, GraphQL::Types::String, "Personal URL of the speaker", null: true
       field :position, Decidim::Core::TranslatedFieldType, "Position of the speaker in the conference", null: true
+      field :published_at, Decidim::Core::DateTimeType, "The time this speaker was published", null: true
       field :short_bio, Decidim::Core::TranslatedFieldType, "Short biography of the speaker", null: true
       field :twitter_handle, GraphQL::Types::String, "X handle", null: true
       field :user, Decidim::Core::UserType, "Decidim user corresponding to this speaker", null: true
@@ -21,6 +22,17 @@ module Decidim
       def avatar
         object.attached_uploader(:avatar).url
       end
+
+      def self.authorized?(object, context)
+        chain = [
+          allowed_to?(:list, :speakers, object, context),
+          object.published?
+        ].all?
+
+        super && chain
+      rescue Decidim::PermissionAction::PermissionNotSetError
+        false
+      end
     end
   end
 end

data/lib/decidim/api/conference_type.rb

@@ -7,9 +7,13 @@ module Decidim
       implements Decidim::Core::ParticipatorySpaceInterface
       implements Decidim::Core::ScopableInterface
       implements Decidim::Core::AttachableInterface
+      implements Decidim::Core::AttachableCollectionInterface
       implements Decidim::Core::TaxonomizableInterface
       implements Decidim::Core::TimestampsInterface
+      implements Decidim::Core::ReferableInterface
+      implements Decidim::Core::FollowableInterface
       implements Decidim::Core::CategoriesContainerInterface
+      implements Decidim::Core::TraceableInterface
 
       description "A conference"
 
@@ -17,17 +21,15 @@ module Decidim
       field :banner_image, GraphQL::Types::String, "The banner image for this conference", null: true
       field :description, Decidim::Core::TranslatedFieldType, "The description of this conference", null: true
       field :end_date, Decidim::Core::DateType, "The date this conference ends", null: true
-      field :hashtag, GraphQL::Types::String, "The hashtag for this conference", null: true
       field :hero_image, GraphQL::Types::String, "The hero image for this conference", null: true
-      field :id, GraphQL::Types::ID, "Internal ID for this conference", null: false
       field :location, String, "The location of this conference", null: true
       field :media_links, [Decidim::Conferences::ConferenceMediaLinkType, { null: true }], "List of media links in this conference", null: true
       field :objectives, Decidim::Core::TranslatedFieldType, "The objectives of the conference", null: true
       field :partners, [Decidim::Conferences::ConferencePartnerType, { null: true }], "List of partners in this conference", null: true
       field :promoted, GraphQL::Types::Boolean, "If this conference is promoted (therefore in the homepage)", null: true
       field :published_at, Decidim::Core::DateTimeType, "The time this conference was published", null: true
-      field :reference, GraphQL::Types::String, "Reference prefix for this conference", null: true
       field :registration_terms, Decidim::Core::TranslatedFieldType, "The registration terms of this conference", null: true
+      field :registration_types, [Decidim::Conferences::ConferenceRegistrationTypeType, { null: true }], "List of all registration type of this conference", null: true
       field :registrations_enabled, GraphQL::Types::Boolean, "If the registrations are enabled in this conference", null: true
       field :short_description, Decidim::Core::TranslatedFieldType, "The short description of this conference", null: true
       field :show_statistics, GraphQL::Types::Boolean, "If this conference shows the statistics", null: true
@@ -35,6 +37,12 @@ module Decidim
       field :slug, GraphQL::Types::String, "The slug of this conference", null: true
       field :speakers, [Decidim::Conferences::ConferenceSpeakerType, { null: true }], "List of speakers in this conference", null: true
       field :start_date, Decidim::Core::DateType, "The date this conference starts", null: true
+      field :url, GraphQL::Types::String, "The URL of this conference", null: true
+      field :weight, GraphQL::Types::Int, "The weight for this object", null: false
+
+      def url
+        EngineRouter.main_proxy(object).conference_url(object)
+      end
 
       def hero_image
         object.attached_uploader(:hero_image).url
@@ -47,6 +55,10 @@ module Decidim
       def speakers
         object.speakers.published
       end
+
+      def registration_types
+        object.registration_types.published
+      end
     end
   end
 end

data/lib/decidim/conferences/admin_engine.rb

@@ -18,7 +18,7 @@ module Decidim
         constraints(->(request) { Decidim::Admin::OrganizationDashboardConstraint.new(request).matches? }) do
           resources :conferences, param: :slug, except: [:show, :destroy] do
             resource :publish, controller: "conference_publications", only: [:create, :destroy]
-            resources :copies, controller: "conference_copies", only: [:new, :create]
+            resources :duplicates, controller: "conference_duplicates", only: [:new, :create]
             resources :speakers, controller: "conference_speakers" do
               member do
                 put :publish

data/lib/decidim/conferences/api.rb

@@ -6,5 +6,6 @@ module Decidim
     autoload :ConferenceMediaLinkType, "decidim/api/conference_media_link_type"
     autoload :ConferencePartnerType, "decidim/api/conference_partner_type"
     autoload :ConferenceSpeakerType, "decidim/api/conference_speaker_type"
+    autoload :ConferenceRegistrationTypeType, "decidim/api/conference_registration_type_type"
   end
 end

data/lib/decidim/conferences/conference_diploma_pdf.rb

@@ -7,7 +7,7 @@ module Decidim
   module Conferences
     class ConferenceDiplomaPDF
       include ActionView::Helpers::AssetUrlHelper
-      include Shakapacker::Helper
+      include ::Shakapacker::Helper
       include Decidim::TranslatableAttributes
       include Decidim::SanitizeHelper
 

data/lib/decidim/conferences/engine.rb

@@ -62,7 +62,6 @@ module Decidim
 
         Decidim.icons.register(name: "film-line", icon: "film-line", category: "system", description: "", engine: :conferences)
         Decidim.icons.register(name: "ticket-line", icon: "ticket-line", category: "system", description: "", engine: :conferences)
-        Decidim.icons.register(name: "user-follow-line", icon: "user-follow-line", category: "system", description: "", engine: :conferences)
         Decidim.icons.register(name: "link-m", icon: "link-m", category: "system", description: "", engine: :conferences)
       end
 
@@ -72,7 +71,10 @@ module Decidim
       end
 
       initializer "decidim_conferences.stats" do
-        Decidim.stats.register :conferences_count, priority: StatsRegistry::HIGH_PRIORITY do |organization, _start_at, _end_at|
+        Decidim.stats.register :conferences_count,
+                               priority: StatsRegistry::HIGH_PRIORITY,
+                               icon_name: "user-voice-line",
+                               tooltip_key: "conferences_count_tooltip" do |organization, _start_at, _end_at|
           Decidim::Conference.where(organization:).public_spaces.count
         end
       end
@@ -91,7 +93,7 @@ module Decidim
         Decidim::Api::QueryType.include Decidim::Conferences::QueryExtensions
       end
 
-      initializer "decidim_conferences.webpacker.assets_path" do
+      initializer "decidim_conferences.shakapacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
     end

data/lib/decidim/conferences/menu.rb

@@ -173,7 +173,7 @@ module Decidim
                         decidim_admin_conferences.conference_share_tokens_path(current_participatory_space),
                         active: is_active_link?(decidim_admin_conferences.conference_share_tokens_path(current_participatory_space)),
                         icon_name: "share-line",
-                        if: allowed_to?(:read, :share_tokens, current_participatory_space:)
+                        if: allowed_to?(:read, :share_token, current_participatory_space:)
         end
       end
 

data/lib/decidim/conferences/participatory_space.rb

@@ -25,6 +25,20 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
     resource.searchable = true
   end
 
+  participatory_space.register_stat :followers_count,
+                                    priority: Decidim::StatsRegistry::MEDIUM_PRIORITY,
+                                    icon_name: "user-follow-line",
+                                    tooltip_key: "followers_count_tooltip" do
+    Decidim::Conferences::ConferencesStatsFollowersCount.for(participatory_space)
+  end
+
+  participatory_space.register_stat :participants_count,
+                                    priority: Decidim::StatsRegistry::MEDIUM_PRIORITY,
+                                    icon_name: "user-line",
+                                    tooltip_key: "participants_count_tooltip" do
+    Decidim::Conferences::ConferencesStatsParticipantsCount.for(participatory_space)
+  end
+
   participatory_space.context(:public) do |context|
     context.engine = Decidim::Conferences::Engine
     context.layout = "layouts/decidim/conference"

data/lib/decidim/conferences/seeds.rb

@@ -8,28 +8,28 @@ module Decidim
       def call
         create_content_block!
 
-        2.times do |_n|
+        number_of_records.times do |_n|
           conference = create_conference!
 
           create_conference_user_roles!(conference:)
 
           create_attachments!(attached_to: conference)
 
-          5.times do
+          number_of_records.times do
             create_conference_speaker!(conference:)
           end
 
           Decidim::Conferences::Partner::TYPES.map do |type|
-            4.times do
+            number_of_records.times do
               create_conference_partner!(conference:, type:)
             end
           end
 
-          5.times do
+          number_of_records.times do
             create_conference_media_link!(conference:)
           end
 
-          5.times do
+          number_of_records.times do
             create_conference_registration_type!(conference:)
           end
 
@@ -56,7 +56,6 @@ module Decidim
           title: Decidim::Faker::Localized.sentence(word_count: 5),
           slogan: Decidim::Faker::Localized.sentence(word_count: 2),
           slug: Decidim::Faker::Internet.unique.slug(words: nil, glue: "-"),
-          hashtag: "##{::Faker::Lorem.word}",
           short_description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.sentence(word_count: 3)
           end,

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

@@ -115,7 +115,7 @@ FactoryBot.define do
     end
   end
 
-  factory :conference_valuator, parent: :user, class: "Decidim::User" do
+  factory :conference_evaluator, parent: :user, class: "Decidim::User" do
     transient do
       skip_injection { false }
       conference { create(:conference, skip_injection:) }
@@ -128,7 +128,7 @@ FactoryBot.define do
       create(:conference_user_role,
              user:,
              conference: evaluator.conference,
-             role: :valuator,
+             role: :evaluator,
              skip_injection: evaluator.skip_injection)
     end
   end

data/lib/decidim/conferences/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.30.1"
+      "0.31.0.rc1"
     end
   end
 end