decidim-meetings 0.27.10 → 0.28.0.rc4

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

@@ -0,0 +1,33 @@
+<table class="meeting-calendar__month">
+  <caption><%= month_name %></caption>
+  <thead>
+    <% abbr_day_names.each_with_index do |day, i| %>
+      <th><abbr title="<%= day_names[i] %>"><%= day %></abbr></th>
+    <% end %>
+  </thead>
+  <tbody>
+    <% weeks.each do |days| %>
+      <tr>
+        <% is_first_day = first_day_of_month?(days.first) %>
+
+        <% if is_first_day %>
+          <% (7 - days.length).times do %>
+            <td></td>
+          <% end %>
+        <% end %>
+
+        <% days.each do |day| %>
+          <%= content_tag :td, class: day_class(day) do %>
+            <time datetime="<%= day %>"><%= l(day, format: "%d") %></time>
+          <% end %>
+        <% end %>
+
+        <% if !is_first_day %>
+          <% (7 - days.length).times do %>
+            <td></td>
+          <% end %>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class MeetingMonthCell < Decidim::ViewModel
+      alias meetings model
+
+      delegate :month, to: :start_date
+
+      def show
+        render if meetings_in_this_month?
+      end
+
+      def meetings_in_this_month?
+        meetings.collect(&:start_time).map { |date| date.strftime("%m").to_i }.any? month
+      end
+
+      def month_days
+        start_date.to_date.all_month
+      end
+
+      def weeks
+        month_days.group_by do |day|
+          (1 - first_week_date_rotation).days.since(day).cweek
+        end.values
+      end
+
+      def month_name
+        @month_name ||= I18n.t("date.month_names")[month]
+      end
+
+      def abbr_day_names
+        @abbr_day_names ||= I18n.t("date.abbr_day_names").rotate(first_week_date_rotation)
+      end
+
+      def day_names
+        @day_names ||= I18n.t("date.day_names").rotate(first_week_date_rotation)
+      end
+
+      def first_day_of_month?(date)
+        date.day == 1
+      end
+
+      def day_class(date)
+        return "is-today" if date == Date.current
+        return if events.exclude?(date)
+
+        "is-#{date < Date.current ? "past" : "upcoming"}-event"
+      end
+
+      def beginning_of_week
+        @beginning_of_week ||= options[:beginning_of_week] || Date.beginning_of_week
+      end
+
+      def start_date
+        options[:start_date] || first_meeting.start_time
+      end
+
+      def events
+        options[:events] || meetings.select { |meeting| meeting.start_time.month == month }.map { |meeting| meeting.start_time.to_date }
+      end
+
+      def first_meeting
+        @first_meeting ||= meetings.first
+      end
+
+      def first_week_date_rotation
+        @first_week_date_rotation ||= Date::DAYS_INTO_WEEK[beginning_of_week.to_sym].to_i
+      end
+    end
+  end
+end

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

@@ -2,45 +2,13 @@
 
 module Decidim
   module Meetings
-    # This cell renders the Small (:s) meeting card
-    # for an given instance of a Meeting
-    class MeetingSCell < MeetingMCell
-      def meeting_path
-        resource_locator(model).path
-      end
-
-      def participatory_space_class_name
-        model.component.participatory_space.class.model_name.human
-      end
-
-      def participatory_space_title
-        decidim_escape_translated model.component.participatory_space.title
-      end
-
-      def participatory_space_path
-        resource_locator(model.component.participatory_space).path
-      end
-
+    # This cell renders the Search (:s) meeting card
+    # for a given instance of a Meeting
+    class MeetingSCell < Decidim::CardSCell
       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)
+      def metadata_cell
+        "decidim/meetings/meeting_card_metadata"
       end
     end
   end

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

@@ -1,31 +1,16 @@
 <%= dynamic_map_for meetings_data_for_map(geocoded_meetings) do %>
   <template id="marker-popup">
