decidim-conferences 0.24.3 → 0.25.0.rc1

data/config/locales/sk.yml

@@ -218,7 +218,6 @@ sk:
             price: Cena
             registrations_count: Počet registrácií
             title: Názov
-            weight: Váha
           name: Typ registrácie
       partners:
         create:
@@ -500,23 +499,6 @@ sk:
         related_assemblies: Súvisiace zhromaždenia
         related_consultations: Súvisiace Konzultácie
         related_participatory_processes: Súvisiace participatívne procesy
-      statistics:
-        answers_count: Odpovede
-        comments_count: Komentáre
-        conference_count: Konferencie
-        debates_count: Debaty
-        endorsements_count: Schválenia
-        headline: Aktivita
-        meetings_count: Stretnutia
-        orders_count: Podporenia
-        pages_count: Stránky
-        posts_count: Príspevky
-        projects_count: Projekty
-        proposals_count: Návrhy
-        results_count: Výsledky
-        surveys_count: Prieskumy
-        users_count: Účastníci
-        votes_count: Podporenia
     events:
       conferences:
         conference_registration_confirmed:

data/config/locales/sl.yml

@@ -38,5 +38,3 @@ sl:
           go_to_twitter: Pojdi na Twitter
       show:
         related_assemblies: Povezane združbe
-      statistics:
-        meetings_count: Sestanki

data/config/locales/sv.yml

@@ -532,23 +532,6 @@ sv:
         related_assemblies: Relaterade grupper
         related_consultations: Relaterade samråd
         related_participatory_processes: Relaterade dialoger
-      statistics:
-        answers_count: Svar
-        comments_count: Kommentarer
-        conference_count: Konferenser
-        debates_count: Debatter
-        endorsements_count: Instämmanden
-        headline: Aktivitet
-        meetings_count: Möten
-        orders_count: Stöd
-        pages_count: Sidor
-        posts_count: Inlägg
-        projects_count: Projekt
-        proposals_count: Förslag
-        results_count: Resultat
-        surveys_count: Undersökningar
-        users_count: Deltagare
-        votes_count: Stöd
     events:
       conferences:
         conference_registration_confirmed:
@@ -596,6 +579,8 @@ sv:
         title: Media och länkar
     menu:
       conferences: Konferenser
+    statistics:
+      conferences_count: Konferenser
   devise:
     mailer:
       join_conference:

data/config/locales/tr-TR.yml

@@ -212,7 +212,6 @@ tr:
             price: Fiyat
             registrations_count: Kayıt sayısı
             title: Başlık
-            weight: Ağırlık
           name: Kayıt Türü
       partners:
         create:
@@ -494,23 +493,6 @@ tr:
         related_assemblies: İlgili montajlar
         related_consultations: İlgili istişareler
         related_participatory_processes: İlgili Katılımcı Süreçler
-      statistics:
-        answers_count: Cevaplar
-        comments_count: Yorumlar
-        conference_count: Konferanslar
-        debates_count: Tartışmalar
-        endorsements_count: Cirolar
-        headline: Aktivite
-        meetings_count: Toplantılar
-        orders_count: oy
-        pages_count: Sayfalar
-        posts_count: Mesajlar
-        projects_count: Projeler
-        proposals_count: Teklif
-        results_count: Sonuçlar
-        surveys_count: Anketler
-        users_count: Katılımcılar
-        votes_count: oy
     events:
       conferences:
         conference_registration_confirmed:

data/config/locales/zh-CN.yml

@@ -209,7 +209,6 @@ zh-CN:
             price: 价格
             registrations_count: 注册次数
             title: 标题
-            weight: 权重
           name: 注册类型
       partners:
         create:
@@ -489,23 +488,6 @@ zh-CN:
         related_assemblies: 相关的会议
         related_consultations: 相关协商
         related_participatory_processes: 相关的参与进程
-      statistics:
-        answers_count: 答案
-        comments_count: 评论
-        conference_count: 会议
-        debates_count: 辩论
-        endorsements_count: 授权
-        headline: 活动
-        meetings_count: 会议
-        orders_count: 支持
-        pages_count: 页 次
-        posts_count: 员额
-        projects_count: 项目
-        proposals_count: 建议
-        results_count: 成果
-        surveys_count: 调查
-        users_count: 参加者
-        votes_count: 支持
     events:
       conferences:
         conference_registration_confirmed:

