decidim-meetings 0.25.1 → 0.26.0

data/config/locales/sv.yml

@@ -44,8 +44,8 @@ sv:
       models:
         meeting:
           attributes:
-            show_embedded_iframe:
-              not_embeddable: URL:en kan inte integreras
+            iframe_embed_type:
+              not_embeddable: Denna URL kan inte bäddas in på ett mötes- eller liveevenemangssida
         meeting_agenda:
           attributes:
             base:
@@ -282,6 +282,9 @@ sv:
           edit:
             close: Stäng
             title: Stäng mötet
+        meeting_copies:
+          form:
+            select_a_meeting_type: Välj mötestyp
         meetings:
           close:
             invalid: Det gick inte att stänga mötet
@@ -309,7 +312,8 @@ sv:
             registration_url_help: 'Länk: tillåt deltagare att registrera sig på en extern tjänst'
             select_a_meeting_type: Välj mötestyp
             select_a_registration_type: Välj en registreringsmetod
-            show_embedded_iframe_help: Välj om adressen ska integreras som iframe. Endast ett fåtal tjänster tillåter integrering (t.ex. Youtube, Twitch...)
+            select_an_iframe_access_level: Välj vem får tillgång till denna iframe
+            show_embedded_iframe_help: Endast ett fåtal tjänster tillåter inbäddning i möten eller live-event (t.ex. YouTube, Twitch och Jitsi)
           index:
             title: Möten
           new:
@@ -379,26 +383,37 @@ sv:
           value_types:
             organizer_presenter:
               not_found: 'Arrangören hittades inte i databasen (ID: %{id})'
+      application_helper:
+        filter_category_values:
+          all: Alla
+        filter_meeting_space_values:
+          all: Alla
+        filter_scope_values:
+          all: Alla
       calendar_modal:
         calendar_url: Kalender-URL
         close_window: Stäng fönster
         export_calendar: Exportera kalender
       conference_venues: Konferenslokaler
       content_blocks:
-        upcoming_events:
-          name: Kommande händelser
-          upcoming_events: Kommande möten
-          view_all_events: Visa alla
+        upcoming_meetings:
+          name: Kommande möten
+          upcoming_meetings: Kommande möten
+          view_all_meetings: Visa alla
       directory:
         meetings:
           index:
-            all: Allt
-            date: Datum
             meetings: Möten
-            past: Tidigare
-            search: Sök
             space_type: Deltagarutrymme
-            upcoming: Kommande
+      iframe_access_level:
+        all: Alla besökare
+        registered: Registrerade deltagare till detta möte
+        signed_in: Endast registrerade deltagare
+      iframe_embed_type:
+        embed_in_meeting_page: Bädda in på mötessidan
+        none: Ingen
+        open_in_live_event_page: Öppna i live event sida (med valfria omröstningar)
+        open_in_new_tab: Öppna länk i ny flik
       last_activity:
         meeting_updated_at_html: "<span>Mötet uppdaterades på %{link}</span>"
         new_meeting_at_html: "<span>Nytt möte på %{link}</span>"
@@ -481,9 +496,14 @@ sv:
           select_a_category: Välj en kategori
           select_a_meeting_type: Välj mötestyp
           select_a_registration_type: Välj en registreringsmetod
-          show_embedded_iframe_help: Välj om adressen ska integreras som iframe. Endast ett fåtal tjänster tillåter integrering (t.ex. Youtube, Twitch...)
+          select_an_iframe_access_level: Välj vem får tillgång till denna iframe
+          show_embedded_iframe_help: Endast ett fåtal tjänster tillåter inbäddning i möten eller live-event (t.ex. YouTube, Twitch och Jitsi)
         index:
+          click_here: Se alla möten
           new_meeting: Nytt möte
+          see_all: Se alla möten
+          see_all_withdrawn: Se alla tillbakadragna möten
+          text_banner: Du tittar på listan över möten som dragits tillbaka av sina författare. %{go_back_link}.
         meeting_minutes:
           related_information: Relaterad information
         meetings:
@@ -502,6 +522,7 @@ sv:
           close_meeting: Avsluta möte
           contributions: Antal bidrag
           date: Datum
