decidim-meetings 0.27.4 → 0.28.0.rc5

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

@@ -18,7 +18,7 @@ module Decidim
         def create
           enforce_permission_to :create, :meeting
 
-          @form = meeting_form.from_params(params, current_component: current_component)
+          @form = meeting_form.from_params(params, current_component:)
 
           Decidim::Meetings::Admin::CreateMeeting.call(@form) do
             on(:ok) do
@@ -34,15 +34,15 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :meeting, meeting: meeting
+          enforce_permission_to(:update, :meeting, meeting:)
 
           @form = meeting_form.from_model(meeting)
         end
 
         def update
-          enforce_permission_to :update, :meeting, meeting: meeting
+          enforce_permission_to(:update, :meeting, meeting:)
 
-          @form = meeting_form.from_params(params, current_component: current_component)
+          @form = meeting_form.from_params(params, current_component:)
 
           Decidim::Meetings::Admin::UpdateMeeting.call(@form, meeting) do
             on(:ok) do
@@ -58,7 +58,7 @@ module Decidim
         end
 
         def destroy
-          enforce_permission_to :destroy, :meeting, meeting: meeting
+          enforce_permission_to(:destroy, :meeting, meeting:)
 
           Decidim::Meetings::Admin::DestroyMeeting.call(meeting, current_user) do
             on(:ok) do
@@ -79,7 +79,7 @@ module Decidim
         end
 
         def publish
-          enforce_permission_to :update, :meeting, meeting: meeting
+          enforce_permission_to(:update, :meeting, meeting:)
 
           Decidim::Meetings::Admin::PublishMeeting.call(meeting, current_user) do
             on(:ok) do
@@ -95,7 +95,7 @@ module Decidim
         end
 
         def unpublish
-          enforce_permission_to :update, :meeting, meeting: meeting
+          enforce_permission_to(:update, :meeting, meeting:)
 
           Decidim::Meetings::Admin::UnpublishMeeting.call(meeting, current_user) do
             on(:ok) do

data/app/controllers/decidim/meetings/admin/meetings_poll_controller.rb

@@ -13,7 +13,7 @@ module Decidim
         helper Decidim::Forms::Admin::ApplicationHelper
 
         def edit
-          enforce_permission_to :update, :poll, meeting: meeting, poll: poll
+          enforce_permission_to(:update, :poll, meeting:, poll:)
 
           @form = form(Admin::QuestionnaireForm).from_model(questionnaire)
 
@@ -21,7 +21,7 @@ module Decidim
         end
 
         def update
-          enforce_permission_to :update, :poll, meeting: meeting, poll: poll
+          enforce_permission_to(:update, :poll, meeting:, poll:)
 
           @form = form(Admin::QuestionnaireForm).from_params(params)
 
@@ -69,7 +69,7 @@ module Decidim
         private
 
         def questionnaire
-          @questionnaire ||= Decidim::Meetings::Questionnaire.find_or_initialize_by(questionnaire_for: questionnaire_for)
+          @questionnaire ||= Decidim::Meetings::Questionnaire.find_or_initialize_by(questionnaire_for:)
         end
 
         def blank_question
@@ -99,7 +99,7 @@ module Decidim
         end
 
         def poll
-          @poll ||= Poll.find_or_initialize_by(meeting: meeting)
+          @poll ||= Poll.find_or_initialize_by(meeting:)
         end
       end
     end

data/app/controllers/decidim/meetings/admin/registrations_controller.rb

@@ -6,16 +6,16 @@ module Decidim
       # This controller allows an admin to manage meeting registrations from a Participatory Process
       class RegistrationsController < Admin::ApplicationController
         def edit
-          enforce_permission_to :update, :meeting, meeting: meeting
+          enforce_permission_to(:update, :meeting, meeting:)
 
           @form = MeetingRegistrationsForm.from_model(meeting)
           @validation_form = ValidateRegistrationCodeForm.new
         end
 
         def update
