decidim-meetings 0.27.5 → 0.28.0.rc4

data/lib/decidim/meetings/engine.rb

@@ -28,47 +28,62 @@ module Decidim
               post :answer
             end
           end
-          resources :versions, only: [:show, :index]
-          resource :widget, only: :show, path: "embed"
+          resources :versions, only: [:show]
           resource :live_event, only: :show
           namespace :polls do
             resources :questions, only: [:index, :update]
             resources :answers, only: [:index, :create]
           end
         end
-        root to: "meetings#index"
+        scope "/meetings" do
+          root to: "meetings#index"
+        end
+        get "/", to: redirect("meetings", status: 301)
+
         resource :calendar, only: [:show], format: :text do
           resources :meetings, only: [:show], controller: :calendars, action: :meeting_calendar
         end
       end
 
-      initializer "decidim.content_processors" do |_app|
+      initializer "decidim_meetings.register_icons" do
+        Decidim.icons.register(name: "Decidim::Meetings::Meeting", icon: "map-pin-line", description: "Meeting", category: "activity", engine: :meetings)
+        Decidim.icons.register(name: "in_person", icon: "community-line", description: "In person", category: "meetings", engine: :meetings)
+        Decidim.icons.register(name: "online", icon: "webcam-line", description: "Online", category: "meetings", engine: :meetings)
+        Decidim.icons.register(name: "hybrid", icon: "home-wifi-line", description: "Hybrid", category: "meetings", engine: :meetings)
+
+        Decidim.icons.register(name: "calendar-check-line", icon: "calendar-check-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "community-line", icon: "community-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "webcam-line", icon: "webcam-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "download-cloud-2-line", icon: "download-cloud-2-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "share-forward-2-line", icon: "share-forward-2-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "home-wifi-line", icon: "home-wifi-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "coupon-line", icon: "coupon-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "door-open-line", icon: "door-open-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "broadcast-line", icon: "broadcast-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "star-line", icon: "star-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "list-ordered", icon: "list-ordered", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "bill-line", icon: "bill-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "add-box-line", icon: "add-box-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "calendar-close-line", icon: "calendar-close-line", category: "system", description: "", engine: :meetings)
+      end
+
+      initializer "decidim_meetings.content_processors" do |_app|
         Decidim.configure do |config|
           config.content_processors += [:meeting]
         end
       end
 
