decidim-meetings 0.24.1 → 0.25.0.rc2

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

@@ -27,7 +27,7 @@ module Decidim
       # Finds the Projects scoped to an array of components and filtered
       # by a range of dates.
       def query
-        meetings = Decidim::Meetings::Meeting.not_hidden.where(component: @components)
+        meetings = Decidim::Meetings::Meeting.not_hidden.published.where(component: @components)
         meetings = meetings.where("created_at >= ?", @start_at) if @start_at.present?
         meetings = meetings.where("created_at <= ?", @end_at) if @end_at.present?
         meetings

data/app/queries/decidim/meetings/metrics/meetings_metric_manage.rb

@@ -30,7 +30,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          @query = Decidim::Meetings::Meeting.where(component: visible_component_ids_from_spaces(spaces)).joins(:component)
+          @query = Decidim::Meetings::Meeting.where(component: visible_components_from_spaces(spaces)).joins(:component)
                                              .left_outer_joins(:category).visible
           @query = @query.where("decidim_meetings_meetings.created_at <= ?", end_time)
           @query = @query.group("decidim_categorizations.decidim_category_id",

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # A class used to collect user answers for a questionnaire
+    class QuestionnaireUserAnswers < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # questionnaire - a Questionnaire object
+      def self.for(questionnaire)
+        new(questionnaire).query
+      end
+
+      # Initializes the class.
+      #
+      # questionnaire = a Questionnaire object
+      def initialize(questionnaire)
+        @questionnaire = questionnaire
+      end
+
+      # Finds and group answers by user for each questionnaire's question.
+      def query
+        answers = Answer.joins(:question).where(questionnaire: @questionnaire)
+
+        answers.sort_by { |answer| answer.question.position }.group_by(&:user).values
+      end
+    end
+  end
+end

data/app/serializers/decidim/meetings/data_portability_invite_serializer.rb

@@ -26,7 +26,8 @@ module Decidim
             attendees_count: resource.meeting.attendees_count,
             attending_organizations: resource.meeting.attending_organizations,
             closed_at: resource.meeting.closed_at,
-            closing_report: resource.meeting.closing_report
+            closing_report: resource.meeting.closing_report,
+            published_at: resource.meeting.published_at
           }
         }
       end

data/app/serializers/decidim/meetings/data_portability_registration_serializer.rb

@@ -24,7 +24,8 @@ module Decidim
             attendees_count: resource.meeting.attendees_count,
             attending_organizations: resource.meeting.attending_organizations,
             closed_at: resource.meeting.closed_at,
-            closing_report: resource.meeting.closing_report
+            closing_report: resource.meeting.closing_report,
+            published_at: resource.meeting.published_at
           }
         }
       end

data/app/serializers/decidim/meetings/registration_serializer.rb

@@ -21,18 +21,9 @@ module Decidim
       private
 
       def serialize_answers
-        questions = resource.meeting.questionnaire.questions
-        answers = resource.meeting.questionnaire.answers.where(user: resource.user)
-        questions.each_with_index.inject({}) do |serialized, (question, idx)|
-          answer = answers.find_by(question: question)
-          serialized.update("#{idx + 1}. #{translated_attribute(question.body)}" => normalize_body(answer))
-        end
-      end
-
-      def normalize_body(answer)
-        return "" unless answer
-
-        answer.body || answer.choices.pluck(:body)
+        Decidim::Forms::UserAnswersSerializer.new(
+          resource.meeting.questionnaire.answers.where(user: resource.user)
+        ).serialize
       end
     end
   end

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

@@ -13,8 +13,8 @@ module Decidim
         def events
           Rails.cache.fetch(cache_key) do
             meetings.map do |meeting|
-              MeetingToEvent.new(meeting).to_ical
-            end.join
+              MeetingCalendar.new(meeting).events
+            end.compact.join
           end
         end
 

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Calendar
+      # This class handles how to convert a single meeting to the ICalendar
+      # format. It caches its result until the meeting is updated again.
+      # This class generates a ICalendar entry for an individual meeting.
+      class MeetingCalendar < BaseCalendar
+        # Renders the meeting in an ICalendar format. It caches the results in
+        # Rails' cache.
+        #
+        # Returns a String.
+        def events
+          Rails.cache.fetch(cache_key) do
+            MeetingToEvent.new(meeting).to_ical
+          end
+        end
+
+        private
+
+        alias meeting resource
+
+        # Defines the cache key for the given component.
+        #
+        # Returns a String.
+        def cache_key
+          "meetings-calendar-meeting-#{meeting.id}-#{meeting.updated_at.to_i}"
+        end
+      end
+    end
+  end
+end

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

