decidim-meetings 0.25.0.rc4 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab6b8251a715062c189020553bfb57757740cbd1ffa121296885058b0fb8d9f6
-  data.tar.gz: 68cb83595a3308d8746bba38e1044d0e0bbc2c86ad1d55b0ffb65537d510b501
+  metadata.gz: 256dad0f957894de0c248a6cce248f88bc042dd492c66fd11e184d7a87967c39
+  data.tar.gz: c6a0dfbfe8f98bebebf610efb7343760c54dba467c110cc9f5f13f00b3808f15
 SHA512:
-  metadata.gz: 8df219dc002060c59f897970bf4cfdba38189f1f8864385c733f700630fe6ba1d58165471fefed2657830c713180ce57b64b341d733828ac3c81e06f4b10d129
-  data.tar.gz: d26e7f6d6f2009970427a955d4b1b659b4aa13267cb8f8c6a67aeb46eaaf4e898e379333490a94386f6a1b89fced225aa93a5881f0f68b2cb3f1e4e6470b3427
+  metadata.gz: 5dd07cca73c821eaf9cc3563a214a1739cac3fa09e1cd6a4f306dc0724a035d04019628b913ba134c4568cf453bc5d177a6c6df3753a835ba590756d7a01b68e
+  data.tar.gz: f44f047fcd96d9e89dd57a3758c6199285675eb91b813dc9c5fa60d50bdd69cff37f067697469513e129f4a3b8473d0d59d14d46efc436fc3817bda17f22aad5

data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/heading.erb

@@ -1 +1 @@
-<h2 class="section-heading"><%= t("decidim.meetings.content_blocks.upcoming_events.upcoming_events") %></h2>
+<h2 class="section-heading"><%= t("decidim.meetings.content_blocks.upcoming_meetings.upcoming_meetings") %></h2>

data/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb

@@ -5,7 +5,7 @@ module Decidim
     module ContentBlocks
       class HighlightedMeetingsCell < Decidim::ContentBlocks::HighlightedElementsCell
         def base_relation
-          Decidim::Meetings::Meeting.where(component: published_components)
+          Decidim::Meetings::Meeting.except_withdrawn.where(component: published_components)
         end
 
         def elements

data/app/cells/decidim/meetings/content_blocks/{upcoming_events → upcoming_meetings}/show.erb

@@ -1,17 +1,17 @@
-<section class="wrapper-home upcoming-events home-section">
+<section class="wrapper-home upcoming-meetings home-section">
   <div class="row">
-    <h3 class="section-heading"><%= t("decidim.meetings.content_blocks.upcoming_events.upcoming_events") %></h3>
+    <h3 class="section-heading"><%= t("decidim.meetings.content_blocks.upcoming_meetings.upcoming_meetings") %></h3>
     <div class="row">
       <div class="columns medium-6">
-        <% upcoming_events.first(4).each do |event| %>
+        <% upcoming_meetings.first(4).each do |event| %>
           <%= card_for event, size: :s %>
         <% end %>
       </div>
       <div class="columns medium-6">
         <% if geolocation_enabled? %>
-          <%= cell "decidim/meetings/meetings_map", upcoming_events %>
+          <%= cell "decidim/meetings/meetings_map", upcoming_meetings %>
         <% else %>
-          <% (upcoming_events - upcoming_events.first(4)).each do |event| %>
+          <% (upcoming_meetings - upcoming_meetings.first(4)).each do |event| %>
             <%= card_for event, size: :s %>
           <% end %>
         <% end %>
@@ -19,7 +19,7 @@
     </div>
     <div class="row">
       <div class="column">
-        <%= link_to t("decidim.meetings.content_blocks.upcoming_events.view_all_events"), meetings_directory_path, class: "button hollow button--sc pull-right" %>
+        <%= link_to t("decidim.meetings.content_blocks.upcoming_meetings.view_all_meetings"), meetings_directory_path, class: "button hollow button--sc pull-right" %>
       </div>
     </div>
   </div>

data/app/cells/decidim/meetings/content_blocks/{upcoming_events_cell.rb → upcoming_meetings_cell.rb}

@@ -3,23 +3,24 @@
 module Decidim
   module Meetings
     module ContentBlocks
-      class UpcomingEventsCell < Decidim::ViewModel
+      class UpcomingMeetingsCell < Decidim::ViewModel
         include Decidim::CardHelper
 
         def show
-          return if upcoming_events.blank?
+          return if upcoming_meetings.blank?
 
           render
         end
 