+          edit_close_meeting: Redigera mötesrapport
           edit_meeting: Redigera möte
           going: Du har anmält dig för detta möte
           join: Gå med i mötet
@@ -523,6 +544,9 @@ sv:
             other: "%{count} platser kvar"
           view: Visa
           visit_finished: Visa tidigare möten
+          withdraw_btn_hint: Du kan dra tillbaka ditt möte om du ändrar dig. Mötet raderas inte utan kommer att synas i listan över möten som dragits tillbaka.
+          withdraw_confirmation_html: Är du säker på att du vill dra tillbaka det här mötet?<br><br><strong>Den här åtgärden kan inte ångras!</strong>
+          withdraw_meeting: Dra tillbaka möte
         update:
           invalid: Det gick inte att uppdatera mötet.
           success: Du har uppdaterat mötet.
@@ -600,8 +624,12 @@ sv:
       types:
         private_meeting: Privat möte
         transparent: Transparent
+        withdraw: Tillbakadragna
       versions:
         back_to_resource: Gå tillbaka till mötet
+      withdraw:
+        error: Det gick inte att dra tillbaka mötet
+        success: Mötet har dragits tillbaka
     metrics:
       meetings:
         description: Antal skapade möten

data/config/locales/tr-TR.yml

@@ -67,6 +67,16 @@ tr:
         other: Kayıtlar
   decidim:
     admin:
+      filters:
+        meetings:
+          origin_eq:
+            label: Orijin
+            values:
+              official: Resmi
+          type_eq:
+            values:
+              hybrid: Her ikisi
+              online: Çevrimiçi
       meeting_copies:
         create:
           error: Bu toplantıyı kopyalarken bir sorun oluştu.
@@ -255,7 +265,7 @@ tr:
             update: Güncelle
           form:
             address_help: 'Adres: Geocoder tarafından konumu bulmak için kullanılır'
-            available_slots_help: Sınırsız yuvanız varsa bunu 0 olarak bırakın
+            available_slots_help: Sınırsız alanınız varsa bunu 0 olarak bırakın
             disclaimer: 'Sorumluluk reddi: Harici bir kayıt sistemi kullanarak, %{organization} organizatörlerinin, kullanıcılar tarafından harici hizmete sağlanan verilerden sorumlu olmadığını biliyorsunuz.'
             location_help: 'Konum: kullanıcılara buluşulacak yeri ima eden mesaj'
             location_hints_help: 'Konum ipuçları: ek bilgi. Örnek: Yüz yüze bir toplantıysa binanın katı veya kısıtlı erişime sahip çevrimiçi bir toplantıysa toplantı parolası.'
@@ -326,20 +336,13 @@ tr:
         export_calendar: Takvimi dışa aktar
       conference_venues: Konferans Mekanları
       content_blocks:
-        upcoming_events:
-          name: Yaklaşan Etkinlikler
-          upcoming_events: Yaklaşan toplantılar
-          view_all_events: Hepsini gör
+        upcoming_meetings:
+          view_all_meetings: Hepsini gör
       directory:
         meetings:
           index:
-            all: Tümü
-            date: Tarih
             meetings: Toplantılar
-            past: Geçmiş
-            search: Arama
             space_type: Katılımcı alan
-            upcoming: Yaklaşan
       last_activity:
         new_meeting_at_html: "<span>%{link} </span> adresinde yeni toplantı"
       mailer:

data/config/locales/uk.yml

@@ -263,15 +263,6 @@ uk:
           value_types:
             organizer_presenter:
               not_found: 'Цього організатора не знайдено в базі даних (ID: %{id})'
-      content_blocks:
-        upcoming_events:
-          upcoming_events: Прийдешні зустрічі
-      directory:
-        meetings:
-          index:
-            all: Усі
-            date: Дата
-            search: Шукати
       mailer:
         invite_join_meeting_mailer:
           invite:

data/config/locales/val-ES.yml

@@ -0,0 +1 @@
+val:

data/config/locales/zh-CN.yml

@@ -59,6 +59,12 @@ zh-CN:
         other: 注册
   decidim:
     admin:
+      filters:
+        meetings:
+          origin_eq:
+            label: 始发地
+            values:
+              official: 官方的
       meeting_copies:
         create:
           error: 重复这次会议时出现问题。