@@ -9,6 +9,8 @@ module Decidim
           Calendar::OrganizationCalendar.for(resource)
         when Decidim::Component
           Calendar::ComponentCalendar.for(resource)
+        when Decidim::Meetings::Meeting
+          Calendar::MeetingCalendar.for(resource)
         end
       end
     end

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require "cgi"
+
+module Decidim
+  module Meetings
+    # This class handles the streaming url to be included in the iframe present
+    # in the live event. For some services it's required to transforma a bit
+    # the structure of the URL.
+    class MeetingIframeEmbedder
+      # Public: Initializes the service.
+      # online_meeting_service_url - A String containing the url of the online meeting
+      def initialize(online_meeting_service_url)
+        @online_meeting_service_url = online_meeting_service_url
+      end
+
+      def embed_transformed_url(request_host)
+        return nil if parsed_online_meeting_uri.nil?
+
+        case parsed_online_meeting_uri.host
+        when "www.youtube.com"
+          transform_youtube_url(parsed_online_meeting_uri)
+        when "www.twitch.tv"
+          transform_twitch_url(parsed_online_meeting_uri, request_host)
+        else
+          online_meeting_service_url
+        end
+      end
+
+      def embeddable?
+        return nil if parsed_online_meeting_uri.nil?
+
+        EMBEDDABLE_SERVICES.include?(parsed_online_meeting_uri.host)
+      end
+
+      def embed_code(request_host)
+        return nil if parsed_online_meeting_uri.nil?
+
+        %(
+<iframe
+  allow="camera; microphone; fullscreen; display-capture; autoplay"
+  loading="lazy"
+  src="#{embed_transformed_url(request_host)}"
+  style="height: 100%; width: 100%; border: 0px;"
+/>
+        )
+      end
+
+      private
+
+      EMBEDDABLE_SERVICES = %( www.youtube.com www.twitch.tv )
+
+      attr_accessor :online_meeting_service_url
+
+      # Youtube transformation consists on:
+      # 1. extract the video id from the parameter v
+      # 2. Create a new URL using the domain youtube-nocookie.com, converting it to an embed
+      #    and appending the video id
+      def transform_youtube_url(uri)
+        return online_meeting_service_url if uri.query.blank?
+
+        video_id = CGI.parse(uri.query).fetch("v")&.first
+
+        return online_meeting_service_url if video_id.blank?
+
+        "https://www.youtube-nocookie.com/embed/#{video_id}"
+      end
+
+      # Twitch transformation consists on:
+      # 1. extract the video id from the third URL parameter
+      # 2. extract the request host
+      # 3. build the embed url using both the video ID and the request host as parent argument
+      def transform_twitch_url(uri, request_host)
+        _, param_name, video_id = *uri.path.split("/")
+
+        return online_meeting_service_url if video_id.blank? || param_name != "videos"
+
+        "https://player.twitch.tv/?video=#{video_id}&parent=#{request_host}"
+      end
+
+      def parsed_online_meeting_uri
+        @parsed_online_meeting_uri ||= URI.parse(online_meeting_service_url) if online_meeting_service_url.present?
+      end
+    end
+  end
+end

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

@@ -11,9 +11,9 @@ module Decidim
       # Public: Initializes the service.
       # component     - A Decidim::Component to get the meetings from.
       # page        - The page number to paginate the results.
-      # per_page    - The number of proposals to return per page.
+      # per_page    - The number of meetings to return per page.
       def initialize(options = {})
-        scope = options.fetch(:scope, Meeting.all)
+        scope = options.fetch(:scope, Meeting.published)
         super(scope, options)
       end
 

data/app/views/decidim/meetings/admin/agenda/_form.html.erb

@@ -65,4 +65,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/meetings/admin/agendas" %>
+<%= javascript_pack_tag "decidim_meetings_admin" %>

data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb

@@ -1,8 +1,8 @@
-<p><%= t("devise.mailer.invitation_instructions.hello", email: @user.name) %></p>
+<p class="email-greeting"><%= t("devise.mailer.invitation_instructions.hello", email: @user.name) %></p>
 
