decidim-meetings 0.25.2 → 0.26.0.rc1

data/app/controllers/decidim/meetings/directory/meetings_controller.rb

@@ -4,10 +4,11 @@ module Decidim
   module Meetings
     module Directory
       # Exposes the meeting resource so users can view them
-      class MeetingsController < Decidim::ApplicationController
+      class MeetingsController < Decidim::Meetings::Directory::ApplicationController
         layout "layouts/decidim/application"
 
         include FilterResource
+        include Filterable
         include Paginable
 
         helper Decidim::WidgetUrlsHelper
@@ -17,17 +18,6 @@ module Decidim
 
         helper_method :meetings, :search
 
-        def index
-          @meeting_spaces = search.results.map do |meeting|
-            klass = meeting.component.participatory_space.class
-            [klass.model_name.name.underscore, klass.model_name.human(count: 2)]
-          end.uniq
-          @meeting_spaces = @meeting_spaces.sort_by do |_param, name|
-            name
-          end
-          @meeting_spaces.prepend(["all", t(".all")])
-        end
-
         def calendar
           render plain: CalendarRenderer.for(current_organization), content_type: "type/calendar"
         end
@@ -39,26 +29,47 @@ module Decidim
         end
 
         def search_klass
-          MeetingSearch
+          ::Decidim::Meetings::Directory::MeetingSearch
         end
 
         def default_filter_params
           {
             date: "upcoming",
             search_text: "",
-            scope_id: "",
-            space: "all"
+            activity: "all",
+            scope_id: default_filter_scope_params,
+            space: default_filter_space_params,
+            type: default_filter_type_params,
+            origin: default_filter_origin_params,
+            category_id: default_filter_category_params
           }
         end
 
-        def default_search_params
-          {
-            scope: Meeting.not_hidden.visible_meeting_for(current_user)
-          }
+        def default_filter_category_params
+          participatory_spaces = current_organization.public_participatory_spaces
+          list_of_ps = []
+          participatory_spaces.flat_map do |current_participatory_space|
+            next unless current_participatory_space.respond_to?(:categories)
+
+            key_point = current_participatory_space.class.name.gsub("::", "__") + current_participatory_space.id.to_s
+
+            list_of_ps.push(key_point)
+            list_of_ps += current_participatory_space.categories.pluck(:id).map(&:to_s)
+          end
+
+          ["all"] + list_of_ps
+        end
+
+        def default_filter_space_params
+          %w(all) + current_organization.public_participatory_spaces.collect(&:model_name).uniq.collect(&:name).collect(&:underscore)
+        end
+
+        def default_filter_scope_params
+          %w(all global) + current_organization.scopes.pluck(:id).map(&:to_s)
         end
 
         def context_params
-          { component: meeting_components, organization: current_organization }
+          { component: meeting_components, organization: current_organization, current_user: current_user }
         end
 
         def meeting_components

data/app/controllers/decidim/meetings/live_events_controller.rb

@@ -13,7 +13,7 @@ module Decidim
       def show
         raise ActionController::RoutingError, "Not Found" unless meeting
 
-        return if meeting.current_user_can_visit_meeting?(current_user)
+        return if allowed_for_current_user?
 
         flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")
         redirect_to(ResourceLocatorPresenter.new(meeting).index)
@@ -21,6 +21,12 @@ module Decidim
 
       private
 
+      def allowed_for_current_user?
+        meeting.current_user_can_visit_meeting?(current_user) &&
+          meeting.iframe_access_level_allowed_for_user?(current_user) &&
+          meeting.live?
+      end
+
       def live_meeting_embed_code
         MeetingIframeEmbedder.new(meeting.online_meeting_url).embed_code(request.host)
       end

data/app/controllers/decidim/meetings/meetings_controller.rb

@@ -5,9 +5,12 @@ module Decidim
     # Exposes the meeting resource so users can view them
     class MeetingsController < Decidim::Meetings::ApplicationController
       include FilterResource
+      include Filterable
       include Flaggable
+      include Withdrawable
       include FormFactory
       include Paginable
+
       helper Decidim::WidgetUrlsHelper
       helper Decidim::ResourceVersionsHelper
 
@@ -83,6 +86,21 @@ module Decidim
         end
       end
 
+      def withdraw
+        enforce_permission_to :withdraw, :meeting, meeting: meeting
+
+        WithdrawMeeting.call(@meeting, current_user) do
+          on(:ok) do
+            flash[:notice] = I18n.t("meetings.withdraw.success", scope: "decidim")
+            redirect_to Decidim::ResourceLocatorPresenter.new(@meeting).path
+          end
+          on(:invalid) do
+            flash[:alert] = I18n.t("meetings.withdraw.error", scope: "decidim")
+            redirect_to Decidim::ResourceLocatorPresenter.new(@meeting).path
+          end
+        end
+      end
+
       private
 
       def meeting