-    <div class="map-info__content">
-      <h3>${title}</h3>
-      <div id="bodyContent">
-        <p>{{html description}}</p>
-        <div class="map__date-address">
-          <div class="card__datetime">
-            <div class="card__datetime__date">
-              ${startTimeDay} <span class="card__datetime__month">${startTimeMonth} ${startTimeYear}</span>
-            </div>
-            <div class="card__datetime__time">${starTime}</div>
+    <div class="space-y-6">
+      <a href="${link}" class="card__list">
+        <div class="card__list-content">
+          <h3 class="h4 card__list-title">${title}</h3>
+          <div class="card__list-metadata">
+            {{each JSON.parse(items)}}
+              <span>{{html icon}}${text}</span>
+            {{/each}}
           </div>
-          <div class="address card__extra">
-            <div class="address__icon">{{html icon}}</div>
-            <div class="address__details">
-              <strong>{{html location}}</strong><br>
-              <span>${address}</span><br>
-              <span>{{html locationHints}}</span>
-            </div>
-          </div>
-        </div>
-        <div class="map-info__button">
-          <a href="${link}" class="button button--sc">
-            <%= t("decidim.meetings.meetings_map.view_meeting") %>
-          </a>
         </div>
-      </div>
+      </a>
     </div>
   </template>
 <% end.html_safe %>

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

@@ -2,7 +2,7 @@
 
 module Decidim
   module Meetings
-    class MeetingsMapCell < MeetingMCell
+    class MeetingsMapCell < MeetingLCell
       include Decidim::MapHelper
       include Decidim::Meetings::MapHelper
 

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

@@ -11,6 +11,7 @@ module Decidim
         return if model.iframe_embed_type_none?
         return unless model.iframe_access_level_allowed_for_user?(current_user)
         return unless assembly_privacy_allowed?
+        return unless live? || future?
 
         render
       end

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

@@ -1,44 +1,21 @@
-<% 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 %>
+<div class="meeting__online">
+  <%= icon "broadcast-line", class: "w-14 h-14 fill-current #{live? && online_meeting_url? ? "text-tertiary" : "text-gray"}" %>
 
-        <% 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 %>
+  <% if !online_meeting_url? %>
+    <p><%= t("link_available_soon", scope: "decidim.meetings.meetings.show") %></p>
+  <% elsif future? %>
+    <p><%= t("link_closed", scope: "decidim.meetings.meetings.show") %></p>
+  <% elsif live? %>
+    <p class="h3"><%= t("live_event", scope: "decidim.meetings.meetings.show") %></p>
+
+    <% if show_embed? %>
+      <div class="hidden md:block h-[60vh] w-full">
+        <%== embed_code(request.host) %>
       </div>
-    </div>
+    <% else %>
+      <p><%= t("micro_camera_permissions_warning", scope: "decidim.meetings.meetings.show") %></p>
+    <% end %>
+
+     <%= link_to t("join_meeting", scope: "decidim.meetings.meetings.meeting"), live_event_url, target: "_blank", class: "button button__xl button__secondary", data: { "external-link": false } %>
   <% 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 %>
+</div>

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

@@ -1,16 +1,5 @@
-<div id="list-of-public-participants" class="section">
-  <div class="row">
-    <div class="columns large-12">
-      <h4 class="section-heading"><%= t("attending_participants", scope: "decidim.meetings.public_participants_list") %></h4>
-    </div>
-    <div class="columns large-12">
-      <%= cell(
-        "decidim/collapsible_list",
-        public_participants,
-        cell_name: "decidim/author",
-        cell_options: { extra_classes: ["author-data--small"] },
-        hidden_elements_count_i18n_key: "decidim.meetings.public_participants_list.hidden_participants_count"
-      ) %>
-    </div>
-  </div>
+<div id="list-of-public-participants" class="meeting__grid">
+  <% public_participants.each do |participant| %>
+    <%= cell "decidim/author", participant %>
+  <% end %>
 </div>

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

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -73,7 +73,7 @@ module Decidim
         def create_services!
           form.services_to_persist.each do |service|
             Decidim::Meetings::Service.create!(
-              meeting: meeting,
+              meeting:,
               "title" => service.title,
               "description" => service.description
             )

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