-<p>
+<p class="email-instructions">
   <%= t ".invited_you_to_join_a_meeting", invited_by: @invited_by.name, application: @user.organization.name %>
 </p>
 
-<p><%= link_to t(".decline", meeting_title: present(@meeting).title),routes.decline_invitation_meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
-<p><%= link_to t(".join", meeting_title: present(@meeting).title),routes.meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
+<p class="email-button email-button__cta cta-decline"><%= link_to t(".decline", meeting_title: present(@meeting).title),routes.decline_invitation_meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
+<p class="email-button email-button__cta cta-accept"><%= link_to t(".join", meeting_title: present(@meeting).title),routes.meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>

data/app/views/decidim/meetings/admin/invites/_form.html.erb

@@ -33,4 +33,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/meetings/admin/registrations_invite_form" %>
+<%= javascript_pack_tag "decidim_meetings_admin" %>

data/app/views/decidim/meetings/admin/meeting_closes/_form.html.erb

@@ -21,8 +21,23 @@
         <%= form.number_field :contributions_count, min: 0 %>
       </div>
     </div>
+
+    <% if Decidim::Meetings.enable_proposal_linking %>
+      <div class="row column">
+        <%= proposals_picker(form, :proposals, proposals_picker_meeting_meeting_closes_path(meeting)) %>
+      </div>
+    <% end %>
+
+    <div class="row column">
+      <%= form.text_field :video_url %>
+    </div>
+
+    <div class="row column">
+      <%= form.text_field :audio_url %>
+    </div>
+
     <div class="row column">
-      <%= proposals_picker(form, :proposals, proposals_picker_meeting_meeting_closes_path(meeting)) %>
+      <%= form.check_box :closing_visible %>
     </div>
   </div>
 </div>

data/app/views/decidim/meetings/admin/meeting_copies/_form.html.erb

@@ -46,4 +46,4 @@
 
 <%= render "decidim/meetings/admin/meetings/services", form: form %>
 
-<%= javascript_include_tag "decidim/meetings/admin/meetings_form" %>
+<%= javascript_pack_tag "decidim_meetings_admin" %>

data/app/views/decidim/meetings/admin/meetings/_form.html.erb

@@ -38,6 +38,11 @@
       <p class="help-text"><%= t(".online_meeting_url_help") %></p>
     </div>
 
+    <div class="field" data-meeting-type="online">
+      <%= form.check_box :show_embedded_iframe %>
+      <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+    </div>
+
     <div class="row">
       <div class="columns xlarge-6">
         <%= form.datetime_field :start_time %>
@@ -84,9 +89,19 @@
     <div class="row column" id="transparent">
       <%= form.check_box :transparent %>
     </div>
+
+    <div class="row column">
+      <%= form.check_box :customize_registration_email, :"data-toggle" => "customize_registration_email-div" %>
+    </div>
+
+    <div id="customize_registration_email-div" data-toggler=".hide" class="row column <%= @form.customize_registration_email? ? nil : "hide" %>">
+      <%= form.translated :editor, :registration_email_custom_content, lines: 10 %>
+      <p class="help-text"><%= t(".registration_email_help") %></p>
+    </div>
+
   </div>
 </div>
 
 <%= render "services", form: form, id: tabs_id_for_service(blank_service) %>
 
-<%= javascript_include_tag "decidim/meetings/admin/meetings_form" %>
+<%= javascript_pack_tag "decidim_meetings_admin" %>

data/app/views/decidim/meetings/admin/meetings/index.html.erb

@@ -9,25 +9,44 @@
     </h2>
   </div>
 
+  <%= admin_filter_selector(:meetings) %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
-            <th><%= t("models.meeting.fields.title", scope: "decidim.meetings") %></th>
-            <th><%= t("models.meeting.fields.start_time", scope: "decidim.meetings") %></th>
-            <th><%= t("models.meeting.fields.end_time", scope: "decidim.meetings") %></th>
-            <th><%= t("models.meeting.fields.closed", scope: "decidim.meetings") %></th>
-            <% if Decidim::Map.available?(:static, :geocoding) %>
+            <th>
+              <%= sort_link(query, :id, t("models.meeting.fields.id", scope: "decidim.meetings"), default_order: :desc ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :translated_title, t("models.meeting.fields.title", scope: "decidim.meetings"), default_order: :desc ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :start_time, t("models.meeting.fields.start_time", scope: "decidim.meetings"), default_order: :desc ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :end_time, t("models.meeting.fields.end_time", scope: "decidim.meetings"), default_order: :desc ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :closed, t("models.meeting.fields.closed", scope: "decidim.meetings"), default_order: :desc ) %>
+            </th>
+            <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
               <th><%= t("models.meeting.fields.map", scope: "decidim.meetings") %></th>
             <% end %>