@@ -304,20 +310,13 @@ zh-CN:
         export_calendar: 导出日历
       conference_venues: 会议地点
       content_blocks:
-        upcoming_events:
-          name: 即将到来的事件
-          upcoming_events: 即将举行的会议
-          view_all_events: 查看全部
+        upcoming_meetings:
+          view_all_meetings: 查看全部
       directory:
         meetings:
           index:
-            all: 所有的
-            date: 日期
             meetings: 会议
-            past: 过去的
-            search: 搜索
             space_type: 参与空间
-            upcoming: 即将到来的
       last_activity:
         new_meeting_at_html: "<span>在 %{link}的新会议</span>"
       mailer:

data/db/migrate/20210519133705_add_comments_availability_columns_to_meetings_table.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class AddCommentsAvailabilityColumnsToMeetingsTable < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_meetings_meetings, :comments_enabled, :boolean, default: true
+    add_column :decidim_meetings_meetings, :comments_start_time, :datetime
+    add_column :decidim_meetings_meetings, :comments_end_time, :datetime
+    reversible do |dir|
+      dir.up do
+        execute "UPDATE decidim_meetings_meetings set comments_enabled = true"
+      end
+    end
+  end
+end

data/db/migrate/20210727085318_add_state_field_to_meeting.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddStateFieldToMeeting < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_meetings_meetings, :state, :string, index: true
+  end
+end

data/db/migrate/20210903143040_add_iframe_access_level_to_decidim_meetings.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIframeAccessLevelToDecidimMeetings < ActiveRecord::Migration[6.0]
+  def change
+    add_column :decidim_meetings_meetings, :iframe_access_level, :integer, default: 0
+  end
+end

data/db/migrate/20210922140454_transform_show_embedded_iframe_column.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class TransformShowEmbeddedIframeColumn < ActiveRecord::Migration[6.0]
+  def up
+    add_column :decidim_meetings_meetings, :iframe_embed_type, :integer, default: 0
+    execute "UPDATE decidim_meetings_meetings SET iframe_embed_type = 1 WHERE show_embedded_iframe = 't'"
+    remove_column :decidim_meetings_meetings, :show_embedded_iframe
+  end
+
+  def down
+    add_column :decidim_meetings_meetings, :show_embedded_iframe, :boolean, default: false
+    execute "UPDATE decidim_meetings_meetings SET show_embedded_iframe = 't' WHERE iframe_embed_type = 1"
+    remove_column :decidim_meetings_meetings, :iframe_embed_type
+  end
+end

data/db/migrate/20210928095036_rename_upcoming_events_content_block_to_upcoming_meetings.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RenameUpcomingEventsContentBlockToUpcomingMeetings < ActiveRecord::Migration[6.0]
+  class ContentBlock < ApplicationRecord
+    self.table_name = :decidim_content_blocks
+  end
+
+  def change
+    # rubocop:disable Rails/SkipsModelValidations
+    ContentBlock.where(manifest_name: "upcoming_events").update_all(manifest_name: "upcoming_meetings")
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/lib/decidim/api/meeting_type.rb

@@ -28,6 +28,7 @@ module Decidim
       end
 
       field :closed, GraphQL::Types::Boolean, "Whether this meeting is closed or not.", method: :closed?, null: false
+      field :isWithdrawn, GraphQL::Types::Boolean, "Whether this meeting is withdrawn or not.", method: :withdrawn?, null: false
       field :closing_report, Decidim::Core::TranslatedFieldType, "The closing report of this meeting.", null: true
       field :video_url, GraphQL::Types::String, "URL for the video of the session, if any", null: true
       field :audio_url, GraphQL::Types::String, "URL for the audio of the session, if any", null: true
@@ -72,7 +73,7 @@ module Decidim
       end
       field :type_of_meeting, GraphQL::Types::String, "The type of the meeting (online or in-person)", null: false
       field :online_meeting_url, GraphQL::Types::String, "The URL of the meeting (when the type is online)", null: false
-      field :show_embedded_iframe, GraphQL::Types::Boolean, "Whether show or not the iframe", null: false
+      field :iframe_embed_type, GraphQL::Types::String, "The type of displaying of the online meeting URL", null: true
     end
   end
 end