@@ -112,27 +130,11 @@ module Decidim
           activity: "all",
           scope_id: default_filter_scope_params,
           category_id: default_filter_category_params,
+          state: nil,
           origin: default_filter_origin_params,
           type: default_filter_type_params
         }
       end
-
-      def default_filter_origin_params
-        filter_origin_params = %w(citizens)
-        filter_origin_params << "official"
-        filter_origin_params << "user_group" if current_organization.user_groups_enabled?
-        filter_origin_params
-      end
-
-      def default_filter_type_params
-        %w(all) + Decidim::Meetings::Meeting::TYPE_OF_MEETING
-      end
-
-      def default_search_params
-        {
-          scope: Meeting.not_hidden.visible_meeting_for(current_user)
-        }
-      end
     end
   end
 end

data/app/events/decidim/meetings/close_meeting_event.rb

@@ -3,9 +3,7 @@
 module Decidim
   module Meetings
     class CloseMeetingEvent < Decidim::Events::SimpleEvent
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      include Decidim::Meetings::MeetingEvent
 
       def event_has_roles?
         true

data/app/events/decidim/meetings/create_meeting_event.rb

@@ -3,11 +3,9 @@
 module Decidim
   module Meetings
     class CreateMeetingEvent < Decidim::Events::SimpleEvent
-      delegate :organization, to: :user, prefix: false
+      include Decidim::Meetings::MeetingEvent
 
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      delegate :organization, to: :user, prefix: false
 
       def button_text
         I18n.t("meeting_created.button_text", scope: "decidim.events.meetings") if resource.can_be_joined_by?(user)

data/app/events/decidim/meetings/meeting_event.rb

@@ -0,0 +1,37 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Meetings
+    # This module is used to be included in events triggered by comments.
+    #
+    module MeetingEvent
+      extend ActiveSupport::Concern
+      include Decidim::Events::MachineTranslatedEvent
+
+      included do
+        def resource_text
+          translated_attribute(resource.description)
+        end
+
+        def translatable_resource
+          resource
+        end
+
+        def translatable_text
+          resource.description
+        end
+
+        def safe_resource_text
+          locale = resource.respond_to?(:content_original_language) ? resource.content_original_language : I18n.locale
+          I18n.with_locale(locale) { translated_attribute(resource.description).to_s.html_safe }
+        end
+
+        def safe_resource_translated_text
+          return safe_resource_text unless perform_translation?
+
+          I18n.with_locale(I18n.locale) { translated_attribute(resource.description, nil, true).to_s.html_safe }
+        end
+      end
+    end
+  end
+end

data/app/events/decidim/meetings/meeting_registrations_enabled_event.rb

@@ -3,9 +3,7 @@
 module Decidim
   module Meetings
     class MeetingRegistrationsEnabledEvent < Decidim::Events::SimpleEvent
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      include Decidim::Meetings::MeetingEvent
     end
   end
 end

data/app/events/decidim/meetings/meeting_registrations_over_percentage_event.rb

@@ -3,11 +3,9 @@
 module Decidim
   module Meetings
     class MeetingRegistrationsOverPercentageEvent < Decidim::Events::SimpleEvent
-      i18n_attributes :percentage
+      include Decidim::Meetings::MeetingEvent
 
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      i18n_attributes :percentage
 
       def percentage
         extra["percentage"] * 100

data/app/events/decidim/meetings/registration_code_validated_event.rb

@@ -3,11 +3,9 @@
 module Decidim
   module Meetings
     class RegistrationCodeValidatedEvent < Decidim::Events::SimpleEvent
-      i18n_attributes :registration_code
+      include Decidim::Meetings::MeetingEvent
 
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      i18n_attributes :registration_code
 
       private
 

data/app/events/decidim/meetings/upcoming_meeting_event.rb

@@ -3,9 +3,7 @@
 module Decidim
   module Meetings
     class UpcomingMeetingEvent < Decidim::Events::SimpleEvent
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      include Decidim::Meetings::MeetingEvent
     end
   end
 end

data/app/events/decidim/meetings/update_meeting_event.rb

@@ -3,9 +3,7 @@
 module Decidim
   module Meetings
     class UpdateMeetingEvent < Decidim::Events::SimpleEvent
-      def resource_text
-        translated_attribute(resource.description)
-      end
+      include Decidim::Meetings::MeetingEvent
     end
   end
 end

data/app/forms/decidim/meetings/admin/close_meeting_form.rb

@@ -19,7 +19,7 @@ module Decidim
         attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
 
         validates :closing_report, translatable_presence: true