-          enforce_permission_to :update, :meeting, meeting: meeting
+          enforce_permission_to(:update, :meeting, meeting:)
 
-          @form = MeetingRegistrationsForm.from_params(params).with_context(current_organization: meeting.organization, meeting: meeting)
+          @form = MeetingRegistrationsForm.from_params(params).with_context(current_organization: meeting.organization, meeting:)
           @validation_form = ValidateRegistrationCodeForm.new
 
           UpdateRegistrations.call(@form, meeting) do
@@ -32,7 +32,7 @@ module Decidim
         end
 
         def export
-          enforce_permission_to :export_registrations, :meeting, meeting: meeting
+          enforce_permission_to(:export_registrations, :meeting, meeting:)
 
           ExportMeetingRegistrations.call(meeting, params[:format], current_user) do
             on(:ok) do |export_data|
@@ -42,10 +42,10 @@ module Decidim
         end
 
         def validate_registration_code
-          enforce_permission_to :update, :meeting, meeting: meeting
+          enforce_permission_to(:update, :meeting, meeting:)
 
           @form = MeetingRegistrationsForm.from_model(meeting)
-          @validation_form = ValidateRegistrationCodeForm.from_params(params).with_context(current_organization: meeting.organization, meeting: meeting)
+          @validation_form = ValidateRegistrationCodeForm.from_params(params).with_context(current_organization: meeting.organization, meeting:)
 
           ValidateRegistrationCode.call(@validation_form, meeting) do
             on(:ok) do

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

@@ -9,6 +9,17 @@ module Decidim
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
       helper Decidim::Meetings::ApplicationHelper
+
+      private
+
+      def add_addtional_csp_directives
+        return unless respond_to?(:meeting) || meeting.present?
+
+        embedded = MeetingIframeEmbedder.new(meeting.online_meeting_url).embed_transformed_url(request.host)
+        return if embedded.blank?
+
+        content_security_policy.append_csp_directive("frame-src", embedded)
+      end
     end
   end
 end

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

@@ -6,7 +6,6 @@ module Decidim
     # to their favorite calendar app
     class CalendarsController < Decidim::Meetings::ApplicationController
       include FilterResource
-      include Filterable
       include ComponentFilterable
 
       layout false

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

@@ -9,7 +9,19 @@ module Decidim
     # override its layout and provide all kinds of useful methods.
     module Directory
       class ApplicationController < Decidim::ApplicationController
+        include HasSpecificBreadcrumb
+
         helper Decidim::Meetings::Directory::ApplicationHelper
+
+        private
+
+        def breadcrumb_item
+          {
+            label: t("decidim.pages.home.extended.meetings"),
+            url: root_path,
+            active: true
+          }
+        end
       end
     end
   end

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

@@ -8,10 +8,8 @@ module Decidim
         layout "layouts/decidim/application"
 
         include FilterResource
-        include Filterable
         include Paginable
 
-        helper Decidim::WidgetUrlsHelper
         helper Decidim::FiltersHelper
         helper Decidim::Meetings::MapHelper
         helper Decidim::ResourceHelper
@@ -44,37 +42,14 @@ module Decidim
             with_any_date: "upcoming",
             title_or_description_cont: "",
             activity: "all",
-            with_any_scope: default_filter_scope_params,
-            with_any_space: default_filter_space_params,
-            with_any_type: default_filter_type_params,
-            with_any_origin: default_filter_origin_params,
-            with_any_global_category: default_filter_category_params
+            with_any_scope: nil,
+            with_any_space: nil,
+            with_any_type: nil,
+            with_any_origin: nil,
+            with_any_global_category: nil
           }
         end
 
-        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 meeting_components
           @meeting_components ||= Decidim::Component
                                   .where(manifest_name: "meetings")

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

@@ -9,6 +9,7 @@ module Decidim
       include Decidim::Meetings::PollsResources
 
       helper_method :live_meeting_embed_code
+      before_action :add_addtional_csp_directives, only: :show
 
       def show
         raise ActionController::RoutingError, "Not Found" unless meeting

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

