decidim-meetings 0.23.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dbf4ab48a65ce688b8060ae56a5785f2b13ce7c190c7a6c1ad6e8ae7824525c
-  data.tar.gz: aa38ade9d4cfe51a106cd7dedc0fa1e4a02036418a0b2779adeaa74c4532d089
+  metadata.gz: 678fc1eb355bb55e7c698fea60f3a8cdf1d126a393726a0666227ae8c39f1282
+  data.tar.gz: 63ecfe73be4ed3a68d3ad4e9534701d6b2ede93bf5c00dd7220cf6bc99646e1d
 SHA512:
-  metadata.gz: '0102305447283a83d06b46cb722a7f43815514856a63c4e34110218803292908737f7cc2bcb08ea04c44e05e01c8c718313da0626a4feef0c46d89a965d7e7bb'
-  data.tar.gz: 78a3a5d3f1dcd648cec44de5757cb876261b695640b8e051d376363c367adab0b0af321c4f61600f48d1257f7f89d119f17de67a054c48b936efe33865b03bb1
+  metadata.gz: b53a44fb38b7829820ca5fa0fc48dda11522bb63faef1630ad9888241f6e56d40760f5a98bab8de30f81a3b86ffc2a22a220075299e293b1276dea2349f40422
+  data.tar.gz: 4adba9e32309bdb3f9ca5a59e116d28aa28c3b651852a8f2d22bf07e58ed72f443d305aa2eff3a0c016e1a919ddf306ad9ce194a8e9863ddcb3fbd514d9881c8

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

@@ -0,0 +1,16 @@
+<div class="row">
+  <div class="column medium-6">
+    <% elements.first(4).each do |element| %>
+      <%= card_for element, size: :highlighted_list_item %>
+    <% end %>
+  </div>
+  <div class="columns medium-6">
+    <% if geolocation_enabled? %>
+      <%= cell "decidim/meetings/meetings_map", elements %>
+    <% else %>
+      <% elements.offset(4).first(4).each do |element| %>
+        <%= card_for element, size: :highlighted_list_item %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1 @@
+<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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module ContentBlocks
+      class HighlightedMeetingsCell < Decidim::ContentBlocks::HighlightedElementsCell
+        def base_relation
+          Decidim::Meetings::Meeting
+            .except_withdrawn
+            .published
+            .not_hidden
+            .upcoming
+            .visible_for(current_user)
+            .where(component: published_components)
+        end
+
+        def elements
+          @elements ||= base_relation.order(start_time: :asc).limit(limit)
+        end
+
+        def geolocation_enabled?
+          Decidim::Map.available?(:geocoding)
+        end
+
+        private
+
+        def limit
+          geolocation_enabled? ? 4 : 8
+        end
+      end
+    end
+  end
+end

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 id="upcoming_meetings" 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,26 @@
 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(:author, component: :participatory_space)
+                                 .where(component: meeting_components)
+                                 .visible_for(current_user)
+                                 .published
+                                 .where("end_time >= ?", Time.current)
+                                 .except_withdrawn
+                                 .not_hidden
+                                 .order(start_time: :asc)
+                                 .limit(limit)
         end
 
         def geolocation_enabled?

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

@@ -1,7 +1,8 @@
 <% if upcoming_meetings.any? %>
   <div class="section row collapse upcoming_meetings">
     <h3 class="section-heading">
-      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.upcoming_meetings") %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count) %></a>
+      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.upcoming_meetings") %>
+      <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: upcoming_meetings_count) %></a>
     </h3>
     <div class="card card--list">
       <% upcoming_meetings.includes(:component).each do |meeting| %>
@@ -9,7 +10,7 @@
       <% end %>
     </div>
     <%= link_to(
-      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count),
+      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: upcoming_meetings_count),
       main_component_path(model),
       class: "button button--sc hollow button--right"
     ) %>
@@ -17,7 +18,7 @@
 <% elsif past_meetings.any? %>
   <div class="section row collapse past_meetings">
     <h3 class="section-heading">
-      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.past_meetings") %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count) %></a>
+      <%= translated_attribute(model.name) %> - <%= t("decidim.participatory_spaces.highlighted_meetings.past_meetings") %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_meetings.see_all", count: past_meetings_count) %></a>
     </h3>
     <div class="card card--list">
       <% past_meetings.each do |meeting| %>
@@ -25,7 +26,7 @@
       <% end %>
     </div>
     <%= link_to(
-      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: meetings_count),
+      t("decidim.participatory_spaces.highlighted_meetings.see_all", count: past_meetings_count),
       main_component_path(model),
       class: "button button--sc hollow button--right"
     ) %>

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

@@ -18,7 +18,11 @@ 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
+                                                .published
+                                                .not_hidden
+                                                .visible_for(current_user)
       end
 
       def past_meetings
