decidim-meetings 0.26.2 → 0.27.0.rc1

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

@@ -6,7 +6,7 @@ module Decidim
       include Decidim::Events::NotificationEvent
 
       def notification_title
-        I18n.t("notification_title", i18n_options).html_safe
+        I18n.t("notification_title", **i18n_options).html_safe
       end
 
       def i18n_options

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

@@ -16,7 +16,7 @@ module Decidim
         attribute :attending_organizations, String
         attribute :proposal_ids, Array[Integer]
         attribute :proposals
-        attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
+        attribute :closed_at, Decidim::Attributes::TimeWithZone, default: -> { Time.current }
 
         validates :closing_report, translatable_presence: true
         validates :attendees_count, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 999, only_integer: true }

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

@@ -14,7 +14,6 @@ module Decidim
         attribute :transparent, Boolean
         attribute :registration_type, String
         attribute :registration_url, String
-        attribute :available_slots, Integer, default: 0
         attribute :customize_registration_email, Boolean
         attribute :iframe_embed_type, String, default: "none"
         attribute :comments_enabled, Boolean, default: true
@@ -26,13 +25,11 @@ module Decidim
         translatable_attribute :description, String
         translatable_attribute :location, String
         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
-        validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: ->(form) { form.on_this_platform? }
         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? }
@@ -75,14 +72,14 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
         end
 
         # Scope identifier
         #
         # Returns the scope identifier related to the meeting
         def decidim_scope_id
-          @decidim_scope_id || scope&.id
+          super || scope&.id
         end
 
         def category

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

@@ -12,7 +12,7 @@ module Decidim
         attribute :existing_user, Boolean, default: false
 
         validates :name, presence: true, unless: proc { |object| object.existing_user }
-        validates :email, presence: true, 'valid_email_2/email': { disposable: true }, unless: proc { |object| object.existing_user }
+        validates :email, presence: true, "valid_email_2/email": { disposable: true }, unless: proc { |object| object.existing_user }
         validates :user, presence: true, if: proc { |object| object.existing_user }
 
         def user

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

@@ -11,9 +11,12 @@ module Decidim
 
         attribute :registrations_enabled, Boolean
         attribute :registration_form_enabled, Boolean
+        attribute :customize_registration_email, Boolean
         attribute :available_slots, Integer
         attribute :reserved_slots, Integer
+
         translatable_attribute :registration_terms, String
+        translatable_attribute :registration_email_custom_content, String
 
         validates :registration_terms, translatable_presence: true, if: ->(form) { form.registrations_enabled? }
         validates :available_slots, :reserved_slots, presence: true, if: ->(form) { form.registrations_enabled? }

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

@@ -10,7 +10,6 @@ module Decidim
       attribute :body, String
       attribute :choices, Array[AnswerChoiceForm]
       attribute :current_user, Decidim::User
-      attribute :answer, Decidim::Meetings::Answer
 
       validates :selected_choices, presence: true
       validate :max_choices, if: -> { question.max_choices }

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

@@ -7,7 +7,7 @@ module Decidim
       attribute :closing_report, String
       attribute :proposal_ids, Array[Integer]
       attribute :proposals
-      attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
+      attribute :closed_at, Decidim::Attributes::TimeWithZone, default: -> { Time.current }
       attribute :attendees_count, Integer, default: 0
 
       validates :closing_report, presence: true

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

@@ -60,14 +60,14 @@ module Decidim
       #
       # Returns a Decidim::Scope
       def scope
-        @scope ||= @decidim_scope_id ? current_component.scopes.find_by(id: @decidim_scope_id) : current_component.scope
+        @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
       end
 
       # Scope identifier
       #
       # Returns the scope identifier related to the meeting
       def decidim_scope_id
-        @decidim_scope_id || scope&.id
+        super || scope&.id
       end
 
       def category

data/app/helpers/decidim/meetings/application_helper.rb

@@ -16,7 +16,7 @@ module Decidim
       def filter_origin_values
         origin_values = []
         origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