@@ -4,19 +4,18 @@ module Decidim
   module Meetings
     # This controller allows a participant to update the closing_report and the linked proposals of a closed meeting
     class MeetingClosesController < Decidim::Meetings::ApplicationController
-      include Decidim::Proposals::Admin::Picker if Decidim::Meetings.enable_proposal_linking
       include FormFactory
 
       helper_method :meeting
 
       def edit
-        enforce_permission_to :close, :meeting, meeting: meeting
+        enforce_permission_to(:close, :meeting, meeting:)
 
         @form = form(CloseMeetingForm).from_model(meeting)
       end
 
       def update
-        enforce_permission_to :close, :meeting, meeting: meeting
+        enforce_permission_to(:close, :meeting, meeting:)
 
         @form = form(CloseMeetingForm).from_params(params.merge(proposals: meeting.sibling_scope(:proposals)))
 

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

@@ -5,18 +5,19 @@ module Decidim
     # Exposes the meeting resource so users can view them
     class MeetingsController < Decidim::Meetings::ApplicationController
       include FilterResource
-      include Filterable
       include ComponentFilterable
       include Flaggable
       include Withdrawable
       include FormFactory
       include Paginable
 
-      helper Decidim::WidgetUrlsHelper
       helper Decidim::ResourceVersionsHelper
       helper Decidim::ShortLinkHelper
+      include Decidim::AttachmentsHelper
 
-      helper_method :meetings, :meeting, :registration, :search
+      helper_method :meetings, :meeting, :registration, :search, :nav_paths, :tab_panel_items
+
+      before_action :add_addtional_csp_directives, only: [:show]
 
       def new
         enforce_permission_to :create, :meeting
@@ -27,7 +28,7 @@ module Decidim
       def create
         enforce_permission_to :create, :meeting
 
-        @form = meeting_form.from_params(params, current_component: current_component)
+        @form = meeting_form.from_params(params, current_component:)
 
         CreateMeeting.call(@form) do
           on(:ok) do |meeting|
@@ -65,13 +66,13 @@ module Decidim
       end
 
       def edit
-        enforce_permission_to :update, :meeting, meeting: meeting
+        enforce_permission_to(:update, :meeting, meeting:)
 
         @form = meeting_form.from_model(meeting)
       end
 
       def update
-        enforce_permission_to :update, :meeting, meeting: meeting
+        enforce_permission_to(:update, :meeting, meeting:)
 
         @form = meeting_form.from_params(params)
 
@@ -89,7 +90,7 @@ module Decidim
       end
 
       def withdraw
-        enforce_permission_to :withdraw, :meeting, meeting: meeting
+        enforce_permission_to(:withdraw, :meeting, meeting:)
 
         WithdrawMeeting.call(@meeting, current_user) do
           on(:ok) do
@@ -109,6 +110,36 @@ module Decidim
         @meeting ||= Meeting.not_hidden.where(component: current_component).find_by(id: params[:id])
       end
 
+      def next_meeting
+        return if search_collection.size < 2
+
+        search_collection.order(:start_time, :id).where(
+          Decidim::Meetings::Meeting.arel_table[:start_time].gt(meeting.start_time).or(
+            Decidim::Meetings::Meeting.arel_table[:start_time].eq(meeting.start_time).and(
+              Decidim::Meetings::Meeting.arel_table[:id].gt(meeting.id)
+            )
+          )
+        ).first
+      end
+
+      def prev_meeting
+        return if search_collection.size < 2
+
+        search_collection.order(:start_time, :id).where(
+          Decidim::Meetings::Meeting.arel_table[:start_time].lt(meeting.start_time).or(
+            Decidim::Meetings::Meeting.arel_table[:start_time].eq(meeting.start_time).and(
+              Decidim::Meetings::Meeting.arel_table[:id].lt(meeting.id)
+            )
+          )
+        ).last
+      end
+
+      def nav_paths
+        return {} if meeting.blank?
+
+        { prev_path: prev_meeting, next_path: next_meeting }.compact_blank.transform_values { |meeting| meeting_path(meeting) }
+      end
+
       def meetings
         is_past_meetings = params.dig("filter", "with_any_date")&.include?("past")
         @meetings ||= paginate(search.result.order(start_time: is_past_meetings ? :desc : :asc))