@@ -32,6 +36,23 @@ module Decidim
       def meetings_count
         @meetings_count ||= meetings.count
       end
+
+      def past_meetings_count
+        @past_meetings_count ||= meetings.past.count
+      end
+
+      def upcoming_meetings_count
+        @upcoming_meetings_count ||= meetings.upcoming.count
+      end
+
+      def cache_hash
+        hash = []
+        hash << "decidim/meetings/highlighted_meetings_for_component"
+        hash << meetings.cache_key_with_version
+        hash.push(current_user.try(:id))
+        hash << I18n.locale.to_s
+        hash.join(Decidim.cache_key_separator)
+      end
     end
   end
 end

data/app/cells/decidim/meetings/join_meeting_button/registration_confirm.erb

@@ -6,6 +6,12 @@
       </div>
     </div>
 
+    <div class="row">
+      <div class="columns medium-10 medium-offset-1">
+        <%= cell("decidim/public_participation", form) %>
+      </div>
+    </div>
+
     <div class="row">
       <div class="columns medium-10 medium-offset-1 help-text">
         <%= registration_terms_text %>

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

@@ -1,16 +1,18 @@
 <% if model.can_be_joined_by?(current_user) %>
   <% if model.has_registration_for? current_user %>
+    <span>
+      <%= icon("check", class: "icon--small") %>
+      <%= t("going", scope: "decidim.meetings.meetings.show") %>
+    </span>
     <%= action_authorized_button_to(
       :join,
+      t("leave", scope: "decidim.meetings.meetings.show"),
       meeting_registration_path(model),
       resource: model,
       method: :delete,
-      class: "#{button_classes} active",
-      data: { disable: true }
-    ) do %>
-      <%= icon("check", class: "icon--small") %>
-      <%= t("going", scope: "decidim.meetings.meetings.show") %>
-    <% end %>
+      class: button_classes,
+      data: { disable: true, confirm: t("leave_confirmation", scope: "decidim.meetings.meetings.show") }
+    ) %>
   <% else %>
     <% if model.registration_form_enabled? %>
       <%= action_authorized_link_to(
@@ -35,4 +37,11 @@
   <% if shows_remaining_slots? %>
     <span><%= t("remaining_slots", scope: "decidim.meetings.meetings.show", count: model.remaining_slots) %></span>
   <% end %>
+<% elsif model.on_different_platform? %>
+  <%= action_authorized_link_to(
+    :join,
+    i18n_join_text,
+    model.registration_url,
+    class: button_classes
+  ) %>
 <% end %>

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_activity_cell.rb

@@ -2,13 +2,21 @@
 
 module Decidim
   module Meetings
-    # A cell to display when a meeting has been created.
+    # A cell to display when actions happen on a meeting.
     class MeetingActivityCell < ActivityCell
       def title
-        I18n.t(
-          "decidim.meetings.last_activity.new_meeting_at_html",
-          link: participatory_space_link
-        )
+        case action
+        when "update"
+          I18n.t(
+            "decidim.meetings.last_activity.meeting_updated_at_html",
+            link: participatory_space_link
+          )
+        else
+          I18n.t(
+            "decidim.meetings.last_activity.new_meeting_at_html",
+            link: participatory_space_link
+          )
+        end
       end
 
       def resource_link_text

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

@@ -18,6 +18,8 @@ module Decidim
 
       def card_size
         case @options[:size]
+        when :highlighted_list_item
+          "decidim/meetings/meeting_highlighted_list_item"
         when :list_item
           "decidim/meetings/meeting_list_item"
         when :s
@@ -27,10 +29,6 @@ module Decidim
         end
       end
 
-      def title
-        present(model).title
-      end
-
       def resource_icon
         icon "meetings", remove_icon_class: true, width: 40, height: 70
       end

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

@@ -0,0 +1,21 @@
+<article class="card">
+  <div class="card__content">
+    <div class="card__header">
+      <%= link_to meeting_path, class: "card__link" do %>
+        <h5 class="card__title">
+          <%= title %>
+        </h5>
+      <% end %>
+    </div>
+    <div class="row">
+      <time datetime="<%= l(model.start_time, format: :long_dashed) %>" class="column medium-4 text-muted">
+        <%= icon "datetime", class: "mr-xs", role: "img", "aria-hidden": true %>
+        <%= l start_date, format: :decidim_with_month_name %>
+      </time>
+      <div class="column medium-8 text-muted">
+        <%= participatory_space_class_name %>
+        <%= link_to participatory_space_title, participatory_space_path %>
+      </div>
+    </div>
+  </div>
+</article>

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders the Highlighted List Item Card (:highlighted_list_item)
+    # meeting card for an instance of a Meeting. This card is used in the
+    # content block of Highlighted Meetings and is based on :s size card
+    class MeetingHighlightedListItemCell < MeetingSCell; end
+  end
+end

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

@@ -13,8 +13,18 @@ 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)
+        resource_locator(model).path
       end
 
       def title