@@ -20,7 +20,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call
@@ -37,7 +37,7 @@ module Decidim
 
         def already_invited?
           return false unless user.persisted?
-          return false unless meeting.invites.exists?(user: user)
+          return false unless meeting.invites.exists?(user:)
 
           form.errors.add(:email, :already_invited)
           true
@@ -58,8 +58,8 @@ module Decidim
             Invite,
             invited_by,
             {
-              user: user,
-              meeting: meeting,
+              user:,
+              meeting:,
               sent_at: Time.current
             },
             log_info
@@ -98,7 +98,7 @@ module Decidim
 
         def invite_user_to_sign_up
           user.skip_reconfirmation!
-          user.invite!(invited_by, invitation_instructions: "join_meeting", meeting: meeting)
+          user.invite!(invited_by, invitation_instructions: "join_meeting", meeting:)
         end
       end
     end

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

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -18,7 +18,7 @@ module Decidim
         # Executes the command. Broadcasts these events:
         #
         # - :ok when everything is valid.
-        # - :invalid if the form wasn't valid and we couldn't proceed.
+        # - :invalid if the form was not valid and we could not proceed.
         #
         # Returns nothing.
         def call

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

@@ -15,13 +15,14 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        transaction do
+        with_events(with_transaction: true) do
           create_meeting!
-          schedule_upcoming_meeting_notification
-          send_notification
         end
 
         create_follow_form_resource(form.current_user)
+        schedule_upcoming_meeting_notification
+        send_notification
+
         broadcast(:ok, meeting)
       end
 
@@ -29,6 +30,16 @@ module Decidim
 
       attr_reader :meeting, :form
 
+      def event_arguments
+        {
+          resource: meeting,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       def create_meeting!
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
         parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite

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

@@ -38,7 +38,7 @@ module Decidim
       end
 
       def invitation
-        @invitation ||= meeting.invites.find_by(user: user)
+        @invitation ||= meeting.invites.find_by(user:)
       end
     end
   end

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

@@ -42,7 +42,7 @@ module Decidim
       attr_reader :meeting, :user, :user_group, :registration, :registration_form
 
       def accept_invitation
-        meeting.invites.find_by(user: user)&.accept!
+        meeting.invites.find_by(user:)&.accept!
       end
 
       def answer_questionnaire
@@ -61,9 +61,9 @@ module Decidim
 
       def create_registration
         @registration = Decidim::Meetings::Registration.create!(
-          meeting: meeting,
-          user: user,
-          user_group: user_group,
+          meeting:,
+          user:,
+          user_group:,
           public_participation: registration_form.public_participation
         )
       end
@@ -107,7 +107,7 @@ module Decidim
           resource: @meeting,
           affected_users: participatory_space_admins,
           extra: {
-            percentage: percentage
+            percentage:
           }
         )
       end

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

@@ -22,12 +22,12 @@ module Decidim
       def call
         return broadcast(:invalid) if form.invalid?
 
-        transaction do
+        with_events(with_transaction: true) do
           update_meeting!
-          send_notification if should_notify_followers?
-          schedule_upcoming_meeting_notification if start_time_changed?
         end
 
+        send_notification if should_notify_followers?
+        schedule_upcoming_meeting_notification if start_time_changed?
         broadcast(:ok, meeting)
       end
 
@@ -35,6 +35,16 @@ module Decidim
 
       attr_reader :form, :current_user, :meeting
 
+      def event_arguments
+        {
+          resource: meeting,
+          extra: {
+            event_author: form.current_user,
+            locale:
+          }
+        }
+      end
+
       def update_meeting!
         parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
         parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite

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

@@ -18,11 +18,11 @@ module Decidim
             with_any_date: "upcoming",
             activity: "all",
             with_availability: "",
-            with_any_scope: default_filter_scope_params,
-            with_any_category: default_filter_category_params,
+            with_any_scope: nil,
+            with_any_category: nil,
             with_any_state: nil,
-            with_any_origin: default_filter_origin_params,
-            with_any_type: default_filter_type_params
+            with_any_origin: nil,
+            with_any_type: nil
           }
         end
       end

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