-        def upcoming_events
-          @upcoming_events ||= Decidim::Meetings::Meeting
-                               .includes(component: :participatory_space)
-                               .where(component: meeting_components)
-                               .visible_meeting_for(current_user)
-                               .where("end_time >= ?", Time.current)
-                               .order(start_time: :asc)
-                               .limit(limit)
+        def upcoming_meetings
+          @upcoming_meetings ||= Decidim::Meetings::Meeting
+                                 .includes(component: :participatory_space)
+                                 .where(component: meeting_components)
+                                 .visible_meeting_for(current_user)
+                                 .where("end_time >= ?", Time.current)
+                                 .except_withdrawn
+                                 .order(start_time: :asc)
+                                 .limit(limit)
         end
 
         def geolocation_enabled?

data/app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb

@@ -18,7 +18,7 @@ module Decidim
       private
 
       def meetings
-        @meetings ||= Decidim::Meetings::Meeting.where(component: model).visible_meeting_for(current_user)
+        @meetings ||= Decidim::Meetings::Meeting.where(component: model).except_withdrawn.visible_meeting_for(current_user)
       end
 
       def past_meetings

data/app/cells/decidim/meetings/join_meeting_button_cell.rb

@@ -50,7 +50,7 @@ module Decidim
       end
 
       def registration_terms_text
-        decidim_sanitize translated_attribute(model.registration_terms)
+        decidim_sanitize_editor translated_attribute(model.registration_terms)
       end
 
       def registration_form

data/app/cells/decidim/meetings/meeting_list_item_cell.rb

@@ -13,6 +13,16 @@ module Decidim
 
       private
 