data/app/cells/decidim/meetings/meeting_m/address.erb

@@ -1 +1,5 @@
-<%= cell "decidim/address", model %>
+<% if online_meeting? %>
+  <%= cell "decidim/meetings/meeting_url", model %>
+<% else %>
+  <%= cell "decidim/address", model %>
+<% end %>

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

@@ -27,8 +27,58 @@ module Decidim
         present(model).title
       end
 
+      def description
+        present(model).description(strip_tags: true).truncate(120, separator: /\s/)
+      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
@@ -62,6 +112,10 @@ module Decidim
       def show_footer_actions?
         options[:show_footer_actions]
       end
+
+      def statuses
+        [:follow, :comments_count]
+      end
     end
   end
 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/meeting_url/show.erb

@@ -0,0 +1,20 @@
+<div class="card__icondata">
+  <ul class="card-data">
+    <li class="card-data__item">
+      <%= resource_icon %>
+    </li>
+    <li class="card-data__item">
+      <div class="text-left">
+        <div class="card__icondata--address">
+          <% if future? %>
+            <span><%= t("link_available_soon", scope: "decidim.meetings.meetings.show") %></span>
+          <% elsif live? %>
+            <span><%= link_to(t("join", scope: "decidim.meetings.meetings.show"), live_event_url, target: "_blank") %></span><br>
+          <% else %>
+            <span><%= link_to(t("visit_finished", scope: "decidim.meetings.meetings.show"), live_event_url, target: "_blank") %></span><br>
+          <% end %>
+        </div>
+      </div>
+    </li>
+  </ul>
+</div>

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders the URL address of an online meeting.
+    class MeetingUrlCell < Decidim::Meetings::OnlineMeetingCell
+      include Cell::ViewModel::Partial
+      include LayoutHelper
+
+      private
+
+      def resource_icon
+        icon icon_name, class: "icon--big", role: "img", "aria-hidden": true
+      end
+
+      def icon_name
+        if has_meeting_url?
+          "video"
+        else
+          "timer"
+        end
+      end
+
+      def has_meeting_url?
+        @has_meeting_url ||= model.online_meeting_url.present?
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@
       <h3>${title}</h3>
       <div id="bodyContent">
         <p>{{html description}}</p>
-        <div class="map__date-adress">
+        <div class="map__date-address">
           <div class="card__datetime">
             <div class="card__datetime__date">
               ${startTimeDay} <span class="card__datetime__month">${startTimeMonth} ${startTimeYear}</span>

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

@@ -15,12 +15,18 @@ module Decidim
       end
 
       def geocoded_meetings
-        @geocoded_meetings ||= meetings.select(&:geocoded?)
+        @geocoded_meetings ||= meetings.select(&:geocoded_and_valid?)
       end
 
       def meetings
         model
       end
+
+      private
+
+      def cache_hash
+        nil
+      end
     end
   end
 end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # 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
+        @embedder ||= MeetingIframeEmbedder.new(model.online_meeting_url)
+      end
+
+      delegate :embeddable?, to: :embedder
+
+      def live_event_url
+        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 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

@@ -0,0 +1,44 @@
+<% if online_meeting_url? %>
+  <% if live? || future? %>
+    <div class="card card--secondary">
+      <div class="card__content text-center">
+        <% if live? %>
+          <div class="heading1 text-primary">
+            <%= icon "audio", class: "heading4" %>
+          </div>
+          <div>
+            <strong class="heading5"><%= t("live_event", scope: "decidim.meetings.meetings.show") %></strong>
+            <% unless show_embed? %>
+              <p><small><%= t("micro_camera_permissions_warning", scope: "decidim.meetings.meetings.show") %></small></p>
+            <% end %>
+          </div>
+        <% end %>
+
+        <% if show_embed? && live? %>
+          <div class="<%= "margin-top-3" if live? %> absolutes aspect-ratio-16-9">
+            <%== embed_code(request.host) %>
+          </div>
+        <% elsif live? || future? %>
+          <div class="absolutes">
+            <% if live? %>
+              <%= link_to t("join", scope: "decidim.meetings.meetings.show"), live_event_url, target: "_blank", class: "button button--sc" %>
+            <% elsif future? %>
+              <span><%= t("link_closed", scope: "decidim.meetings.meetings.show") %></span>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  <% end %>
+<% else %>
+  <div class="card card--secondary">
+    <div class="card__content address">
+      <div class="address__info">
+        <%= icon "timer", role: "img", "aria-hidden": true, remove_icon_class: true, width: 40, height: 70 %>
+        <div class="address__details">
+          <span><%= t("link_available_soon", scope: "decidim.meetings.meetings.show") %></span>
+        </div>
+      </div>
+    </div>
+  </div>
+<% end %>