+      initializer "decidim_meetings.content_security_handlers" do |_app|
+        Decidim.configure do |config|
+          config.content_security_policies_extra.deep_merge!({ "frame-src" => %w(player.twitch.tv meet.jit.si) })
+        end
+      end
+
       initializer "decidim_meetings.view_hooks" do
         Decidim.view_hooks.register(:participatory_space_highlighted_elements, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
           view_context.cell("decidim/meetings/highlighted_meetings", view_context.current_participatory_space)
         end
 
-        # This view hook is used in card cells. It renders the next upcoming
-        # meeting for the given participatory space.
-        Decidim.view_hooks.register(:upcoming_meeting_for_card, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
-          published_components = Decidim::Component.where(participatory_space: view_context.current_participatory_space).published
-          upcoming_meeting = Decidim::Meetings::Meeting.where(component: published_components).published.upcoming.order(:start_time, :end_time).first
-
-          next unless upcoming_meeting
-
-          view_context.render(
-            partial: "decidim/participatory_spaces/upcoming_meeting_for_card.html",
-            locals: {
-              upcoming_meeting: upcoming_meeting
-            }
-          )
-        end
-
         Decidim.view_hooks.register(:conference_venues, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
           published_components = Decidim::Component.where(participatory_space: view_context.current_participatory_space).published
           meetings = Decidim::Meetings::Meeting.visible.not_hidden.published.where(component: published_components).group_by(&:address)
@@ -79,8 +94,8 @@ module Decidim
           view_context.render(
             partial: "decidim/participatory_spaces/conference_venues",
             locals: {
-              meetings: meetings,
-              meetings_geocoded: meetings_geocoded
+              meetings:,
+              meetings_geocoded:
             }
           )
         end
@@ -95,7 +110,7 @@ module Decidim
         Decidim::Gamification.register_badge(:attended_meetings) do |badge|
           badge.levels = [1, 3, 5, 10, 30]
           badge.reset = lambda do |user|
-            Decidim::Meetings::Registration.where(user: user).count
+            Decidim::Meetings::Registration.where(user:).count
           end
         end
       end
@@ -126,11 +141,31 @@ module Decidim
       end
 
       initializer "decidim_meetings.register_reminders" do
-        Decidim.reminders_registry.register(:close_meeting) do |reminder_registry|
-          reminder_registry.generator_class_name = "Decidim::Meetings::CloseMeetingReminderGenerator"
+        config.after_initialize do
+          Decidim.reminders_registry.register(:close_meeting) do |reminder_registry|
+            reminder_registry.generator_class_name = "Decidim::Meetings::CloseMeetingReminderGenerator"
+
+            reminder_registry.settings do |settings|
+              settings.attribute :reminder_times, type: :array, default: [3.days, 7.days]
+            end
+          end
+        end
+      end
+
+      initializer "decidim_meetings.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:meetings) do |transfer|
+            transfer.move_records(Decidim::Meetings::Meeting, :decidim_author_id)
+            transfer.move_records(Decidim::Meetings::Registration, :decidim_user_id)
+            transfer.move_records(Decidim::Meetings::Answer, :decidim_user_id)
+          end
+        end
+      end
 
-          reminder_registry.settings do |settings|
-            settings.attribute :reminder_times, type: :array, default: [3.days, 7.days]
+      initializer "decidim_meetings.moderation_content" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.admin.block_user:after") do |_event_name, data|
+            Decidim::Meetings::HideAllCreatedByAuthorJob.perform_later(**data)
           end
         end
       end

data/lib/decidim/meetings/meeting_serializer.rb

@@ -43,9 +43,9 @@ module Decidim
           comments: meeting.comments_count,
           attachments: meeting.attachments.size,
           followers: meeting.follows.size,
-          url: url,
-          related_proposals: related_proposals,
-          related_results: related_results,
+          url:,
+          related_proposals:,
+          related_results:,
           published: meeting.published_at.present?
         }
       end

data/lib/decidim/meetings/seeds.rb

@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+
+require "decidim/components/namer"
+require "decidim/seeds"
+
+module Decidim
+  module Meetings
+    class Seeds < Decidim::Seeds
+      attr_reader :participatory_space
+
+      def initialize(participatory_space:)
+        @participatory_space = participatory_space
+      end
+
+      def call
+        component = create_component!
+
+        2.times do
+          create_meeting!(component:, type: :online)
+          create_meeting!(component:, type: :hybrid)
+          meeting = create_meeting!(component:, type: :in_person)
+
+          2.times do
+            create_service!(meeting:)
+          end
+
+          create_questionnaire_for!(meeting:)
+
+          2.times do |_n|
+            create_meeting_registration!(meeting:)
+          end
+
+          create_attachments!(attached_to: meeting)
+        end
+
+        create_meeting!(component:, type: [:in_person, :online, :hybrid].sample, author_type: :user)
+        create_meeting!(component:, type: [:in_person, :online, :hybrid].sample, author_type: :user_group)
+      end
+
+      def create_component!
+        params = {
+          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name,
+          published_at: Time.current,
+          manifest_name: :meetings,
+          participatory_space:
+        }
+
+        Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Component,
+          admin_user,
+          visibility: "all"
+        ) do
+          Decidim::Component.create!(params)
+        end
+      end
+
+      def meeting_params(component:, type:, author_type:)
+        start_time = ::Faker::Date.between(from: 20.weeks.ago, to: 20.weeks.from_now)
+        end_time = start_time + [rand(1..4).hours, rand(1..20).days].sample
+
+        params = {
+          component:,
+          scope: random_scope(participatory_space:),
+          category: participatory_space.categories.sample,
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
+          end,
+          location: Decidim::Faker::Localized.sentence,
+          location_hints: Decidim::Faker::Localized.sentence,
+          start_time:,
+          end_time:,
+          address: "#{::Faker::Address.street_address} #{::Faker::Address.zip} #{::Faker::Address.city}",
+          latitude: ::Faker::Address.latitude,
+          longitude: ::Faker::Address.longitude,
+          registrations_enabled: [true, false].sample,
+          available_slots: (10..50).step(10).to_a.sample,
+          author: participatory_space.organization,
+          registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
+          end,
+          published_at: ::Faker::Boolean.boolean(true_ratio: 0.8) ? Time.current : nil
+        }
+
+        params = case type
+                 when :hybrid
+                   params.merge(
+                     title: Decidim::Faker::Localized.sentence(word_count: 2),
+                     type_of_meeting: :hybrid,
+                     online_meeting_url: "http://example.org"
+                   )
+                 when :online
+                   params.merge(
+                     location: nil,
+                     location_hints: nil,
+                     latitude: nil,
+                     longitude: nil,
+                     title: Decidim::Faker::Localized.sentence(word_count: 2),
+                     type_of_meeting: :online,
+                     online_meeting_url: "http://example.org"
+                   )
+                 else
+                   params # :in_person
+                 end
+
+        case author_type
+        when :user
+          params.merge(
+            author: Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample
+          )
+        when :user_group
+          user_group = Decidim::UserGroup.where(decidim_organization_id: participatory_space.decidim_organization_id).verified.sample
+          author = user_group.users.sample
+
+          params.merge(
+            author:,
+            user_group:
+          )
+        else
+          params # oficial
+        end
+      end
+
+      # Create a meeting
+      #
+      # @param component [Decidim::Component] The component where this class will be created
+      # @param type [:in_person, :hybrid, :online] The meeting type
+      # @param author_type [:official, :user, :user_group] Which type the author of the meeting will be
+      #
+      # @return [Decidim::Meeting]
+      def create_meeting!(component:, type: :in_person, author_type: :official)
+        params = meeting_params(component:, type:, author_type:)
+
+        Decidim.traceability.create!(
+          Decidim::Meetings::Meeting,
+          admin_user,
+          params,
+          visibility: "all"
+        )
+      end
+
+      def create_service!(meeting:)
+        Decidim::Meetings::Service.create!(
+          meeting:,
+          title: Decidim::Faker::Localized.sentence(word_count: 2),
+          description: Decidim::Faker::Localized.sentence(word_count: 5)
+        )
+      end
+
+      def create_questionnaire_for!(meeting:)
+        Decidim::Forms::Questionnaire.create!(
+          title: Decidim::Faker::Localized.paragraph,
+          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
+          end,
+          tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 2)
+          end,
+          questionnaire_for: meeting
+        )
+      end
+
+      def create_meeting_registration!(meeting:)
+        r = SecureRandom.hex(4)
+        email = "meeting-registered-user-#{meeting.id}-#{r}@example.org"
+        name = "#{::Faker::Name.name} #{meeting.id} #{r}"
+        user = Decidim::User.find_or_initialize_by(email:)
+
+        user.update!(
+          password: "decidim123456789",
+          name:,
+          nickname: ::Faker::Twitter.unique.screen_name,
+          organization:,
+          tos_agreement: "1",
+          confirmed_at: Time.current,
+          personal_url: ::Faker::Internet.url,
+          about: ::Faker::Lorem.paragraph(sentence_count: 2)
+        )
+
+        Decidim::Meetings::Registration.create!(
+          meeting:,
+          user:
+        )
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
 require "decidim/core/test/factories"
 require "decidim/forms/test/factories"
 require "decidim/participatory_processes/test/factories"