@@ -130,6 +161,43 @@ module Decidim
       def meeting_form
         form(Decidim::Meetings::MeetingForm)
       end
+
+      def tab_panel_items
+        @tab_panel_items ||= [
+          {
+            enabled: meeting.public_participants.any?,
+            id: "participants",
+            text: t("attending_participants", scope: "decidim.meetings.public_participants_list"),
+            icon: "group-line",
+            method: :cell,
+            args: ["decidim/meetings/public_participants_list", meeting]
+          },
+          {
+            enabled: !meeting.closed? && meeting.user_group_registrations.any?,
+            id: "organizations",
+            text: t("attending_organizations", scope: "decidim.meetings.public_participants_list"),
+            icon: "community-line",
+            method: :cell,
+            args: ["decidim/meetings/attending_organizations_list", meeting]
+          },
+          {
+            enabled: meeting.linked_resources(:proposals, "proposals_from_meeting").present?,
+            id: "included_proposals",
+            text: t("decidim/proposals/proposal", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("Decidim::Proposals::Proposal"),
+            method: :cell,
+            args: ["decidim/linked_resources_for", meeting, { type: :proposals, link_name: "proposals_from_meeting" }]
+          },
+          {
+            enabled: meeting.linked_resources(:results, "meetings_through_proposals").present?,
+            id: "included_meetings",
+            text: t("decidim/accountability/result", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("Decidim::Accountability::Result"),
+            method: :cell,
+            args: ["decidim/linked_resources_for", meeting, { type: :results, link_name: "meetings_through_proposals" }]
+          }
+        ] + attachments_tab_panel_items(@meeting)
+      end
     end
   end
 end

data/app/controllers/decidim/meetings/polls/answers_controller.rb

@@ -10,8 +10,8 @@ module Decidim
         helper_method :question
 
         def create
-          enforce_permission_to :create, :answer, question: question
-          @form = form(AnswerForm).from_params(params, question: question, current_user: current_user)
+          enforce_permission_to(:create, :answer, question:)
+          @form = form(AnswerForm).from_params(params, question:, current_user:)
 
           CreateAnswer.call(@form, current_user, questionnaire) do
             # Both :ok and :invalid render the same template, because

data/app/controllers/decidim/meetings/polls/questions_controller.rb

@@ -15,7 +15,7 @@ module Decidim
         end
 
         def update
-          enforce_permission_to :update, :question, question: question
+          enforce_permission_to(:update, :question, question:)
 
           Decidim::Meetings::Admin::UpdateQuestionStatus.call(question, current_user) do
             respond_to do |format|

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

@@ -7,9 +7,9 @@ module Decidim
       include Decidim::Forms::Concerns::HasQuestionnaire
 
       def answer
-        enforce_permission_to :join, :meeting, meeting: meeting
+        enforce_permission_to(:join, :meeting, meeting:)
 
-        @form = form(Decidim::Forms::QuestionnaireForm).from_params(params, session_token: session_token)
+        @form = form(Decidim::Forms::QuestionnaireForm).from_params(params, session_token:)
 
         JoinMeeting.call(meeting, current_user, @form) do
           on(:ok) do
@@ -30,7 +30,7 @@ module Decidim
       end
 
       def create
-        enforce_permission_to :register, :meeting, meeting: meeting
+        enforce_permission_to(:register, :meeting, meeting:)
 
         @form = JoinMeetingForm.from_params(params)
 
@@ -48,7 +48,7 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :leave, :meeting, meeting: meeting
+        enforce_permission_to(:leave, :meeting, meeting:)
 
         LeaveMeeting.call(meeting, current_user) do
           on(:ok) do
@@ -64,7 +64,7 @@ module Decidim
       end
 
       def decline_invitation
-        enforce_permission_to :decline_invitation, :meeting, meeting: meeting
+        enforce_permission_to(:decline_invitation, :meeting, meeting:)
 
         DeclineInvitation.call(meeting, current_user) do
           on(:ok) do

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

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Meetings

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

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Meetings

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

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Meetings
@@ -11,8 +11,8 @@ module Decidim
 
       def i18n_options
         {
-          resource_title: resource_title,
-          resource_url: resource_url,
+          resource_title:,
+          resource_url:,
           scope: event_name,
           registration_code: extra["registration_code"]
         }

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

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Meetings

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

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Meetings

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

@@ -1,4 +1,4 @@
-# frozen-string_literal: true
+# frozen_string_literal: true
 
 module Decidim
   module Meetings

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

@@ -57,6 +57,10 @@ module Decidim
 
           self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
           self.type_of_meeting = model.type_of_meeting
+
+          presenter = MeetingEditionPresenter.new(model)
+          self.title = presenter.title(all_locales: true)
+          self.description = presenter.editor_description(all_locales: true)
         end
 
         def services_to_persist
@@ -125,7 +129,7 @@ module Decidim
         end
 
         def registration_type_select
-          Decidim::Meetings::Meeting::REGISTRATION_TYPE.map do |type|
+          Decidim::Meetings::Meeting::REGISTRATION_TYPES.keys.map do |type|
             [
               I18n.t("registration_type.#{type}", scope: "decidim.meetings"),
               type

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

@@ -41,9 +41,9 @@ module Decidim
         # to resubmit the form, the form will not hold an ID, so the `to_param`
         # method will return an empty string and Rails will treat this as a
         # `create` action, thus raising an error since this action is not defined
-        # for the controller we're using.
+        # for the controller we are using.
         #
-        # TL;DR: if you remove this method, we'll get errors, so don't.
+        # TL;DR: if you remove this method, we will get errors, so do not.
         def id
           return super if super.present?
 

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

@@ -11,7 +11,7 @@ module Decidim
         validate :registration_exists
 
         def registration
-          @registration ||= meeting.registrations.find_by(code: code, validated_at: nil)
+          @registration ||= meeting.registrations.find_by(code:, validated_at: nil)
         end
 
         private

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

@@ -19,7 +19,7 @@ module Decidim
       validates :end_time, presence: true, date: { after: :start_time }
 
       def type_of_meeting_select
-        Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
+        Decidim::Meetings::Meeting::TYPE_OF_MEETING.keys.map do |type|
           [
             I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
             type

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

@@ -47,7 +47,7 @@ module Decidim
         self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
         presenter = MeetingEditionPresenter.new(model)
         self.title = presenter.title(all_locales: false)
-        self.description = presenter.description(all_locales: false)
+        self.description = presenter.editor_description(all_locales: false)
         self.location = presenter.location(all_locales: false)
         self.location_hints = presenter.location_hints(all_locales: false)
         self.registration_terms = presenter.registration_terms(all_locales: false)
@@ -81,7 +81,7 @@ module Decidim
       end
 
       def type_of_meeting_select
-        Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
+        Decidim::Meetings::Meeting::TYPE_OF_MEETING.keys.map do |type|
           [
             I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
             type
@@ -116,7 +116,7 @@ module Decidim
       end
 
       def registration_type_select
-        Decidim::Meetings::Meeting::REGISTRATION_TYPE.map do |type|
+        Decidim::Meetings::Meeting::REGISTRATION_TYPES.keys.map do |type|
           [
             I18n.t("registration_type.#{type}", scope: "decidim.meetings"),
             type

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

@@ -8,6 +8,7 @@ module Decidim
       module ApplicationHelper
         include Decidim::MapHelper
         include Decidim::Admin::ResourceScopeHelper
+        include Decidim::PaginateHelper
 
         def tabs_id_for_service(service)
           "meeting_service_#{service.to_param}"