data/db/migrate/20210408204953_allow_null_logo_column_in_decidim_conferences_partners_table.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AllowNullLogoColumnInDecidimConferencesPartnersTable < ActiveRecord::Migration[6.0]
+  def change
+    change_column_null :decidim_conferences_partners, :logo, true
+  end
+end

data/lib/decidim/api/conference_partner_type.rb

@@ -14,6 +14,10 @@ module Decidim
       field :logo, GraphQL::Types::String, "Link to the partner's logo", null: true
       field :created_at, Decidim::Core::DateTimeType, "The time this partner was created", null: true
       field :updated_at, Decidim::Core::DateTimeType, "The time this partner was updated", null: true
+
+      def logo
+        object.attached_uploader(:logo).path
+      end
     end
   end
 end

data/lib/decidim/api/conference_speaker_type.rb

@@ -18,6 +18,10 @@ module Decidim
 
       field :created_at, Decidim::Core::DateTimeType, "The time this member was created ", null: true
       field :updated_at, Decidim::Core::DateTimeType, "The time this member was updated", null: true
+
+      def avatar
+        object.attached_uploader(:avatar).path
+      end
     end
   end
 end

data/lib/decidim/api/conference_type.rb

@@ -7,6 +7,7 @@ module Decidim
       implements Decidim::Core::ParticipatorySpaceInterface
       implements Decidim::Core::ScopableInterface
       implements Decidim::Core::AttachableInterface
+      implements Decidim::Core::CategoriesContainerInterface
 
       description "A conference"
 
@@ -35,8 +36,15 @@ module Decidim
 
       field :speakers, [Decidim::Conferences::ConferenceSpeakerType, { null: true }], "List of speakers in this conference", null: true
       field :partners, [Decidim::Conferences::ConferencePartnerType, { null: true }], "List of partners in this conference", null: true
-      field :categories, [Decidim::Core::CategoryType, { null: true }], "List of categories in this conference", null: true
       field :media_links, [Decidim::Conferences::ConferenceMediaLinkType, { null: true }], "List of media links in this conference", null: true
+
+      def hero_image
+        object.attached_uploader(:hero_image).path
+      end
+
+      def banner_image
+        object.attached_uploader(:banner_image).path
+      end
     end
   end
 end

data/lib/decidim/conferences/admin_engine.rb

@@ -85,18 +85,148 @@ module Decidim
         end
       end
 