@@ -8,7 +9,7 @@ FactoryBot.define do
   factory :meeting_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name }
     manifest_name { :meetings }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { create(:participatory_process, :with_steps, organization:) }
 
     trait :with_creation_enabled do
       settings do
@@ -20,10 +21,44 @@ FactoryBot.define do
   end
 
   factory :meeting, class: "Decidim::Meetings::Meeting" do
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    location { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    location_hints { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    transient do
+      skip_injection { false }
+    end
+
+    title do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings TITLE\")</script> #{generate(:title)}" }
+      end
+    end
+    description do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings description\");</script> #{generate(:title)}" }
+        end
+      end
+    end
+    location do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings location\");</script> #{generate(:title)}" }
+        end
+      end
+    end
+    location_hints do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings location_hints\");</script> #{generate(:title)}" }
+        end
+      end
+    end
     address { Faker::Lorem.sentence(word_count: 3) }
     latitude { Faker::Address.latitude }
     longitude { Faker::Address.longitude }
@@ -33,7 +68,15 @@ FactoryBot.define do
     transparent { true }
     questionnaire { build(:questionnaire) }
     registration_form_enabled { true }
-    registration_terms { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    registration_terms do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings registration_terms\");</script> #{generate(:title)}" }
+        end
+      end
+    end
     registration_type { :on_this_platform }
     type_of_meeting { :in_person }
     component { build(:component, manifest_name: "meetings") }