-        origin_values << TreePoint.new("citizens", t("decidim.meetings.meetings.filters.origin_values.citizens")) # todo
+        origin_values << TreePoint.new("participants", t("decidim.meetings.meetings.filters.origin_values.participants")) # todo
         if current_organization.user_groups_enabled?
           origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) # todo
         end

data/app/helpers/decidim/meetings/directory/application_helper.rb

@@ -109,7 +109,7 @@ module Decidim
         def directory_filter_origin_values
           origin_values = []
           origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
-          origin_values << TreePoint.new("citizens", t("decidim.meetings.meetings.filters.origin_values.citizens"))
+          origin_values << TreePoint.new("participants", t("decidim.meetings.meetings.filters.origin_values.participants"))
           origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) if current_organization.user_groups_enabled?
 
           TreeNode.new(

data/app/helpers/decidim/meetings/meetings_helper.rb

@@ -30,12 +30,10 @@ module Decidim
       # Returns a String.
       def meeting_type_badge_css_class(type)
         case type
-        when "private"
+        when "private", "withdraw"
           "alert"
         when "transparent"
           "secondary"
-        when "withdraw"
-          "alert"
         end
       end
 

data/app/jobs/decidim/meetings/send_close_meeting_reminder_job.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class SendCloseMeetingReminderJob < ApplicationJob
+      queue_as :close_meeting_reminder
+
+      def perform(record)
+        return if record.remindable.closed?
+
+        ::Decidim::ReminderDelivery.create(reminder: record.reminder)
+        ::Decidim::Meetings::CloseMeetingReminderMailer.close_meeting_reminder(record).deliver_now
+        record.update(state: "completed")
+      end
+    end
+  end
+end

data/app/mailers/decidim/meetings/close_meeting_reminder_mailer.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # A custom mailer for sending notifications for overdue meetings
+    class CloseMeetingReminderMailer < Decidim::ApplicationMailer
+      include Decidim::TranslationsHelper
+      include ActionView::Helpers::SanitizeHelper
+      include Decidim::ApplicationHelper
+
+      helper Decidim::ResourceHelper
+      helper Decidim::TranslationsHelper
+      helper Decidim::ApplicationHelper
+
+      helper_method :routes
+
+      # Send the user an email reminder to close the meetings
+      #
+      # record - the reminder record specific to a past meeting.
+      def close_meeting_reminder(record)
+        @reminder = record.reminder
+        @user = record.reminder.user
+        with_user(@user) do
+          @meeting = record.remindable
+          @organization = @user.organization
+          mail(
+            to: @user.email,
+            subject: I18n.t(
+              "decidim.meetings.close_meeting_reminder_mailer.close_meeting_reminder.subject",
+              organization_name: @organization.name
+            )
+          )
+        end
+      end
+
+      private
+
+      def routes
+        @routes ||= Decidim::EngineRouter.main_proxy(@reminder.component)
+      end
+    end
+  end
+end

data/app/models/decidim/meetings/answer.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # The data store for an Answer in the Decidim::Meetings
     class Answer < Meetings::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :user, class_name: "Decidim::User", foreign_key: "decidim_user_id", optional: true
       belongs_to :questionnaire, class_name: "Decidim::Meetings::Questionnaire", foreign_key: "decidim_questionnaire_id"
@@ -24,7 +24,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Meetings::DataPortabilityUserAnswersSerializer
+        Decidim::Meetings::DownloadYourDataUserAnswersSerializer
       end
 
       def organization

data/app/models/decidim/meetings/invite.rb

@@ -6,7 +6,7 @@ module Decidim
     class Invite < Meetings::ApplicationRecord
       include Decidim::Traceable
       include Decidim::Loggable
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -14,7 +14,7 @@ module Decidim
       validates :user, uniqueness: { scope: :meeting }
 
       def self.export_serializer
-        Decidim::Meetings::DataPortabilityInviteSerializer
+        Decidim::Meetings::DownloadYourDataInviteSerializer
       end
 
       def self.log_presenter_class_for(_log)

data/app/models/decidim/meetings/meeting.rb

@@ -25,6 +25,7 @@ module Decidim
       include Decidim::Authorable
       include Decidim::TranslatableResource
       include Decidim::Publicable
+      include Decidim::FilterableResource
 
       TYPE_OF_MEETING = %w(in_person online hybrid).freeze
       REGISTRATION_TYPE = %w(registration_disabled on_this_platform on_different_platform).freeze
@@ -59,8 +60,26 @@ module Decidim
       scope :upcoming, -> { where(arel_table[:end_time].gteq(Time.current)) }
       scope :withdrawn, -> { where(state: "withdrawn") }
       scope :except_withdrawn, -> { where.not(state: "withdrawn").or(where(state: nil)) }
+      scope :with_availability, lambda { |state_key|
+        case state_key
+        when "withdrawn"
+          withdrawn
+        else
+          except_withdrawn
+        end
+      }
+      scope_search_multi :with_any_date, [:upcoming, :past]
+      scope :with_any_space, lambda { |*target_space|
+        target_spaces = target_space.compact.compact_blank
+
+        return self if target_spaces.blank? || target_spaces.include?("all")
 
-      scope :visible_meeting_for, lambda { |user|
+        joins(:component).where(
+          decidim_components: { participatory_space_type: target_spaces.map(&:classify) }
+        )
+      }
+
+      scope :visible_for, lambda { |user|
         (all.distinct if user&.admin?) ||
           if user.present?
             spaces = Decidim.participatory_space_registry.manifests.map do |manifest|
@@ -109,6 +128,10 @@ module Decidim
 
       scope :visible, -> { where("decidim_meetings_meetings.private_meeting != ? OR decidim_meetings_meetings.transparent = ?", true, true) }
 
+      scope :authored_by, ->(author) { where(decidim_author_id: author) }
+
+      scope_search_multi :with_any_type, TYPE_OF_MEETING.map(&:to_sym)
+
       TYPE_OF_MEETING.each do |type|
         scope type.to_sym, -> { where(type_of_meeting: type.to_sym) }
         scope "not_#{type}".to_sym, -> { where.not(type_of_meeting: type.to_sym) }
@@ -215,7 +238,7 @@ module Decidim
       end
 
       def current_user_can_visit_meeting?(user)
-        Decidim::Meetings::Meeting.visible_meeting_for(user).exists?(id: id)
+        Decidim::Meetings::Meeting.visible_for(user).exists?(id: id)
       end
 
       def iframe_access_level_allowed_for_user?(user)
@@ -342,13 +365,9 @@ module Decidim
         order(Arel::Nodes::InfixOperation.new("", field, Arel.sql("DESC")))
       end
 
-      ransacker :type do
-        Arel.sql(%("decidim_meetings_meetings"."type_of_meeting"))
-      end
-
-      ransacker :title do
-        Arel.sql(%{cast("decidim_meetings_meetings"."title" as text)})
-      end
+      # Create i18n ransackers for :title and :description.
+      # Create the :search_text ransacker alias for searching from both of these.
+      ransacker_i18n_multi :search_text, [:title, :description]
 
       ransacker :id_string do
         Arel.sql(%{cast("decidim_meetings_meetings"."id" as text)})
@@ -358,13 +377,12 @@ module Decidim
         Arel.sql("(start_time > NOW())")
       end
 
-      ransacker :origin do
-        Arel.sql("CASE
-            WHEN decidim_author_type = 'Decidim::Organization' THEN 'official'
-            WHEN decidim_author_type = 'Decidim::UserBaseEntity' AND decidim_user_group_id IS NOT NULL THEN 'user_group'
-            WHEN decidim_author_type = 'Decidim::UserBaseEntity' AND decidim_user_group_id IS NULL THEN 'citizen'
-            ELSE 'unknown' END
-        ")
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_type, :with_any_date, :with_any_space, :with_any_origin, :with_any_scope, :with_any_category, :with_any_global_category]
+      end
+
+      def self.ransack(params = {}, options = {})
+        MeetingSearch.new(self, params, options)
       end
 
       private

data/app/models/decidim/meetings/questionnaire.rb

@@ -4,6 +4,8 @@ module Decidim
   module Meetings
     # The data store for a Questionnaire in the Decidim::Meetings component.
     class Questionnaire < Meetings::ApplicationRecord
+      include Decidim::Traceable
+
       belongs_to :questionnaire_for, polymorphic: true
 
       has_many :questions, -> { order(:position) }, class_name: "Question", foreign_key: "decidim_questionnaire_id", dependent: :destroy
@@ -18,6 +20,10 @@ module Decidim
       def all_questions_unpublished?
         questions.all?(&:unpublished?)
       end
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Meetings::AdminLog::QuestionnairePresenter
+      end
     end
   end
 end

data/app/models/decidim/meetings/registration.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     # The data store for a Registration in the Decidim::Meetings component.
     class Registration < Meetings::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
@@ -23,7 +23,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Meetings::DataPortabilityRegistrationSerializer
+        Decidim::Meetings::DownloadYourDataRegistrationSerializer
       end
 
       # Pluck all Decidim::UserGroup ID's

data/app/packs/src/decidim/meetings/admin/meetings_form.js

@@ -102,9 +102,7 @@ $(() => {
     attachGeocoding($form.find("#meeting_address"));
 
     const $meetingRegistrationType = $form.find("#meeting_registration_type");
-    const $meetingRegistrationTerms = $form.find("#meeting_registration_terms");
     const $meetingRegistrationUrl = $form.find("#meeting_registration_url");
-    const $meetingAvailableSlots = $form.find("#meeting_available_slots");
 
     const toggleDependsOnSelect = ($target, $showDiv, type) => {
       const value = $target.val();
@@ -113,8 +111,6 @@ $(() => {
 
     $meetingRegistrationType.on("change", (ev) => {
       const $target = $(ev.target);
-      toggleDependsOnSelect($target, $meetingAvailableSlots, "on_this_platform");
-      toggleDependsOnSelect($target, $meetingRegistrationTerms, "on_this_platform");
       toggleDependsOnSelect($target, $meetingRegistrationUrl, "on_different_platform");
     });
 

data/app/packs/src/decidim/meetings/admin/registrations_form.js

@@ -5,11 +5,13 @@ $(() => {
     const $registrationsEnabled = $form.find("#meeting_registrations_enabled");
     const $availableSlots = $form.find("#meeting_available_slots");
     const $reservedSlots = $form.find("#meeting_reserved_slots");
+    const $customizeRegistrationEmail = $form.find("#meeting_customize_registration_email");
 
     const toggleDisabledFields = () => {
       const enabled = $registrationsEnabled.prop("checked");
       $availableSlots.attr("disabled", !enabled);
       $reservedSlots.attr("disabled", !enabled);
+      $customizeRegistrationEmail.attr("disabled", !enabled);
 
       $form.find(".editor-container").each((idx, node) => {
         const quill = Quill.find(node);

data/app/presenters/decidim/meetings/admin_log/questionnaire_presenter.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Meetings::Questionnaire`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    QuestionnairePresenter.new(action_log, view_helpers).present
+      class QuestionnairePresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.meetings.admin_log.questionnaire.#{action}"
+          else
+            super
+          end
+        end
+
+        def resource_presenter
+          @resource_presenter ||= Decidim::Log::ResourcePresenter.new(action_log.resource.questionnaire_for.meeting, h, action_log.resource.questionnaire_for.meeting)
+        end
+
+        def i18n_params
+          super.merge(
+            meeting_name: resource_presenter.try(:present)
+          )
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/meetings/admin/invites.rb

@@ -4,7 +4,7 @@ module Decidim
   module Meetings
     module Admin
       # A class used to find the Invites by their status status.
-      class Invites < Rectify::Query
+      class Invites < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # invites - the initial Invites relation that needs to be filtered.

data/app/queries/decidim/meetings/filtered_meetings.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # A class used to find meetings filtered by components and a date range
-    class FilteredMeetings < Rectify::Query
+    class FilteredMeetings < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # components - An array of Decidim::Component

data/app/queries/decidim/meetings/questionnaire_user_answers.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireUserAnswers < Rectify::Query
+    class QuestionnaireUserAnswers < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object

data/app/serializers/decidim/meetings/{data_portability_invite_serializer.rb → download_your_data_invite_serializer.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Meetings
-    class DataPortabilityInviteSerializer < Decidim::Exporters::Serializer
-      # Serializes an invite for data portability
+    class DownloadYourDataInviteSerializer < Decidim::Exporters::Serializer
+      # Serializes an invite for download your data
       def serialize
         {
           id: resource.id,

data/app/serializers/decidim/meetings/{data_portability_registration_serializer.rb → download_your_data_registration_serializer.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Meetings
-    class DataPortabilityRegistrationSerializer < Decidim::Exporters::Serializer
-      # Serializes a registration for data portability
+    class DownloadYourDataRegistrationSerializer < Decidim::Exporters::Serializer
+      # Serializes a registration for download your data
       def serialize
         {
           id: resource.id,

data/app/services/decidim/meetings/calendar/base_calendar.rb

@@ -14,15 +14,16 @@ module Decidim
         # resource - a resource that has meetings.
         #
         # Returns a String.
-        def self.for(resource)
-          new(resource).calendar
+        def self.for(resource, filters = nil)
+          new(resource, filters).calendar
         end
 
         # Initializes the class.
         #
         # resource - a resource that has meetings.
-        def initialize(resource)
+        def initialize(resource, filters = nil)
           @resource = resource
+          @filters = filters
         end
 
         # Converts the resource meetings to the ICalendar format.

data/app/services/decidim/meetings/calendar/component_calendar.rb

@@ -11,11 +11,9 @@ module Decidim
         #
         # Returns a String.
         def events
-          Rails.cache.fetch(cache_key) do
-            meetings.map do |meeting|
-              MeetingCalendar.new(meeting).events
-            end.compact.join
-          end
+          filtered_meetings.map do |meeting|
+            MeetingCalendar.new(meeting).events
+          end.compact.join
         end
 
         private
@@ -29,11 +27,11 @@ module Decidim
           Decidim::Meetings::Meeting.where(component: component)
         end
 
-        # Defines the cache key for the given component.
+        # Finds the component meetings.
         #
-        # Returns a String.
-        def cache_key
-          "meetings-calendar-component-#{component.id}-#{component.updated_at.to_i}"
+        # Returns a collection of Meetings filtered based on provided params.
+        def filtered_meetings
+          meetings.not_hidden.published.except_withdrawn.ransack(@filters).result
         end
       end
     end

data/app/services/decidim/meetings/calendar/organization_calendar.rb

@@ -13,7 +13,7 @@ module Decidim
         # Returns a String.
         def events
           @events ||= components.map do |component|
-            ComponentCalendar.new(component).events
+            ComponentCalendar.new(component, @filters).events
           end.compact.join
         end
 

data/app/services/decidim/meetings/calendar_renderer.rb

@@ -3,14 +3,14 @@
 module Decidim
   module Meetings
     class CalendarRenderer
-      def self.for(resource)
+      def self.for(resource, filters = nil)
         case resource
         when Decidim::Organization
-          Calendar::OrganizationCalendar.for(resource)
+          Calendar::OrganizationCalendar.for(resource, filters)
         when Decidim::Component
-          Calendar::ComponentCalendar.for(resource)
+          Calendar::ComponentCalendar.for(resource, filters)
         when Decidim::Meetings::Meeting
-          Calendar::MeetingCalendar.for(resource)
+          Calendar::MeetingCalendar.for(resource, filters)
         end
       end
     end