data/lib/decidim/meetings/component.rb

@@ -25,7 +25,7 @@ Decidim.register_component(:meetings) do |component|
   end
 
   component.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
-    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at)
+    meetings = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).except_withdrawn
     meetings.count
   end
 
@@ -46,7 +46,7 @@ Decidim.register_component(:meetings) do |component|
         .not_hidden
         .visible
         .where(component: component_instance)
-        .includes(component: { participatory_space: :organization })
+        .includes(:scope, :category, :attachments, component: { participatory_space: :organization })
     end
 
     exports.include_in_open_data = true
@@ -58,7 +58,7 @@ Decidim.register_component(:meetings) do |component|
     exports.collection do |component_instance|
       Decidim::Comments::Export.comments_for_resource(
         Decidim::Meetings::Meeting, component_instance
-      )
+      ).includes(:author, :user_group, root_commentable: { component: { participatory_space: :organization } })
     end
 
     exports.include_in_open_data = true
@@ -129,6 +129,7 @@ Decidim.register_component(:meetings) do |component|
 
     2.times do
       start_time = [rand(1..20).weeks.from_now, rand(1..20).weeks.ago].sample
+      end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
       params = {
         component: component,
         scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
@@ -140,7 +141,7 @@ Decidim.register_component(:meetings) do |component|
         location: Decidim::Faker::Localized.sentence,
         location_hints: Decidim::Faker::Localized.sentence,
         start_time: start_time,
-        end_time: start_time + rand(1..4).hours,
+        end_time: end_time,
         address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
         latitude: Faker::Address.latitude,
         longitude: Faker::Address.longitude,
@@ -156,14 +157,22 @@ Decidim.register_component(:meetings) do |component|
       _hybrid_meeting = Decidim.traceability.create!(
         Decidim::Meetings::Meeting,
         admin_user,
-        params.merge(type_of_meeting: :hybrid, online_meeting_url: "http://example.org"),
+        params.merge(
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          type_of_meeting: :hybrid,
+          online_meeting_url: "http://example.org"
+        ),
         visibility: "all"
       )
 
       _online_meeting = Decidim.traceability.create!(
         Decidim::Meetings::Meeting,
         admin_user,
-        params.merge(type_of_meeting: :online, online_meeting_url: "http://example.org"),
+        params.merge(
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          type_of_meeting: :online,
+          online_meeting_url: "http://example.org"
+        ),
         visibility: "all"
       )
 

data/lib/decidim/meetings/directory_engine.rb

@@ -22,9 +22,9 @@ module Decidim
       end
 
       initializer "decidim.meetings.content_blocks" do
-        Decidim.content_blocks.register(:homepage, :upcoming_events) do |content_block|
-          content_block.cell = "decidim/meetings/content_blocks/upcoming_events"
-          content_block.public_name_key = "decidim.meetings.content_blocks.upcoming_events.name"
+        Decidim.content_blocks.register(:homepage, :upcoming_meetings) do |content_block|
+          content_block.cell = "decidim/meetings/content_blocks/upcoming_meetings"
+          content_block.public_name_key = "decidim.meetings.content_blocks.upcoming_meetings.name"
           content_block.default!
         end
       end

data/lib/decidim/meetings/engine.rb

@@ -13,7 +13,10 @@ module Decidim
       isolate_namespace Decidim::Meetings
 
       routes do
-        resources :meetings, only: [:index, :show, :new, :create, :edit, :update] do
+        resources :meetings, only: [:index, :show, :new, :create, :edit, :update, :withdraw] do
+          member do
+            put :withdraw
+          end
           resources :meeting_closes, only: [:edit, :update] do
             get :proposals_picker, on: :collection
           end

data/lib/decidim/meetings/meeting_serializer.rb

@@ -41,8 +41,8 @@ module Decidim
           location: meeting.location,
           reference: meeting.reference,
           comments: meeting.comments_count,
-          attachments: meeting.attachments.count,
-          followers: meeting.followers.count,
+          attachments: meeting.attachments.size,
+          followers: meeting.follows.size,
           url: url,
           related_proposals: related_proposals,
           related_results: related_results

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

@@ -37,7 +37,8 @@ FactoryBot.define do
     registration_type { :on_this_platform }
     type_of_meeting { :in_person }
     component { build(:component, manifest_name: "meetings") }
-    show_embedded_iframe { false }
+    iframe_access_level { :all }
+    iframe_embed_type { :none }
 
     author do
       component.try(:organization)
@@ -47,6 +48,10 @@ FactoryBot.define do
       published_at { Time.current }
     end
 
+    trait :withdrawn do
+      state { "withdrawn" }
+    end
+
     trait :in_person do
       type_of_meeting { :in_person }
     end
@@ -135,8 +140,30 @@ FactoryBot.define do
       published_at { Time.current }
     end
 
-    trait :show_embedded_iframe do
-      show_embedded_iframe { true }
+    trait :signed_in_iframe_access_level do
+      iframe_access_level { :signed_in }
+    end
+
+    trait :registered_iframe_access_level do
+      iframe_access_level { :registered }
+    end
+
+    trait :embed_in_meeting_page_iframe_embed_type do
+      iframe_embed_type { :embed_in_meeting_page }
+    end
+
+    trait :open_in_live_event_page_iframe_embed_type do
+      iframe_embed_type { :open_in_live_event_page }
+    end
+
+    trait :open_in_new_tab_iframe_embed_type do
+      iframe_embed_type { :open_in_new_tab }
+    end
+
+    trait :moderated do
+      after(:create) do |meeting, _evaluator|
+        create(:moderation, reportable: meeting, hidden_at: 2.days.ago)
+      end
     end
   end
 

data/lib/decidim/meetings/test/notifications_handling.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+shared_examples_for "emits an upcoming notificaton" do
+  context "when it's a future meeting" do
+    let(:future_start_date) { 3.days.from_now }
+
+    before do
+      meeting.start_time = future_start_date
+    end
+
+    it "schedules a upcoming meeting notification job 48h before start time" do
+      expect(Decidim::Meetings::UpcomingMeetingNotificationJob)
+        .to receive(:generate_checksum).and_return "1234"
+
+      expect(Decidim::Meetings::UpcomingMeetingNotificationJob)
+        .to receive_message_chain(:set, :perform_later) # rubocop:disable RSpec/MessageChain
+        .with(set: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
+        .with(kind_of(Integer), "1234")
+
+      subject.call
+    end
+  end
+
+  context "when it's a past meeting" do
+    let(:past_start_date) { 1.day.ago }
+
+    before do
+      meeting.start_time = past_start_date
+    end
+
+    it "doesn't schedule an upcoming meeting notification" do
+      expect(Decidim::Meetings::UpcomingMeetingNotificationJob).not_to receive(:generate_checksum)
+      expect(Decidim::Meetings::UpcomingMeetingNotificationJob).not_to receive(:set)
+      expect(Decidim::Meetings::UpcomingMeetingNotificationJob).not_to receive(:perform_later)
+
+      subject.call
+    end
+  end
+end

data/lib/decidim/meetings/test/translated_event.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+shared_examples_for "a translated meeting event" do
+  describe "translated notifications" do
+    let(:en_body) { "This is Sparta!" }
+    let(:body) { { "en": en_body, "machine_translations": { "ca": "C'est Sparta!" } } }
+    let(:participatory_process) { create :participatory_process, organization: organization }
+    let(:meeting_component) { create(:meeting_component, participatory_space: participatory_process) }
+    let(:translatable) { true }
+    let(:en_version) { resource.description["en"] }
+    let(:machine_translated) { resource.description["machine_translations"]["ca"] }
+
+    let(:resource) do
+      create :meeting,
+             component: meeting_component,
+             title: { "en": "A nice event", "machine_translations": { "ca": "Une belle event" } },
+             description: body
+    end
+
+    it_behaves_like "a translated event"
+  end
+end

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.25.1"
+      "0.26.0"
     end
   end
 end

data/lib/decidim/meetings.rb

@@ -23,5 +23,10 @@ module Decidim
     config_accessor :enable_proposal_linking do
       Decidim.const_defined?("Proposals")
     end
+
+    # Public Setting that defines the interval when the upcoming meeting will be sent
+    config_accessor :upcoming_meeting_notification do
+      2.days
+    end
   end
 end