-            <%= th_resource_scope_label %>
+            <% if resource_with_scopes_enabled? %>
+              <th>
+                <%= sort_link(query, :scope_name, t("models.proposal.fields.scope", scope: "decidim.proposals") ) %>
+              </th>
+            <% end %>
             <th class="actions"><%= t("actions.title", scope: "decidim.meetings") %></th>
           </tr>
         </thead>
         <tbody>
           <% meetings.each do |meeting| %>
             <tr data-id="<%= meeting.id %>">
+              <td>
+                <%= meeting.id %><br>
+              </td>
               <td>
                 <%= present(meeting).title %><br>
               </td>
@@ -44,13 +63,23 @@
               <td>
                 <%= humanize_boolean meeting.closed? %>
               </td>
-              <% if Decidim::Map.available?(:static, :geocoding) %>
+              <% if maps_enabled? && Decidim::Map.available?(:static, :geocoding) %>
                 <td>
                   <%= static_map_link(meeting) %>
                 </td>
               <% end %>
               <%= td_resource_scope_for(meeting.scope) %>
               <td class="table-list__actions">
+                <% if allowed_to? :update, :meeting, meeting: meeting %>
+                  <% if meeting.published? %>
+                    <%= icon_link_to "x", unpublish_meeting_path(meeting), t("actions.unpublish", scope: "decidim.admin"), method: :put, class: "action-icon--unpublish", data: { confirm: t("actions.unpublish", scope: "decidim.admin") } %>
+                  <% else %>
+                    <%= icon_link_to "check", publish_meeting_path(meeting), t("actions.publish", scope: "decidim.admin"), method: :put, class: "action-icon--publish" %>
+                  <% end %>
+                <% else %>
+                  <span class="action-space icon"></span>
+                <% end %>
+
                 <%= icon_link_to "eye", resource_locator(meeting).path, t("actions.preview", scope: "decidim.meetings"), class: "action-icon--preview", target: :blank %>
 
                 <% if allowed_to? :copy, :meeting, meeting: meeting %>
@@ -61,7 +90,7 @@
 
                 <% if allowed_to? :update, :meeting, meeting: meeting %>
                   <% if meeting.registration_disabled? %>
-                    <%= icon "people", class: "action-icon action-icon--disabled", role: "img" %>
+                    <%= icon "people", class: "action-icon action-icon--disabled", role: "img", aria_label: t("actions.registrations", scope: "decidim.meetings") %>
                   <% else %>
                     <%= icon_link_to "people", meeting.on_this_platform? ? edit_meeting_registrations_path(meeting) : meeting.registration_url, t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
                   <% end %>
@@ -69,13 +98,12 @@
 
                 <% if allowed_to? :update, :meeting, meeting: meeting %>
                   <%= icon_link_to "pencil", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>
-                  <%= icon_link_to "clock", meeting.minutes.present? ? edit_meeting_minute_path(meeting, meeting.minutes) : new_meeting_minute_path(meeting), t("actions.minutes", scope: "decidim.meetings"), class: "action-icon--minutes" %>
                   <%= icon_link_to "calendar", meeting.agenda.present? ? edit_meeting_agenda_path(meeting, meeting.agenda) : new_meeting_agenda_path(meeting), t("actions.agenda", scope: "decidim.meetings"), class: "action-icon--agenda" %>
+                  <%= icon_link_to "list", edit_meeting_poll_path(meeting), t("actions.manage_poll", scope: "decidim.meetings"), class: "action-icon--manage-poll-questionnaire" %>
                 <% else %>
                   <span class="action-space icon"></span>
                   <span class="action-space icon"></span>
                   <span class="action-space icon"></span>
-                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :close, :meeting, meeting: meeting %>
@@ -128,4 +156,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/meetings/admin/destroy_meeting_alert" %>
+<%= javascript_pack_tag "decidim_meetings_admin" %>