@@ -9,15 +9,15 @@ module Decidim
         helper_method :meeting, :agenda, :blank_agenda_item, :blank_agenda_item_child
 
         def new
-          enforce_permission_to :create, :agenda, meeting: meeting
+          enforce_permission_to(:create, :agenda, meeting:)
 
           @form = form(MeetingAgendaForm).instance
         end
 
         def create
-          enforce_permission_to :create, :agenda, meeting: meeting
+          enforce_permission_to(:create, :agenda, meeting:)
 
-          @form = form(MeetingAgendaForm).from_params(params, meeting: meeting)
+          @form = form(MeetingAgendaForm).from_params(params, meeting:)
 
           CreateAgenda.call(@form, meeting) do
             on(:ok) do
@@ -33,15 +33,15 @@ module Decidim
         end
 
         def edit
-          enforce_permission_to :update, :agenda, agenda: agenda, meeting: meeting
+          enforce_permission_to(:update, :agenda, agenda:, meeting:)
 
           @form = form(MeetingAgendaForm).from_model(agenda)
         end
 
         def update
-          enforce_permission_to :update, :agenda, agenda: agenda, meeting: meeting
+          enforce_permission_to(:update, :agenda, agenda:, meeting:)
 
-          @form = form(MeetingAgendaForm).from_params(params, meeting: meeting)
+          @form = form(MeetingAgendaForm).from_params(params, meeting:)
 
           UpdateAgenda.call(@form, agenda) do
             on(:ok) do

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

@@ -9,7 +9,7 @@ module Decidim
         helper_method :invites
 
         def index
-          enforce_permission_to :read_invites, :meeting, meeting: meeting
+          enforce_permission_to(:read_invites, :meeting, meeting:)
 
           @query = params[:q]
           @status = params[:status]
@@ -18,7 +18,7 @@ module Decidim
         end
 
         def create
-          enforce_permission_to :invite_attendee, :meeting, meeting: meeting
+          enforce_permission_to(:invite_attendee, :meeting, meeting:)
 
           @form = form(MeetingRegistrationInviteForm).from_params(params)
 
@@ -42,7 +42,7 @@ module Decidim
         end
 
         def invites
-          @invites ||= Decidim::Meetings::Admin::Invites.for(meeting.invites, @query, @status).page(params[:page]).per(15)
+          @invites ||= Decidim::Admin::Invites.for(meeting.invites, @query, @status).page(params[:page]).per(15)
         end
       end
     end

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

@@ -5,18 +5,16 @@ module Decidim
     module Admin
       # This controller allows an admin to manage meetings from a Participatory Process
       class MeetingClosesController < Admin::ApplicationController
-        include Decidim::Proposals::Admin::Picker if Decidim::Meetings.enable_proposal_linking
-
         helper_method :meeting
 
         def edit
-          enforce_permission_to :close, :meeting, meeting: meeting
+          enforce_permission_to(:close, :meeting, meeting:)
 
           @form = form(Admin::CloseMeetingForm).from_model(meeting)
         end
 
         def update
-          enforce_permission_to :close, :meeting, meeting: meeting
+          enforce_permission_to(:close, :meeting, meeting:)
 
           @form = form(Admin::CloseMeetingForm).from_params(params.merge(proposals: meeting.sibling_scope(:proposals)))
 

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

@@ -9,15 +9,15 @@ module Decidim
         helper_method :meeting, :blank_service
 
         def new
-          enforce_permission_to :copy, :meeting, meeting: meeting
+          enforce_permission_to(:copy, :meeting, meeting:)
 
           @form = form(MeetingForm).from_model(meeting)
         end
 
         def create
-          enforce_permission_to :copy, :meeting, meeting: meeting
+          enforce_permission_to(:copy, :meeting, meeting:)
 
-          @form = form(MeetingForm).from_params(params, current_component: current_component)
+          @form = form(MeetingForm).from_params(params, current_component:)
 
           CopyMeeting.call(@form, meeting) do
             on(:ok) do