-      initializer "decidim_conferences.admin_assets" do |app|
-        app.config.assets.precompile += %w(admin/decidim_conferences_manifest.js)
+      initializer "decidim_conferences.admin_conferences_components_menu" do
+        Decidim.menu :admin_conferences_components_menu do |menu|
+          current_participatory_space.components.each do |component|
+            caption = translated_attribute(component.name)
+            if component.primary_stat.present?
+              caption += content_tag(:span, component.primary_stat, class: component.primary_stat.zero? ? "component-counter component-counter--off" : "component-counter")
+            end
+
+            menu.add_item [component.manifest_name, component.id].join("_"),
+                          caption.html_safe,
+                          manage_component_path(component),
+                          active: is_active_link?(manage_component_path(component)) ||
+                                  is_active_link?(decidim_admin_conferences.edit_component_path(current_participatory_space, component)) ||
+                                  is_active_link?(decidim_admin_conferences.edit_component_permissions_path(current_participatory_space, component)) ||
+                                  participatory_space_active_link?(component),
+                          if: component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name)
+          end
+        end
+      end
+      initializer "decidim_conferences.conferences_admin_registrations_menu" do
+        Decidim.menu :conferences_admin_registrations_menu do |menu|
+          menu.add_item :conference_registration_types,
+                        I18n.t("registration_types", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.conference_registration_types_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.conference_registration_types_path(current_participatory_space)),
+                        if: allowed_to?(:read, :registration_type, conference: current_participatory_space)
+
+          menu.add_item :conference_conference_registrations,
+                        I18n.t("user_registrations", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.conference_conference_registrations_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.conference_conference_registrations_path(current_participatory_space)),
+                        if: allowed_to?(:read, :conference_registration, conference: current_participatory_space)
+
+          menu.add_item :conference_conference_invites,
+                        I18n.t("conference_invites", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.conference_conference_invites_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.conference_conference_invites_path(current_participatory_space)),
+                        if: allowed_to?(:read, :conference_invite, conference: current_participatory_space)
+
+          menu.add_item :edit_conference_diploma,
+                        I18n.t("diploma", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.edit_conference_diploma_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.edit_conference_diploma_path(current_participatory_space)),
+                        if: allowed_to?(:update, :conference, conference: current_participatory_space)
+        end
+      end
+      initializer "decidim_conferences.conferences_admin_attachments_menu" do
+        Decidim.menu :conferences_admin_attachments_menu do |menu|
+          menu.add_item :conference_attachment_collections,
+                        I18n.t("attachment_collections", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.conference_attachment_collections_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.conference_attachment_collections_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment_collection, conference: current_participatory_space)
+
+          menu.add_item :conference_attachments,
+                        I18n.t("attachment_files", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.conference_attachments_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.conference_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment, conference: current_participatory_space)
+        end
+      end
+      initializer "decidim_conferences.conferences_admin_menu" do
+        Decidim.menu :conferences_admin_menu do |menu|
+          menu.add_item :edit_conference,
+                        I18n.t("info", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.edit_conference_path(current_participatory_space),
+                        position: 1,
+                        if: allowed_to?(:update, :conference, conference: current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.edit_conference_path(current_participatory_space))
+
+          menu.add_item :components,
+                        I18n.t("components", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.components_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.components_path(current_participatory_space)),
+                        if: allowed_to?(:read, :component, conference: current_participatory_space),
+                        submenu: { target_menu: :admin_conferences_components_menu, options: { container_options: { id: "components-list" } } }
+
+          menu.add_item :categories,
+                        I18n.t("categories", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.categories_path(current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.categories_path(current_participatory_space)),
+                        if: allowed_to?(:read, :category, conference: current_participatory_space)
+
+          menu.add_item :attachments,
+                        I18n.t("attachments", scope: "decidim.admin.menu.conferences_submenu"),
+                        "#",
+                        active: is_active_link?(decidim_admin_conferences.conference_attachment_collections_path(current_participatory_space)) ||
+                                is_active_link?(decidim_admin_conferences.conference_attachments_path(current_participatory_space)),
+                        if: allowed_to?(:read, :attachment_collection, conference: current_participatory_space) ||
+                            allowed_to?(:read, :attachment, conference: current_participatory_space),
+                        submenu: { target_menu: :conferences_admin_attachments_menu }
+
+          menu.add_item :conference_media_links,
+                        I18n.t("media_links", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.conference_media_links_path(current_participatory_space),
+                        if: allowed_to?(:read, :media_link, conference: current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.conference_media_links_path(current_participatory_space))
+
+          menu.add_item :conference_partners,
+                        I18n.t("partners", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.conference_partners_path(current_participatory_space),
+                        if: allowed_to?(:read, :partner, conference: current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.conference_partners_path(current_participatory_space))
+
+          menu.add_item :conference_speakers,
+                        I18n.t("conference_speakers", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.conference_speakers_path(current_participatory_space),
+                        if: allowed_to?(:read, :conference_speaker, conference: current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.conference_speakers_path(current_participatory_space))
+
+          menu.add_item :registrations,
+                        I18n.t("registrations", scope: "decidim.admin.menu.conferences_submenu"),
+                        "#",
+                        active: false,
+                        if: allowed_to?(:read, :conference_invite, conference: current_participatory_space) ||
+                            allowed_to?(:read, :registration_type, conference: current_participatory_space) ||
+                            allowed_to?(:read, :conference_registration, conference: current_participatory_space),
+                        submenu: { target_menu: :conferences_admin_registrations_menu }
+
+          menu.add_item :conference_user_roles,
+                        I18n.t("conference_admins", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.conference_user_roles_path(current_participatory_space),
+                        if: allowed_to?(:read, :conference_user_role, conference: current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.conference_user_roles_path(current_participatory_space))
+
+          menu.add_item :moderations,
+                        I18n.t("moderations", scope: "decidim.admin.menu.conferences_submenu"),
+                        decidim_admin_conferences.moderations_path(current_participatory_space),
+                        if: allowed_to?(:read, :moderation, conference: current_participatory_space),
+                        active: is_active_link?(decidim_admin_conferences.moderations_path(current_participatory_space))
+        end
       end
 
       initializer "decidim_conferences.admin_menu" do
         Decidim.menu :admin_menu do |menu|
-          menu.item I18n.t("menu.conferences", scope: "decidim.admin"),
-                    decidim_admin_conferences.conferences_path,
-                    icon_name: "microphone",
-                    position: 2.8,
-                    active: :inclusive,
-                    if: allowed_to?(:enter, :space_area, space_name: :conferences)
+          menu.add_item :conferences,
+                        I18n.t("menu.conferences", scope: "decidim.admin"),
+                        decidim_admin_conferences.conferences_path,
+                        icon_name: "microphone",
+                        position: 2.8,
+                        active: :inclusive,
+                        if: allowed_to?(:enter, :space_area, space_name: :conferences)
         end
       end
     end

data/lib/decidim/conferences/engine.rb

@@ -50,10 +50,6 @@ module Decidim
         end
       end
 
-      initializer "decidim_conferences.assets" do |app|
-        app.config.assets.precompile += %w(decidim_conferences_manifest.js)
-      end
-
       initializer "decidim_conferences.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Conferences::Engine.root}/app/cells")
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Conferences::Engine.root}/app/views") # for partials
@@ -67,11 +63,12 @@ module Decidim
 
       initializer "decidim_conferences.menu" do
         Decidim.menu :menu do |menu|
-          menu.item I18n.t("menu.conferences", scope: "decidim"),
-                    decidim_conferences.conferences_path,
-                    position: 2.8,
-                    if: Decidim::Conference.where(organization: current_organization).published.any?,
-                    active: :inclusive
+          menu.add_item :conferences,
+                        I18n.t("menu.conferences", scope: "decidim"),
+                        decidim_conferences.conferences_path,
+                        position: 2.8,
+                        if: Decidim::Conference.where(organization: current_organization).published.any?,
+                        active: :inclusive
         end
       end
 

data/lib/decidim/conferences/participatory_space.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:conferences) do |participatory_space|
-  participatory_space.icon = "decidim/conferences/conference.svg"
+  participatory_space.icon = "media/images/decidim_conferences.svg"
   participatory_space.model_class_name = "Decidim::Conference"
   participatory_space.stylesheet = "decidim/conferences/conferences"
 
@@ -64,8 +64,18 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
           Decidim::Faker::Localized.paragraph(sentence_count: 3)
         end,
         organization: organization,
-        hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
-        banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
+        hero_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "hero_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
+        banner_image: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city2.jpeg")),
+          filename: "banner_image.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ), # Keep after organization
         promoted: true,
         published_at: 2.weeks.ago,
         objectives: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
@@ -115,21 +125,39 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attachment_collection: attachment_collection,
         attached_to: conference,
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
+        content_type: "application/pdf",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
+          filename: "Exampledocument.pdf",
+          content_type: "application/pdf",
+          metadata: nil
+        ) # Keep after attached_to
       )
 
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: conference,
-        file: File.new(File.join(seeds_root, "city.jpeg")) # Keep after attached_to
+        content_type: "image/jpeg",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "city.jpeg")),
+          filename: "city.jpeg",
+          content_type: "image/jpeg",
+          metadata: nil
+        ) # Keep after attached_to
       )
 
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(word_count: 2),
         description: Decidim::Faker::Localized.sentence(word_count: 5),
         attached_to: conference,
-        file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
+        content_type: "application/pdf",
+        file: ActiveStorage::Blob.create_after_upload!(
+          io: File.open(File.join(seeds_root, "Exampledocument.pdf")),
+          filename: "Exampledocument.pdf",
+          content_type: "application/pdf",
+          metadata: nil
+        ) # Keep after attached_to
       )
 
       2.times do
@@ -165,7 +193,12 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
             link: Faker::Internet.url,
             partner_type: type,
             conference: conference,
-            logo: File.new(File.join(seeds_root, "logo.png")) # Keep after conference
+            logo: ActiveStorage::Blob.create_after_upload!(
+              io: File.open(File.join(seeds_root, "logo.png")),
+              filename: "logo.png",
+              content_type: "image/png",
+              metadata: nil
+            ) # Keep after conference
           )
         end
       end