-        validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0 }
+        validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 999, only_integer: true }
         validates :contributions_count, numericality: true, allow_blank: true
 
         # Private: Gets the proposals from the meeting and injects them to the form.

data/app/forms/decidim/meetings/admin/meeting_copy_form.rb

@@ -6,7 +6,7 @@ module Decidim
       # A form object used to copy a meeting from the admin
       # dashboard.
       #
-      class MeetingCopyForm < Form
+      class MeetingCopyForm < ::Decidim::Meetings::BaseMeetingForm
         include TranslatableAttributes
 
         translatable_attribute :title, String
@@ -14,26 +14,17 @@ module Decidim
         translatable_attribute :location, String
         translatable_attribute :location_hints, String
 
-        attribute :address, String
-        attribute :latitude, Float
-        attribute :longitude, Float
-        attribute :start_time, Decidim::Attributes::TimeWithZone
-        attribute :end_time, Decidim::Attributes::TimeWithZone
+        attribute :show_embedded_iframe, Boolean, default: false
         attribute :private_meeting, Boolean
         attribute :transparent, Boolean
         attribute :services, Array[MeetingServiceForm]
 
         mimic :meeting
 
-        validates :current_component, presence: true
-
+        validates :online_meeting_url, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
-        validates :location, translatable_presence: true
-        validates :address, presence: true
-        validates :address, geocoding: true, if: -> { Decidim::Map.available?(:geocoding) }
-        validates :start_time, presence: true, date: { before: :end_time }
-        validates :end_time, presence: true, date: { after: :start_time }
+        validates :location, translatable_presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
 
         def map_model(model)
           self.services = model.services.map do |service|

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -4,26 +4,23 @@ module Decidim
   module Meetings
     module Admin
       # This class holds a Form to create/update translatable meetings from Decidim's admin panel.
-      class MeetingForm < Decidim::Form
+      class MeetingForm < ::Decidim::Meetings::BaseMeetingForm
         include TranslatableAttributes
 
-        attribute :address, String
-        attribute :latitude, Float
-        attribute :longitude, Float
-        attribute :start_time, Decidim::Attributes::TimeWithZone
-        attribute :end_time, Decidim::Attributes::TimeWithZone
         attribute :services, Array[MeetingServiceForm]
         attribute :decidim_scope_id, Integer
         attribute :decidim_category_id, Integer
         attribute :private_meeting, Boolean
         attribute :transparent, Boolean
-        attribute :online_meeting_url, String
-        attribute :type_of_meeting, String
         attribute :registration_type, String
         attribute :registration_url, String
         attribute :available_slots, Integer, default: 0
         attribute :customize_registration_email, Boolean
-        attribute :show_embedded_iframe, Boolean, default: false
+        attribute :iframe_embed_type, String, default: "none"
+        attribute :comments_enabled, Boolean, default: true
+        attribute :comments_start_time, Decidim::Attributes::TimeWithZone
+        attribute :comments_end_time, Decidim::Attributes::TimeWithZone
+        attribute :iframe_access_level, String
 
         translatable_attribute :title, String
         translatable_attribute :description, String
@@ -31,6 +28,7 @@ module Decidim
         translatable_attribute :location_hints, String
         translatable_attribute :registration_email_custom_content, String
 
+        validates :iframe_embed_type, inclusion: { in: Decidim::Meetings::Meeting.iframe_embed_types }
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
         validates :registration_type, presence: true
@@ -38,18 +36,18 @@ module Decidim
         validates :registration_url, presence: true, url: true, if: ->(form) { form.on_different_platform? }
         validates :type_of_meeting, presence: true
         validates :location, translatable_presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
-
-        validates :address, presence: true, if: ->(form) { form.needs_address? }
-        validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? && form.needs_address? }
         validates :online_meeting_url, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
-        validates :start_time, presence: true, date: { before: :end_time }
-        validates :end_time, presence: true, date: { after: :start_time }
-
-        validates :current_component, presence: true
+        validates :comments_start_time, date: { before: :comments_end_time, allow_blank: true, if: proc { |obj| obj.comments_end_time.present? } }
+        validates :comments_end_time, date: { after: :comments_start_time, allow_blank: true, if: proc { |obj| obj.comments_start_time.present? } }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :clean_type_of_meeting, presence: true
+        validates(
+          :iframe_access_level,
+          inclusion: { in: Decidim::Meetings::Meeting.iframe_access_levels },
+          if: ->(form) { %w(embed_in_meeting_page open_in_live_event_page open_in_new_tab).include?(form.iframe_embed_type) }
+        )
         validate :embeddable_meeting_url
 
         delegate :categories, to: :current_component
