decidim-meetings 0.27.10 → 0.28.0.rc4

data/lib/decidim/meetings/component.rb

@@ -1,18 +1,17 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:meetings) do |component|
   component.engine = Decidim::Meetings::Engine
   component.admin_engine = Decidim::Meetings::AdminEngine
   component.icon = "media/images/decidim_meetings.svg"
+  component.icon_key = "map-pin-line"
   component.permissions_class_name = "Decidim::Meetings::Permissions"
 
   component.query_type = "Decidim::Meetings::MeetingsType"
   component.data_portable_entities = ["Decidim::Meetings::Registration"]
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Meetings::Meeting.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Meetings::Meeting.where(component: instance).any?
   end
 
   component.register_resource(:meeting) do |resource|
@@ -97,220 +96,9 @@ Decidim.register_component(:meetings) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name,
-      published_at: Time.current,
-      manifest_name: :meetings,
-      participatory_space: participatory_space
-    }
-
-    component = Decidim.traceability.perform_action!(
-      "publish",
-      Decidim::Component,
-      admin_user,
-      visibility: "all"
-    ) do
-      Decidim::Component.create!(params)
-    end
-
-    if participatory_space.scope
-      scopes = participatory_space.scope.descendants
-      global = participatory_space.scope
-    else
-      scopes = participatory_space.organization.scopes
-      global = nil
-    end
-
-    2.times do
-      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: component,
-        scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
-        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: start_time,
-        end_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
-      }
-
-      _hybrid_meeting = Decidim.traceability.create!(
-        Decidim::Meetings::Meeting,
-        admin_user,
-        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(
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          type_of_meeting: :online,
-          online_meeting_url: "http://example.org"
-        ),
-        visibility: "all"
-      )
-
-      meeting = Decidim.traceability.create!(
-        Decidim::Meetings::Meeting,
-        admin_user,
-        params,
-        visibility: "all"
-      )
-
-      2.times do
-        Decidim::Meetings::Service.create!(
-          meeting: meeting,
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.sentence(word_count: 5)
-        )
-      end
-
-      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
-      )
+    require "decidim/meetings/seeds"
 
-      2.times do |n|
-        email = "meeting-registered-user-#{meeting.id}-#{n}@example.org"
-        name = "#{Faker::Name.name} #{meeting.id} #{n}"
-        user = Decidim::User.find_or_initialize_by(email: email)
-
-        user.update!(
-          password: "decidim123456789",
-          password_confirmation: "decidim123456789",
-          name: name,
-          nickname: Faker::Twitter.unique.screen_name,
-          organization: component.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: meeting,
-          user: user
-        )
-      end
-
-      attachment_collection = Decidim::AttachmentCollection.create!(
-        name: Decidim::Faker::Localized.word,
-        description: Decidim::Faker::Localized.sentence(word_count: 5),
-        collection_for: meeting
-      )
-
-      Decidim::Attachment.create!(
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.sentence(word_count: 5),
-        attachment_collection: attachment_collection,
-        attached_to: meeting,
-        content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_and_upload!(
-          io: File.open(File.join(__dir__, "seeds", "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: meeting,
-        content_type: "image/jpeg",
-        file: ActiveStorage::Blob.create_and_upload!(
-          io: File.open(File.join(__dir__, "seeds", "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: meeting,
-        content_type: "application/pdf",
-        file: ActiveStorage::Blob.create_and_upload!(
-          io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
-          filename: "Exampledocument.pdf",
-          content_type: "application/pdf",
-          metadata: nil
-        ) # Keep after attached_to
-      )
-    end
-
-    authors = [
-      Decidim::UserGroup.where(decidim_organization_id: participatory_space.decidim_organization_id).verified.sample,
-      Decidim::User.where(decidim_organization_id: participatory_space.decidim_organization_id).all.sample
-    ]
-
-    authors.each do |author|
-      user_group = nil
-
-      if author.is_a?(Decidim::UserGroup)
-        user_group = author
-        author = user_group.users.sample
-      end
-
-      start_time = Faker::Date.between(from: 20.weeks.ago, to: 20.weeks.from_now)
-      params = {
-        component: component,
-        scope: Faker::Boolean.boolean(true_ratio: 0.5) ? global : scopes.sample,
-        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: start_time,
-        end_time: start_time + rand(1..4).hours,
-        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: author,
-        user_group: user_group
-      }
-
-      Decidim.traceability.create!(
-        Decidim::Meetings::Meeting,
-        authors[0],
-        params,
-        visibility: "all"
-      )
-    end
+    Decidim::Meetings::Seeds.new(participatory_space:).call
   end
 end
 

data/lib/decidim/meetings/content_blocks/registry_manager.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module ContentBlocks
+      class RegistryManager
+        def self.register!
+          Decidim.content_blocks.register(:homepage, :upcoming_meetings) do |content_block|
+            content_block.cell = "decidim/meetings/content_blocks/highlighted_meetings"
+            content_block.public_name_key = "decidim.meetings.content_blocks.upcoming_meetings.name"
+            content_block.default!
+          end
+        end
+      end
+    end
+  end
+end

data/lib/decidim/meetings/directory_engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/meetings/content_blocks/registry_manager"
+
 module Decidim
   module Meetings
     # This is the engine that runs on the public interface of `decidim-meetings`.
@@ -21,12 +23,8 @@ module Decidim
         nil
       end
 
-      initializer "decidim.meetings.content_blocks" do
-        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
+      initializer "decidim_meetings_directory.content_blocks" do
+        Decidim::Meetings::ContentBlocks::RegistryManager.register!
       end
     end
   end

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).not_hidden.except_withdrawn.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