@@ -82,7 +125,7 @@ FactoryBot.define do
       end
 
       after(:build) do |meeting, evaluator|
-        meeting.services = evaluator.services || build_list(:service, 2, meeting: meeting)
+        meeting.services = evaluator.services || build_list(:service, 2, meeting:)
       end
     end
 
@@ -98,7 +141,13 @@ FactoryBot.define do
     end
 
     trait :closed do
-      closing_report { generate_localized_title }
+      closing_report do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings registration_terms\");</script> #{generate(:title)}" }
+        end
+      end
       attendees_count { rand(50) }
       contributions_count { rand(50) }
       attending_organizations { Array.new(3) { Faker::TvShows::GameOfThrones.house }.join(", ") }
@@ -117,7 +166,13 @@ FactoryBot.define do
       registrations_enabled { true }
       available_slots { 10 }
       reserved_slots { 4 }
-      registration_terms { generate_localized_title }
+      registration_terms do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings registration_terms\");</script> #{generate(:title)}" }
+        end
+      end
     end
 
     trait :past do
@@ -175,26 +230,54 @@ FactoryBot.define do
   end
 
   factory :agenda, class: "Decidim::Meetings::Agenda" do
+    transient do
+      skip_injection { false }
+    end
+
     meeting
-    title { generate_localized_title }
+    title do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
+      end
+    end
     visible { true }
 
     trait :with_agenda_items do
       after(:create) do |agenda, _evaluator|
-        create_list(:agenda_item, 2, :with_children, agenda: agenda)
+        create_list(:agenda_item, 2, :with_children, agenda:)
       end
     end
   end
 
   factory :agenda_item, class: "Decidim::Meetings::AgendaItem" do
+    transient do
+      skip_injection { false }
+    end
+
     agenda
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    title do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda item title\");</script> #{generate(:title)}" }
+      end
+    end
+    description do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda item descrition\");</script> #{generate(:title)}" }
+        end
+      end
+    end
     duration { 15 }
     position { 0 }
 
     trait :with_parent do
-      parent { create(:agenda_item, agenda: agenda) }
+      parent { create(:agenda_item, agenda:) }
     end
 
     trait :with_children do
@@ -221,9 +304,27 @@ FactoryBot.define do
   end
 
   factory :service, class: "Decidim::Meetings::Service" do
+    transient do
+      skip_injection { false }
+    end
+
     meeting
-    title { generate_localized_title }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    title do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
+      end
+    end
+    description do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        if skip_injection
+          Decidim::Faker::Localized.localized { generate(:title) }
+        else
+          Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
+        end
+      end
+    end
   end
 
   factory :poll, class: "Decidim::Meetings::Poll" do
@@ -236,10 +337,17 @@ FactoryBot.define do
 
   factory :meetings_poll_question, class: "Decidim::Meetings::Question" do
     transient do
+      skip_injection { false }
       options { [] }
     end
 
-    body { generate_localized_title }
+    body do
+      if skip_injection
+        Decidim::Faker::Localized.localized { generate(:title) }
+      else
+        Decidim::Faker::Localized.localized { "<script>alert(\"Meetings agenda title\");</script> #{generate(:title)}" }
+      end
+    end
     position { 0 }
     status { 0 }
     question_type { Decidim::Meetings::Question::QUESTION_TYPES.first }
@@ -263,7 +371,7 @@ FactoryBot.define do
 
   factory :meetings_poll_answer, class: "Decidim::Meetings::Answer" do
     questionnaire factory: :meetings_poll_questionnaire
-    question { create(:meetings_poll_question, questionnaire: questionnaire) }
+    question { create(:meetings_poll_question, questionnaire:) }
     user { create(:user, organization: questionnaire.questionnaire_for.organization) }
   end
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 shared_examples_for "emits an upcoming notificaton" do
-  context "when it's a future meeting" do
+  context "when it is a future meeting" do
     let(:future_start_date) { 3.days.from_now }
 
     before do
@@ -21,14 +21,14 @@ shared_examples_for "emits an upcoming notificaton" do
     end
   end
 
-  context "when it's a past meeting" do
+  context "when it is 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
+    it "does not 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)

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

@@ -4,7 +4,7 @@ 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(:participatory_process) { create :participatory_process, organization: }
     let(:meeting_component) { create(:meeting_component, participatory_space: participatory_process) }
     let(:translatable) { true }
     let(:en_version) { resource.description["en"] }

data/lib/decidim/meetings/version.rb

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