@@ -97,34 +95,6 @@ module Decidim
           @category ||= categories.find_by(id: decidim_category_id)
         end
 
-        def geocoding_enabled?
-          Decidim::Map.available?(:geocoding)
-        end
-
-        def has_address?
-          geocoding_enabled? && address.present?
-        end
-
-        def needs_address?
-          in_person_meeting? || hybrid_meeting?
-        end
-
-        def geocoded?
-          latitude.present? && longitude.present?
-        end
-
-        def online_meeting?
-          type_of_meeting == "online"
-        end
-
-        def in_person_meeting?
-          type_of_meeting == "in_person"
-        end
-
-        def hybrid_meeting?
-          type_of_meeting == "hybrid"
-        end
-
         def clean_type_of_meeting
           type_of_meeting.presence
         end
@@ -138,6 +108,24 @@ module Decidim
           end
         end
 
+        def iframe_access_level_select
+          Decidim::Meetings::Meeting.iframe_access_levels.map do |level, _value|
+            [
+              I18n.t("iframe_access_level.#{level}", scope: "decidim.meetings"),
+              level
+            ]
+          end
+        end
+
+        def iframe_embed_type_select
+          Decidim::Meetings::Meeting.iframe_embed_types.map do |type, _value|
+            [
+              I18n.t("iframe_embed_type.#{type}", scope: "decidim.meetings"),
+              type
+            ]
+          end
+        end
+
         def on_this_platform?
           registration_type == "on_this_platform"
         end
@@ -156,9 +144,9 @@ module Decidim
         end
 
         def embeddable_meeting_url
-          if online_meeting_url.present? && show_embedded_iframe
+          if online_meeting_url.present? && %w(embed_in_meeting_page open_in_live_event_page).include?(iframe_embed_type)
             embedder_service = Decidim::Meetings::MeetingIframeEmbedder.new(online_meeting_url)
-            errors.add(:show_embedded_iframe, :not_embeddable) unless embedder_service.embeddable?
+            errors.add(:iframe_embed_type, :not_embeddable) unless embedder_service.embeddable?
           end
         end
       end

data/app/forms/decidim/meetings/base_meeting_form.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class BaseMeetingForm < Decidim::Form
+      attribute :address, String
+      attribute :latitude, Float
+      attribute :longitude, Float
+      attribute :online_meeting_url, String
+      attribute :type_of_meeting, String
+      attribute :start_time, Decidim::Attributes::TimeWithZone
+      attribute :end_time, Decidim::Attributes::TimeWithZone
+
+      validates :current_component, presence: true
+
+      validates :address, presence: true, if: ->(form) { form.needs_address? }
+      validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? && form.needs_address? }
+      validates :start_time, presence: true, date: { before: :end_time }
+      validates :end_time, presence: true, date: { after: :start_time }
+
+      def type_of_meeting_select
+        Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
+          [
+            I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
+            type
+          ]
+        end
+      end
+
+      def geocoding_enabled?
+        Decidim::Map.available?(:geocoding)
+      end
+
+      def geocoded?
+        latitude.present? && longitude.present?
+      end
+
+      def has_address?
+        geocoding_enabled? && address.present?
+      end
+
+      def needs_address?
+        in_person_meeting? || hybrid_meeting?
+      end
+
+      def online_meeting?
+        type_of_meeting == "online"
+      end
+
+      def in_person_meeting?
+        type_of_meeting == "in_person"
+      end
+
+      def hybrid_meeting?
+        type_of_meeting == "hybrid"
+      end
+    end
+  end
+end

data/app/forms/decidim/meetings/close_meeting_form.rb

@@ -13,22 +13,22 @@ module Decidim
       validates :closing_report, presence: true
       validates :attendees_count,
                 presence: true,
-                numericality: { greater_than_or_equal_to: 0, only_integer: true }
+                numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 999, only_integer: true }
 
       # Private: Gets the proposals from the meeting and injects them to the form.
       #
       # Returns nothing.
       def map_model(model)
         self.proposal_ids = model.linked_resources(:proposals, "proposals_from_meeting").pluck(:id)
-        presenter = MeetingPresenter.new(model)
+        presenter = MeetingEditionPresenter.new(model)
         self.closing_report = presenter.closing_report(all_locales: false)
       end
 
       def proposals
-        @proposals ||= Decidim.find_resource_manifest(:proposals)
-                              .try(:resource_scope, current_component)
-                              &.where(id: proposal_ids)
-                              &.order(title: :asc)
+        @proposals = Decidim.find_resource_manifest(:proposals)
+                            .try(:resource_scope, current_component)
+                            &.where(id: proposal_ids)
+                            &.order(title: :asc)
       end
     end
   end