+      def cache_hash
+        hash = []
+        hash.push(I18n.locale.to_s)
+        hash.push(model.cache_key_with_version)
+        hash.push(model.component.cache_key_with_version)
+        hash.push(model.must_render_translation?(current_organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
+
+        hash.join(Decidim.cache_key_separator)
+      end
+
       def resource_path
         resource_locator(model).path(filter_link_params)
       end

data/app/cells/decidim/meetings/meeting_m_cell.rb

@@ -27,10 +27,58 @@ module Decidim
         present(model).title
       end
 
+      def description
+        present(model).description(strip_tags: true)
+      end
+
+      def badge
+        render if has_badge?
+      end
+
+      def has_badge?
+        withdrawn?
+      end
+
+      def state_classes
+        ["alert"]
+      end
+
       delegate :online_meeting?, to: :model
 
       private
 
+      def cache_hash
+        hash = []
+        hash << I18n.locale.to_s
+        hash << model.cache_key_with_version
+        hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
+        hash << Digest::MD5.hexdigest(resource_image_path) if resource_image_path
+        hash << model.comments_count
+        hash << model.follows_count
+        hash << render_space? ? 1 : 0
+
+        if current_user
+          hash << current_user.cache_key_with_version
+          hash << current_user.follows?(model) ? 1 : 0
+        end
+        hash << Digest::MD5.hexdigest(model.author.cache_key_with_version)
+        hash << (model.must_render_translation?(current_organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
+
+        hash.join(Decidim.cache_key_separator)
+      end
+
+      def has_state?
+        withdrawn?
+      end
+
+      def resource_image_path
+        model.photo&.url
+      end
+
+      def has_image?
+        true
+      end
+
       def spans_multiple_dates?
         start_date != end_date
       end

data/app/cells/decidim/meetings/meeting_s_cell.rb

@@ -26,6 +26,28 @@ module Decidim
       def presenter
         @presenter ||= Decidim::Meetings::MeetingPresenter.new(model)
       end
+
+      private
+
+      def cache_hash
+        hash = []
+        hash << I18n.locale.to_s
+        hash << model.cache_key_with_version
+        hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
+        hash << Digest::MD5.hexdigest(resource_image_path) if resource_image_path
+        hash << model.comments_count
+        hash << model.follows_count
+        hash << render_space? ? 1 : 0
+
+        if current_user
+          hash << current_user.cache_key_with_version
+          hash << current_user.follows?(model) ? 1 : 0
+        end
+        hash << Digest::MD5.hexdigest(model.author.cache_key_with_version)
+        hash << (model.must_render_translation?(current_organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
+
+        hash.join(Decidim.cache_key_separator)
+      end
     end
   end
 end

data/app/cells/decidim/meetings/meetings_map_cell.rb

@@ -21,6 +21,12 @@ module Decidim
       def meetings
         model
       end
+
+      private
+
+      def cache_hash
+        nil
+      end
     end
   end
 end

data/app/cells/decidim/meetings/online_meeting_cell.rb

@@ -5,6 +5,16 @@ module Decidim
     # This cell defines methods required for other cells to render
     # online meeting urls
     class OnlineMeetingCell < Decidim::ViewModel
+      delegate :live?, to: :model
+
+      def show
+        return if model.iframe_embed_type_none?
+        return unless model.iframe_access_level_allowed_for_user?(current_user)
+        return unless assembly_privacy_allowed?
+
+        render
+      end
+
       protected
 
       def embedder
@@ -14,23 +24,28 @@ module Decidim
       delegate :embeddable?, to: :embedder
 
       def live_event_url
-        if embeddable?
+        if embeddable? && !model.iframe_embed_type_open_in_new_tab?
           Decidim::EngineRouter.main_proxy(model.component).meeting_live_event_path(meeting_id: model.id)
         else
           model.online_meeting_url
         end
       end
 
-      def live?
-        model.start_time &&
-          model.end_time &&
-          Time.current >= (model.start_time - 10.minutes) &&
-          Time.current <= model.end_time
-      end
-
       def future?
         Time.current <= model.start_time && !live?
       end
+
+      def assembly_privacy_allowed?
+        return true if !private_transparent_assembly? || current_user&.admin?
+
+        model.participatory_space.users.include?(current_user)
+      end
+
+      def private_transparent_assembly?
+        return unless model.participatory_space.is_a?(Decidim::Assembly)
+
+        model.participatory_space.private_space? && model.participatory_space.is_transparent?
+      end
     end
   end
 end

data/app/cells/decidim/meetings/online_meeting_link/show.erb

@@ -1,5 +1,5 @@
 <% if online_meeting_url? %>
-  <% if show_embed? || live? || future? %>
+  <% if live? || future? %>
     <div class="card card--secondary">
       <div class="card__content text-center">
         <% if live? %>
@@ -14,7 +14,7 @@
           </div>
         <% end %>
 
-        <% if show_embed? %>
+        <% if show_embed? && live? %>
           <div class="<%= "margin-top-3" if live? %> absolutes aspect-ratio-16-9">
             <%== embed_code(request.host) %>
           </div>

data/app/cells/decidim/meetings/online_meeting_link_cell.rb

@@ -7,10 +7,6 @@ module Decidim
     class OnlineMeetingLinkCell < Decidim::Meetings::OnlineMeetingCell
       include Decidim::LayoutHelper
 
-      def show
-        render
-      end
-
       def online_meeting_url?
         model.online_meeting_url.present?
       end
@@ -20,7 +16,7 @@ module Decidim
       private
 
       def show_embed?
-        model.show_embedded_iframe? && embedder.embeddable?
+        model.iframe_embed_type_embed_in_meeting_page? && embedder.embeddable?
       end
     end
   end

data/app/cells/decidim/meetings/public_participants_list_cell.rb

@@ -10,6 +10,7 @@ module Decidim
     #
     #    cell("decidim/public_participants_list", meeting)
     class PublicParticipantsListCell < Decidim::ViewModel
+      include Decidim::Meetings::MeetingsHelper
       include ApplicationHelper
 
       def show

data/app/cells/decidim/meetings/question_responses_cell.rb

@@ -25,7 +25,7 @@ module Decidim
         # This calculation is a bit complex because of multiple option answers
         question_answers_choices = Decidim::Meetings::AnswerOption.where(decidim_question_id: model.id)
                                                                   .joins([choices: :answer])
-                                                                  .group("#{answers_table_name}.id, #{answer_options_table_name}.id")
+                                                                  .group(Arel.sql("#{answers_table_name}.id, #{answer_options_table_name}.id"))
                                                                   .select(<<~SELECT
                                                                     #{answer_options_table_name}.id AS id,
                                                                     #{answer_options_table_name}.body,

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -21,6 +21,7 @@ module Decidim
             create_services!
           end
 
+          create_follow_form_resource(form.current_user)
           broadcast(:ok, meeting)
         end
 
@@ -56,7 +57,11 @@ module Decidim
             questionnaire: Decidim::Forms::Questionnaire.new,
             customize_registration_email: form.customize_registration_email,
             registration_email_custom_content: form.registration_email_custom_content,
-            show_embedded_iframe: form.show_embedded_iframe
+            iframe_embed_type: form.iframe_embed_type,
+            comments_enabled: form.comments_enabled,
+            comments_start_time: form.comments_start_time,
+            comments_end_time: form.comments_end_time,
+            iframe_access_level: form.iframe_access_level
           }
 
           @meeting = Decidim.traceability.create!(
@@ -76,6 +81,11 @@ module Decidim
             )
           end
         end
+
+        def create_follow_form_resource(user)
+          follow_form = Decidim::FollowForm.from_params(followable_gid: meeting.to_signed_global_id.to_s).with_context(current_user: user)
+          Decidim::CreateFollow.call(follow_form, user)
+        end
       end
     end
   end

data/app/commands/decidim/meetings/admin/publish_meeting.rb

@@ -60,10 +60,12 @@ module Decidim
         end
 
         def schedule_upcoming_meeting_notification
+          return if meeting.start_time < Time.zone.now
+
           checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
 
           Decidim::Meetings::UpcomingMeetingNotificationJob
-            .set(wait_until: meeting.start_time - 2.days)
+            .set(wait_until: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
             .perform_later(meeting.id, checksum)
         end
       end

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -62,7 +62,11 @@ module Decidim
             transparent: form.transparent,
             customize_registration_email: form.customize_registration_email,
             registration_email_custom_content: form.registration_email_custom_content,
-            show_embedded_iframe: form.show_embedded_iframe
+            iframe_embed_type: form.iframe_embed_type,
+            comments_enabled: form.comments_enabled,
+            comments_start_time: form.comments_start_time,
+            comments_end_time: form.comments_end_time,
+            iframe_access_level: form.iframe_access_level
           )
         end
 
@@ -95,10 +99,12 @@ module Decidim
         end
 
         def schedule_upcoming_meeting_notification
+          return if meeting.start_time < Time.zone.now
+
           checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
 
           Decidim::Meetings::UpcomingMeetingNotificationJob
-            .set(wait_until: meeting.start_time - 2.days)
+            .set(wait_until: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
             .perform_later(meeting.id, checksum)
         end
       end

data/app/commands/decidim/meetings/create_meeting.rb

@@ -21,6 +21,7 @@ module Decidim
           send_notification
         end
 
+        create_follow_form_resource(form.current_user)
         broadcast(:ok, meeting)
       end
 
@@ -54,7 +55,8 @@ module Decidim
           type_of_meeting: form.clean_type_of_meeting,
           component: form.current_component,
           published_at: Time.current,
-          show_embedded_iframe: form.show_embedded_iframe
+          iframe_embed_type: form.iframe_embed_type,
+          iframe_access_level: form.iframe_access_level
         }
 
         @meeting = Decidim.traceability.create!(
@@ -63,13 +65,18 @@ module Decidim
           params,
           visibility: "public-only"
         )
+        Decidim.traceability.perform_action!(:publish, meeting, form.current_user, visibility: "all") do
+          meeting.publish!
+        end
       end
 
       def schedule_upcoming_meeting_notification
+        return if meeting.start_time < Time.zone.now
+
         checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
 
         Decidim::Meetings::UpcomingMeetingNotificationJob
-          .set(wait_until: meeting.start_time - 2.days)
+          .set(wait_until: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
           .perform_later(meeting.id, checksum)
       end
 
@@ -81,6 +88,11 @@ module Decidim
           followers: meeting.participatory_space.followers
         )
       end
+
+      def create_follow_form_resource(user)
+        follow_form = Decidim::FollowForm.from_params(followable_gid: meeting.to_signed_global_id.to_s).with_context(current_user: user)
+        Decidim::CreateFollow.call(follow_form, user)
+      end
     end
   end
 end

data/app/commands/decidim/meetings/update_meeting.rb

@@ -63,7 +63,8 @@ module Decidim
             registrations_enabled: form.registrations_enabled,
             type_of_meeting: form.clean_type_of_meeting,
             online_meeting_url: form.online_meeting_url,
-            show_embedded_iframe: form.show_embedded_iframe
+            iframe_embed_type: form.iframe_embed_type,
+            iframe_access_level: form.iframe_access_level
           },
           visibility: "public-only"
         )
@@ -91,10 +92,12 @@ module Decidim
       end
 
       def schedule_upcoming_meeting_notification
+        return if meeting.start_time < Time.zone.now
+
         checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
 
         Decidim::Meetings::UpcomingMeetingNotificationJob
-          .set(wait_until: meeting.start_time - 2.days)
+          .set(wait_until: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
           .perform_later(meeting.id, checksum)
       end
     end

data/app/commands/decidim/meetings/withdraw_meeting.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # A command with all the business logic when a user withdraws a new proposal.
+    class WithdrawMeeting < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # meeting     - The meeting to withdraw.
+      # current_user - The current user.
+      def initialize(meeting, current_user)
+        @meeting = meeting
+        @current_user = current_user
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid, together with the meeting.
+      # - :invalid if the meeting does not belong to current user.
+      #
+      # Returns nothing.
+      def call
+        return broadcast(:invalid) unless @meeting.authored_by?(@current_user)
+
+        transaction do
+          change_meeting_state_to_withdrawn
+        end
+
+        broadcast(:ok, @meeting)
+      end
+
+      private
+
+      def change_meeting_state_to_withdrawn
+        @meeting.update state: "withdrawn"
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/meetings/filterable.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Meetings
+    # A controller concern to specify default filter parameters for the controller resources.
+    module Filterable
+      extend ActiveSupport::Concern
+
+      included do
+        private
+
+        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
+
+        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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This controller is the abstract class from which all other controllers of
+    # this engine inherit.
+    #
+    # Note that it inherits from `Decidim::Components::BaseController`, which
+    # override its layout and provide all kinds of useful methods.
+    module Directory
+      class ApplicationController < Decidim::ApplicationController
+        helper Decidim::Meetings::Directory::ApplicationHelper
+      end
+    end
+  end
+end