From fab405a70851ae40c8aba361f9309fa69c62f81f Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Fri, 14 Feb 2025 12:23:48 +0100
Subject: [PATCH 01/14] add Waitlist enabled option

---
 .../app/cells/decidim/meetings/join_meeting_button_cell.rb | 6 ++++++
 .../decidim/meetings/admin/update_registrations.rb         | 1 +
 .../decidim/meetings/admin/meeting_registrations_form.rb   | 2 ++
 .../decidim/meetings/admin/registrations/_form.html.erb    | 4 ++++
 decidim-meetings/config/locales/en.yml                     | 3 +++
 ...50214110525_add_waitlist_enabled_to_decidim_meetings.rb | 7 +++++++
 6 files changed, 23 insertions(+)
 create mode 100644 decidim-meetings/db/migrate/20250214110525_add_waitlist_enabled_to_decidim_meetings.rb

diff --git a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
index afc05a17d6da1..06758018c0264 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
@@ -34,6 +34,12 @@ def i18n_join_text
         I18n.t("no_slots_available", scope: "decidim.meetings.meetings.show")
       end
 
+      def i18n_waiting_list_text
+        return if model.has_available_slots?
+
+        I18n.t("waiting_list", scope: "decidim.meetings.meetings.show")
+      end
+
       def i18n_confirm_text
         I18n.t("confirm", scope: "decidim.meetings.meetings.registration_confirm")
       end
diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/update_registrations.rb b/decidim-meetings/app/commands/decidim/meetings/admin/update_registrations.rb
index ddd899a55fcc6..fd634340b894b 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/update_registrations.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/update_registrations.rb
@@ -27,6 +27,7 @@ def attributes
               available_slots: form.available_slots,
               reserved_slots: form.reserved_slots,
               registration_terms: form.registration_terms,
+              waitlist_enabled: form.waitlist_enabled,
               customize_registration_email: form.customize_registration_email
             }
             extra_params.merge!(registration_email_custom_content: form.registration_email_custom_content) if form.customize_registration_email
diff --git a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registrations_form.rb b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registrations_form.rb
index d3c1acf2bf7c5..8281cba0fb505 100644
--- a/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registrations_form.rb
+++ b/decidim-meetings/app/forms/decidim/meetings/admin/meeting_registrations_form.rb
@@ -14,6 +14,7 @@ class MeetingRegistrationsForm < Decidim::Form
         attribute :customize_registration_email, Boolean
         attribute :available_slots, Integer
         attribute :reserved_slots, Integer
+        attribute :waitlist_enabled, :boolean, default: false
 
         translatable_attribute :registration_terms, Decidim::Attributes::RichText
         translatable_attribute :registration_email_custom_content, Decidim::Attributes::RichText
@@ -22,6 +23,7 @@ class MeetingRegistrationsForm < Decidim::Form
         validates :available_slots, :reserved_slots, presence: true, if: ->(form) { form.registrations_enabled? }
         validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, if: ->(form) { form.registrations_enabled? && form.available_slots.present? }
         validates :reserved_slots, numericality: { greater_than_or_equal_to: 0 }, if: ->(form) { form.registrations_enabled? }
+        validates :waitlist_enabled, inclusion: { in: [true, false] }
         validates :reserved_slots, numericality: { less_than_or_equal_to: :available_slots }, if: lambda { |form|
                                                                                                     form.registrations_enabled? &&
                                                                                                       form.reserved_slots.present? &&
diff --git a/decidim-meetings/app/views/decidim/meetings/admin/registrations/_form.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/registrations/_form.html.erb
index 85ea38a092432..482ac563885fe 100644
--- a/decidim-meetings/app/views/decidim/meetings/admin/registrations/_form.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/admin/registrations/_form.html.erb
@@ -18,6 +18,10 @@
         <%= form.number_field :reserved_slots, help_text: t(".reserved_slots_help") %>
       </div>
 
+      <div class="row column">
+        <%= form.check_box :waitlist_enabled, help_text: t(".waitlist_enabled_help") %>
+      </div>
+
       <div class="row column">
         <%= form.check_box :customize_registration_email %>
       </div>
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 1b6e07e1f396f..93ac0a0d4b8a2 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -431,6 +431,8 @@ en:
             reserved_slots_help: Leave it to 0 if you do not have reserved slots.
             reserved_slots_less_than: Must be less than or equal to %{count}
             title: Registrations
+            waitlist_enabled: Waitlist enabled
+            waitlist_enabled_help: If enabled, the user will be able to join the waitlist when the available slots are full.
           update:
             invalid: There was a problem saving the registration settings.
             success: Meeting registrations settings successfully saved.
@@ -592,6 +594,7 @@ en:
           cancel: Cancel
           confirm: Confirm
         show:
+          add_to_waitlist: Add to waitlist
           attendees: Attendees count
           contributions: Contributions count
           join: Register
diff --git a/decidim-meetings/db/migrate/20250214110525_add_waitlist_enabled_to_decidim_meetings.rb b/decidim-meetings/db/migrate/20250214110525_add_waitlist_enabled_to_decidim_meetings.rb
new file mode 100644
index 0000000000000..c0707d4366d61
--- /dev/null
+++ b/decidim-meetings/db/migrate/20250214110525_add_waitlist_enabled_to_decidim_meetings.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddWaitlistEnabledToDecidimMeetings < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_meetings_meetings, :waitlist_enabled, :boolean, default: false, null: false
+  end
+end

From 988a91a712207819808fa49daff8d8990a42ad4b Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Tue, 18 Feb 2025 10:58:08 +0100
Subject: [PATCH 02/14] add cell, migrations

---
 .../meetings/join_meeting_button_cell.rb      |  6 --
 .../meetings/join_waitlist_button/show.erb    | 22 +++++++
 .../meetings/join_waitlist_button_cell.rb     | 41 +++++++++++++
 .../decidim/meetings/join_waitlist.rb         | 57 +++++++++++++++++++
 .../meetings/registrations_controller.rb      | 18 ++++++
 .../models/decidim/meetings/registration.rb   |  4 ++
 .../meetings/meetings/_meeting_aside.html.erb |  6 ++
 ...tions_to_decidim_meetings_registrations.rb |  8 +++
 .../lib/decidim/meetings/engine.rb            |  1 +
 9 files changed, 157 insertions(+), 6 deletions(-)
 create mode 100644 decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb
 create mode 100644 decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
 create mode 100644 decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb
 create mode 100644 decidim-meetings/db/migrate/20250214113208_add_status_to_registrations_to_decidim_meetings_registrations.rb

diff --git a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
index 06758018c0264..afc05a17d6da1 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
@@ -34,12 +34,6 @@ def i18n_join_text
         I18n.t("no_slots_available", scope: "decidim.meetings.meetings.show")
       end
 
-      def i18n_waiting_list_text
-        return if model.has_available_slots?
-
-        I18n.t("waiting_list", scope: "decidim.meetings.meetings.show")
-      end
-
       def i18n_confirm_text
         I18n.t("confirm", scope: "decidim.meetings.meetings.registration_confirm")
       end
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb
new file mode 100644
index 0000000000000..945ef8c5181d5
--- /dev/null
+++ b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb
@@ -0,0 +1,22 @@
+<% if model.registration_form_enabled? %>
+  <%= action_authorized_link_to(
+        :join_waitlist,
+        join_waitlist_meeting_registration_path(model),
+        class: button_classes
+      ) do %>
+    <%= icon(icon_name) %>
+    <%= i18n_join_waitlist_text %>
+  <% end %>
+<% else %>
+  <% unless options[:hide_modal] %>
+    <%= render :registration_modal %>
+  <% end %>
+  <%= action_authorized_button_to(
+        :join_waitlist,
+        content_tag(:span, "#{icon(icon_name)} #{i18n_join_waitlist_text}".html_safe),
+        "#",
+        class: button_classes,
+        data: { "dialog-open": current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" },
+        resource: model
+      ) %>
+<% end %>
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
new file mode 100644
index 0000000000000..1174b04b77e50
--- /dev/null
+++ b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This cell renders the button to join a waitlist.
+    class JoinWaitlistButtonCell < Decidim::ViewModel
+      include MeetingCellsHelper
+
+      def show
+        return unless model.waitlist_enabled? && !model.has_available_slots? && model.can_be_joined_by?(current_user)
+        return if model.has_registration_for?(current_user)
+
+        render
+      end
+
+      private
+
+      def current_component
+        model.component
+      end
+
+      def button_classes
+        "button button__sm button__transparent-secondary w-full"
+      end
+
+      def i18n_join_waitlist_text
+        return if !model.waitlist_enabled? && model.has_available_slots?
+
+        I18n.t("add_to_waitlist", scope: "decidim.meetings.meetings.show")
+      end
+
+      def icon_name
+        "list-ordered"
+      end
+
+      def registration_form
+        @registration_form ||= Decidim::Meetings::JoinMeetingForm.new
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb b/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb
new file mode 100644
index 0000000000000..ea1a18673bef5
--- /dev/null
+++ b/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This command is executed when the user joins a meeting waitlist.
+    class JoinWaitlist < Decidim::Command
+      delegate :current_user, to: :form
+
+      def initialize(meeting, form)
+        @meeting = meeting
+        @user_group = Decidim::UserGroup.find_by(id: form.user_group_id)
+        @form = form
+      end
+
+      def call
+        return broadcast(:invalid) unless can_join_waitlist?
+        return broadcast(:invalid_form) unless form.valid?
+
+        meeting.with_lock do
+          create_waitlist_entry
+          send_waitlist_notification
+        end
+
+        broadcast(:ok)
+      end
+
+      private
+
+      attr_reader :meeting, :user_group, :form
+
+      def can_join_waitlist?
+        meeting.waitlist_enabled? &&
+          !meeting.registrations.exists?(user: current_user) &&
+          !meeting.has_available_slots?
+      end
+
+      def create_waitlist_entry
+        @registration = Decidim::Meetings::Registration.create!(
+          meeting:,
+          user: current_user,
+          user_group:,
+          public_participation: form.public_participation,
+          status: :waiting_list
+        )
+      end
+
+      def send_waitlist_notification
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_waitlist_added",
+          event_class: Decidim::Meetings::MeetingWaitlistNotificationEvent,
+          resource: meeting,
+          affected_users: [current_user]
+        )
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
index b9582ebf49c64..5334d775f9fa5 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
@@ -47,6 +47,24 @@ def create
         end
       end
 
+      def join_waitlist
+        enforce_permission_to(:join_waitlist, :meeting, meeting:)
+
+        @form = JoinMeetingForm.from_params(params).with_context(current_user:)
+
+        JoinWaitlist.call(meeting, @form) do
+          on(:ok) do
+            flash[:notice] = I18n.t("registrations.waitlist.success", scope: "decidim.meetings")
+            redirect_after_path
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("registrations.waitlist.invalid", scope: "decidim.meetings")
+            redirect_after_path
+          end
+        end
+      end
+
       def destroy
         enforce_permission_to(:leave, :meeting, meeting:)
 
diff --git a/decidim-meetings/app/models/decidim/meetings/registration.rb b/decidim-meetings/app/models/decidim/meetings/registration.rb
index 090c7b8c2dd5c..5464cb39ef886 100644
--- a/decidim-meetings/app/models/decidim/meetings/registration.rb
+++ b/decidim-meetings/app/models/decidim/meetings/registration.rb
@@ -14,9 +14,13 @@ class Registration < Meetings::ApplicationRecord
       validates :code, uniqueness: { allow_blank: true, scope: :meeting }
       validates :code, presence: true, on: :create
 
+      enum status: { registered: "registered", waitlisted: "waitlisted" }, _prefix: true
+
       before_validation :generate_code, on: :create
 
       scope :public_participant, -> { where(decidim_user_group_id: nil, public_participation: true) }
+      scope :registered, -> { where(status: :registered) }
+      scope :waiting_list, -> { where(status: :waiting_list).order(:created_at) }
 
       def self.user_collection(user)
         where(decidim_user_id: user.id)
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
index f34a63c227c75..23e8426faea1e 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
@@ -6,6 +6,12 @@
   </section>
 <% end %>
 
+<% if meeting.waitlist_enabled? && !meeting.has_available_slots? && meeting.can_be_joined_by?(current_user) %>
+  <section class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons" data-sticky-buttons>
+    <%= cell "decidim/meetings/join_waitlist_button", meeting, hide_modal: local_assigns[:hide_modal] %>
+  </section>
+<% end %>
+
 <% if (meeting.closed? && meeting.closing_visible?) || (registration.present? && registration.meeting.component.settings.registration_code_enabled) || (meeting.services.any?) %>
 <section class="layout-aside__section layout-aside__buttons">
   <% if meeting.closed? && meeting.closing_visible? %>
diff --git a/decidim-meetings/db/migrate/20250214113208_add_status_to_registrations_to_decidim_meetings_registrations.rb b/decidim-meetings/db/migrate/20250214113208_add_status_to_registrations_to_decidim_meetings_registrations.rb
new file mode 100644
index 0000000000000..4bcce525e5e8c
--- /dev/null
+++ b/decidim-meetings/db/migrate/20250214113208_add_status_to_registrations_to_decidim_meetings_registrations.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddStatusToRegistrationsToDecidimMeetingsRegistrations < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_meetings_registrations, :status, :string, default: "registered", null: false
+    add_index :decidim_meetings_registrations, :status
+  end
+end
diff --git a/decidim-meetings/lib/decidim/meetings/engine.rb b/decidim-meetings/lib/decidim/meetings/engine.rb
index 3531cc8d9c56d..7412dd3841f51 100644
--- a/decidim-meetings/lib/decidim/meetings/engine.rb
+++ b/decidim-meetings/lib/decidim/meetings/engine.rb
@@ -26,6 +26,7 @@ class Engine < ::Rails::Engine
               get :decline_invitation
               get :join, action: :show
               post :answer
+              post :join_waitlist
             end
           end
           resources :versions, only: [:show]

From 89e69e63cdf28ae637af6c028ec9a95660f9b70c Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Tue, 18 Feb 2025 14:24:57 +0100
Subject: [PATCH 03/14] leave waiting list button, move_from_waitlist!

---
 .../cancel_registration_meeting_button/show.erb |  2 +-
 .../cancel_registration_meeting_button_cell.rb  |  9 +++++++++
 .../meetings/join_waitlist_button_cell.rb       |  2 +-
 .../commands/decidim/meetings/join_waitlist.rb  |  5 +++--
 .../commands/decidim/meetings/leave_meeting.rb  | 17 +++++++++++++++++
 .../meetings/registrations_controller.rb        | 11 ++++++-----
 .../app/models/decidim/meetings/meeting.rb      |  4 ++--
 .../app/models/decidim/meetings/registration.rb |  6 ++++--
 .../meetings/meetings/_meeting_aside.html.erb   |  2 +-
 decidim-meetings/config/locales/en.yml          |  6 +++++-
 decidim-meetings/lib/decidim/meetings/engine.rb |  3 ++-
 11 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb
index d4b8ee70387db..d0bc2bc1482ad 100644
--- a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb
@@ -7,6 +7,6 @@
   class: button_classes,
   data: { "dialog-open": "meeting-cancelation-confirm-#{model.id}" }
 ) do %>
-  <%= t("leave", scope: "decidim.meetings.meetings.show") %>
+  <%= cancel_button_text %>
   <%= icon icon_name %>
 <% end %>
diff --git a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
index c4a568be0c679..d17264549591c 100644
--- a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
@@ -19,6 +19,15 @@ def current_component
         model.component
       end
 
+      def registration_status
+        model.registrations.find_by(user: current_user)&.status
+      end
+
+      def cancel_button_text
+        scope = "decidim.meetings.meetings.show"
+        registration_status == "on_waiting_list" ? I18n.t("cancel_waitlist", scope:) : I18n.t("leave", scope:)
+      end
+
       def button_classes
         "button button__sm button__transparent-secondary w-full"
       end
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
index 1174b04b77e50..57986bfb72302 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
@@ -30,7 +30,7 @@ def i18n_join_waitlist_text
       end
 
       def icon_name
-        "list-ordered"
+        "clockwise-line"
       end
 
       def registration_form
diff --git a/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb b/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb
index ea1a18673bef5..84746211e4229 100644
--- a/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb
@@ -40,14 +40,15 @@ def create_waitlist_entry
           user: current_user,
           user_group:,
           public_participation: form.public_participation,
-          status: :waiting_list
+          status: :on_waiting_list
         )
       end
 
+      # TODO: Implement this method
       def send_waitlist_notification
         Decidim::EventsManager.publish(
           event: "decidim.events.meetings.meeting_waitlist_added",
-          event_class: Decidim::Meetings::MeetingWaitlistNotificationEvent,
+          event_class: Decidim::Meetings::MeetingRegistrationNotificationEvent,
           resource: meeting,
           affected_users: [current_user]
         )
diff --git a/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb
index c592030d8e164..67c963ae51079 100644
--- a/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb
@@ -24,6 +24,7 @@ def call
           destroy_registration
           destroy_questionnaire_answers
           decrement_score
+          move_from_waitlist!
         end
         broadcast(:ok)
       end
@@ -50,6 +51,22 @@ def destroy_questionnaire_answers
       def decrement_score
         Decidim::Gamification.decrement_score(@user, :attended_meetings)
       end
+
+      def move_from_waitlist!
+        return unless @meeting.remaining_slots.positive?
+
+        on_waiting_list_user = @meeting.registrations.on_waiting_list.order(:created_at).first
+        return unless on_waiting_list_user
+
+        on_waiting_list_user.update!(status: :registered)
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.meetings.meeting_registration_confirmed",
+          event_class: Decidim::Meetings::MeetingRegistrationNotificationEvent,
+          resource: @meeting,
+          affected_users: [on_waiting_list_user.user]
+        )
+      end
     end
   end
 end
diff --git a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
index 5334d775f9fa5..8e97a7ddecd76 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
@@ -10,15 +10,16 @@ def answer
         enforce_permission_to(:join, :meeting, meeting:)
 
         @form = form(Decidim::Forms::QuestionnaireForm).from_params(params, session_token:)
+        command = params[:waitlist] ? JoinWaitlist : JoinMeeting
 
-        JoinMeeting.call(meeting, @form) do
+        command.call(meeting, @form) do
           on(:ok) do
-            flash[:notice] = I18n.t("registrations.create.success", scope: "decidim.meetings")
+            flash[:notice] = I18n.t("registrations.#{params[:waitlist] ? "waitlist" : "create"}.success", scope: "decidim.meetings")
             redirect_to after_answer_path
           end
 
           on(:invalid) do
-            flash.now[:alert] = I18n.t("registrations.create.invalid", scope: "decidim.meetings")
+            flash.now[:alert] = I18n.t("registrations.#{params[:waitlist] ? "waitlist" : "create"}.invalid", scope: "decidim.meetings")
             render template: "decidim/forms/questionnaires/show"
           end
 
@@ -98,7 +99,7 @@ def decline_invitation
       end
 
       def allow_answers?
-        meeting.registrations_enabled? && meeting.registration_form_enabled? && meeting.has_available_slots?
+        meeting.registrations_enabled? && meeting.registration_form_enabled? && (meeting.has_available_slots? || meeting.waitlist_enabled?)
       end
 
       def after_answer_path
@@ -108,7 +109,7 @@ def after_answer_path
       # You can implement this method in your controller to change the URL
       # where the questionnaire will be submitted.
       def update_url
-        answer_meeting_registration_path(meeting_id: meeting.id)
+        answer_meeting_registration_path(meeting_id: meeting.id, waitlist: request.path.include?("join_waitlist"))
       end
 
       def questionnaire_for
diff --git a/decidim-meetings/app/models/decidim/meetings/meeting.rb b/decidim-meetings/app/models/decidim/meetings/meeting.rb
index 3a7e12d7400e8..62b844187c10a 100644
--- a/decidim-meetings/app/models/decidim/meetings/meeting.rb
+++ b/decidim-meetings/app/models/decidim/meetings/meeting.rb
@@ -208,11 +208,11 @@ def emendation?
       def has_available_slots?
         return true if available_slots.zero?
 
-        (available_slots - reserved_slots) > registrations.count
+        (available_slots - reserved_slots) > registrations.registered.count
       end
 
       def remaining_slots
-        available_slots - reserved_slots - registrations.count
+        available_slots - reserved_slots - registrations.registered.count
       end
 
       def has_registration_for?(user)
diff --git a/decidim-meetings/app/models/decidim/meetings/registration.rb b/decidim-meetings/app/models/decidim/meetings/registration.rb
index 5464cb39ef886..f19d08a56badf 100644
--- a/decidim-meetings/app/models/decidim/meetings/registration.rb
+++ b/decidim-meetings/app/models/decidim/meetings/registration.rb
@@ -12,9 +12,9 @@ class Registration < Meetings::ApplicationRecord
 
       validates :user, uniqueness: { scope: :meeting }
       validates :code, uniqueness: { allow_blank: true, scope: :meeting }
-      validates :code, presence: true, on: :create
+      validates :code, presence: true, on: :create, if: -> { status == "registered" }
 
-      enum status: { registered: "registered", waitlisted: "waitlisted" }, _prefix: true
+      enum status: { registered: "registered", on_waiting_list: "on_waiting_list" }
 
       before_validation :generate_code, on: :create
 
@@ -45,6 +45,8 @@ def validated?
       private
 
       def generate_code
+        return if on_waiting_list?
+
         self[:code] ||= calculate_registration_code
       end
 
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
index 23e8426faea1e..466cf77f651b2 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
@@ -41,7 +41,7 @@
       <% end %>
     <% end %>
 
-    <% if registration.present? && registration.meeting.component.settings.registration_code_enabled %>
+    <% if registration.present? && registration.meeting.component.settings.registration_code_enabled && registration.registered? %>
       <%= render layout: "decidim/meetings/layouts/aside_block", locals: { emoji: "coupon-line" } do %>
         <h3 class="meeting__aside-block__title"><%= registration_code_help_text %></h3>
         <div class="meeting__aside-block__large"><%= registration.code %></div>
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 93ac0a0d4b8a2..e948f9b6be128 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -594,11 +594,12 @@ en:
           cancel: Cancel
           confirm: Confirm
         show:
-          add_to_waitlist: Add to waitlist
+          add_to_waitlist: Join the waiting list
           attendees: Attendees count
           contributions: Contributions count
           join: Register
           leave: Cancel your registration
+          cancel_waitlist: Leave the waiting list
           leave_confirmation: Are you sure you want to cancel your registration for this meeting?
           link_available_soon: Link available soon
           link_closed: The link to join the meeting will be available a few minutes before it starts
@@ -702,6 +703,9 @@ en:
         destroy:
           invalid: There was a problem leaving this meeting.
           success: You have left the meeting successfully.
+        waitlist:
+          invalid: There was a problem joining the waiting list.
+          success: You have joined the waiting list successfully.
       type_of_meeting:
         hybrid: Hybrid
         in_person: In person
diff --git a/decidim-meetings/lib/decidim/meetings/engine.rb b/decidim-meetings/lib/decidim/meetings/engine.rb
index 7412dd3841f51..36665f08145e7 100644
--- a/decidim-meetings/lib/decidim/meetings/engine.rb
+++ b/decidim-meetings/lib/decidim/meetings/engine.rb
@@ -26,7 +26,7 @@ class Engine < ::Rails::Engine
               get :decline_invitation
               get :join, action: :show
               post :answer
-              post :join_waitlist
+              get :join_waitlist, action: :show
             end
           end
           resources :versions, only: [:show]
@@ -72,6 +72,7 @@ class Engine < ::Rails::Engine
         Decidim.icons.register(name: "bill-line", icon: "bill-line", category: "system", description: "", engine: :meetings)
         Decidim.icons.register(name: "add-box-line", icon: "add-box-line", category: "system", description: "", engine: :meetings)
         Decidim.icons.register(name: "calendar-close-line", icon: "calendar-close-line", category: "system", description: "", engine: :meetings)
+        Decidim.icons.register(name: "clockwise-line", icon: "clockwise-line", category: "system", description: "", engine: :meetings)
       end
 
       initializer "decidim_meetings.content_processors" do |_app|

From e4889d2f0aded833d0817b76e890848686a9ee95 Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Tue, 18 Feb 2025 17:56:23 +0100
Subject: [PATCH 04/14] registration_modal

---
 .../cancel_registration_meeting_button_cell.rb         |  3 +--
 .../join_meeting_button/registration_modal.erb         |  2 +-
 .../cells/decidim/meetings/join_meeting_button_cell.rb |  4 ++++
 .../decidim/meetings/join_waitlist_button/show.erb     | 10 ++++++----
 .../decidim/meetings/join_waitlist_button_cell.rb      |  4 ++++
 .../app/permissions/decidim/meetings/permissions.rb    |  9 +++++++++
 decidim-meetings/lib/decidim/meetings/engine.rb        |  1 +
 7 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
index d17264549591c..c328ac8e6cbe8 100644
--- a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
@@ -24,8 +24,7 @@ def registration_status
       end
 
       def cancel_button_text
-        scope = "decidim.meetings.meetings.show"
-        registration_status == "on_waiting_list" ? I18n.t("cancel_waitlist", scope:) : I18n.t("leave", scope:)
+        I18n.t(registration_status == "on_waiting_list" ? "cancel_waitlist" : "leave", scope: "decidim.meetings.meetings.show")
       end
 
       def button_classes
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb
index 9c2536cf18068..da05b241e4e8c 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb
@@ -1,5 +1,5 @@
 <%= decidim_modal id: "meeting-registration-confirm-#{model.id}", class: "meeting__registration-modal" do %>
-  <%= decidim_form_for(registration_form, url: meeting_registration_path(model), method: :post) do |form| %>
+  <%= decidim_form_for(registration_form, url: model.has_available_slots? ? meeting_registration_path(model) : join_waitlist_meeting_registration_path(model), method: :post) do |form| %>
     <div data-dialog-container>
       <%= icon "login-circle-line" %>
       <h2 id="dialog-title-meeting-registration-confirm-<%= model.id %>" data-dialog-title><%= t("join", scope: "decidim.meetings.meetings.show") %></h2>
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
index afc05a17d6da1..75de873e82281 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
@@ -12,6 +12,10 @@ def show
         render
       end
 
+      def registration_modal
+        render
+      end
+
       private
 
       delegate :current_user, to: :controller, prefix: false
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb
index 945ef8c5181d5..14d6a1ec9182a 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb
@@ -4,19 +4,21 @@
         join_waitlist_meeting_registration_path(model),
         class: button_classes
       ) do %>
-    <%= icon(icon_name) %>
     <%= i18n_join_waitlist_text %>
+    <%= icon(icon_name) %>
   <% end %>
 <% else %>
   <% unless options[:hide_modal] %>
-    <%= render :registration_modal %>
+    <%= render_registration_modal %>
   <% end %>
   <%= action_authorized_button_to(
         :join_waitlist,
-        content_tag(:span, "#{icon(icon_name)} #{i18n_join_waitlist_text}".html_safe),
         "#",
         class: button_classes,
         data: { "dialog-open": current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" },
         resource: model
-      ) %>
+      )  do %>
+    <%= i18n_join_waitlist_text %>
+    <%= icon(icon_name) %>
+  <% end %>
 <% end %>
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
index 57986bfb72302..b5325c8ed5458 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
@@ -13,6 +13,10 @@ def show
         render
       end
 
+      def render_registration_modal
+        cell(JoinMeetingButtonCell, model, current_user: current_user).call(:registration_modal)
+      end
+
       private
 
       def current_component
diff --git a/decidim-meetings/app/permissions/decidim/meetings/permissions.rb b/decidim-meetings/app/permissions/decidim/meetings/permissions.rb
index e8b48a7a131ca..6487fe643017c 100644
--- a/decidim-meetings/app/permissions/decidim/meetings/permissions.rb
+++ b/decidim-meetings/app/permissions/decidim/meetings/permissions.rb
@@ -30,6 +30,8 @@ def permissions
           case permission_action.action
           when :join
             toggle_allow(can_join_meeting?)
+          when :join_waitlist
+            toggle_allow(can_join_waitlist?)
           when :leave
             toggle_allow(can_leave_meeting?)
           when :decline_invitation
@@ -74,6 +76,13 @@ def can_join_meeting?
           authorized?(:join, resource: meeting)
       end
 
+      def can_join_waitlist?
+        meeting.waitlist_enabled? &&
+          !meeting.has_available_slots? &&
+          !meeting.has_registration_for?(user) &&
+          authorized?(:join_waitlist, resource: meeting)
+      end
+
       def can_leave_meeting?
         meeting.registrations_enabled?
       end
diff --git a/decidim-meetings/lib/decidim/meetings/engine.rb b/decidim-meetings/lib/decidim/meetings/engine.rb
index 36665f08145e7..0e70e0940c9d5 100644
--- a/decidim-meetings/lib/decidim/meetings/engine.rb
+++ b/decidim-meetings/lib/decidim/meetings/engine.rb
@@ -27,6 +27,7 @@ class Engine < ::Rails::Engine
               get :join, action: :show
               post :answer
               get :join_waitlist, action: :show
+              post :join_waitlist
             end
           end
           resources :versions, only: [:show]

From 7fd36203cd05ef2e8c66852fca1b175b015255c3 Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Wed, 19 Feb 2025 10:34:37 +0100
Subject: [PATCH 05/14] cancel waitlist modal

---
 .../cancelation_modal.erb                     | 11 +++++---
 ...cancel_registration_meeting_button_cell.rb | 26 ++++++++++++++++++-
 .../meetings/registrations_controller.rb      |  8 ++++--
 decidim-meetings/config/locales/en.yml        | 15 ++++++++---
 4 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/cancelation_modal.erb b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/cancelation_modal.erb
index 2d49bb2bd3892..4f14fd1dc6f25 100644
--- a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/cancelation_modal.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/cancelation_modal.erb
@@ -2,10 +2,13 @@
   <%= decidim_form_for(registration_form, url: meeting_registration_path(model), method: :delete) do |form| %>
     <div data-dialog-container>
       <%= icon "door-open-line" %>
-      <h2 id="dialog-title-meeting-cancelation-confirm-<%= model.id %>" data-dialog-title><%= t("leave", scope: "decidim.meetings.meetings.show") %></h2>
+      <h2 id="dialog-title-meeting-cancelation-confirm-<%= model.id %>" data-dialog-title>
+        <%= i18n_modal_title %>
+      </h2>
       <div>
-
-        <div id="dialog-desc-meeting-cancelation-confirm-<%= model.id %>" class="meeting__cancelation-modal__description"><%= t("leave_confirmation", scope: "decidim.meetings.meetings.show") %></div>
+        <div id="dialog-desc-meeting-cancelation-confirm-<%= model.id %>" class="meeting__cancelation-modal__description">
+          <%= i18n_modal_confirmation_text %>
+        </div>
       </div>
     </div>
     <div data-dialog-actions>
@@ -13,7 +16,7 @@
         <span><%= t("close", scope: "decidim.shared.flag_modal") %></span>
       </button>
       <button type="submit" class="button button__sm md:button__lg button__transparent-secondary">
-        <span><%= t("leave", scope: "decidim.meetings.meetings.show") %></span>
+        <span><%= cancel_button_text %></span>
         <%= icon "arrow-right-line" %>
       </button>
     </div>
diff --git a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
index c328ac8e6cbe8..a0e89a4f32635 100644
--- a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
@@ -23,8 +23,32 @@ def registration_status
         model.registrations.find_by(user: current_user)&.status
       end
 
+      def action_keys
+        if registration_status == "on_waiting_list"
+          {
+            button: "cancel_waitlist",
+            modal_title: "waitlist_title",
+            modal_confirmation: "waitlist_confirmation"
+          }
+        else
+          {
+            button: "leave",
+            modal_title: "registration_title",
+            modal_confirmation: "registration_confirmation"
+          }
+        end
+      end
+
       def cancel_button_text
-        I18n.t(registration_status == "on_waiting_list" ? "cancel_waitlist" : "leave", scope: "decidim.meetings.meetings.show")
+        I18n.t(action_keys[:button], scope: "decidim.meetings.meetings.show")
+      end
+
+      def i18n_modal_title
+        I18n.t(action_keys[:modal_title], scope: "decidim.meetings.meetings.show")
+      end
+
+      def i18n_modal_confirmation_text
+        I18n.t(action_keys[:modal_confirmation], scope: "decidim.meetings.meetings.show")
       end
 
       def button_classes
diff --git a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
index 8e97a7ddecd76..d4a108e49431b 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
@@ -71,12 +71,12 @@ def destroy
 
         LeaveMeeting.call(meeting, current_user) do
           on(:ok) do
-            flash[:notice] = I18n.t("registrations.destroy.success", scope: "decidim.meetings")
+            flash[:notice] = I18n.t("registrations.destroy.#{registration.status}.success", scope: "decidim.meetings")
             redirect_after_path
           end
 
           on(:invalid) do
-            flash.now[:alert] = I18n.t("registrations.destroy.invalid", scope: "decidim.meetings")
+            flash.now[:alert] = I18n.t("registrations.destroy.#{registration.status}.invalid", scope: "decidim.meetings")
             redirect_after_path
           end
         end
@@ -122,6 +122,10 @@ def meeting
         @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
       end
 
+      def registration
+        @registration ||= meeting.registrations.find_by(user: current_user)
+      end
+
       def redirect_after_path
         redirect_to meeting_path(meeting)
       end
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index e948f9b6be128..39cccd8388e60 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -596,11 +596,10 @@ en:
         show:
           add_to_waitlist: Join the waiting list
           attendees: Attendees count
+          cancel_waitlist: Leave the waiting list
           contributions: Contributions count
           join: Register
           leave: Cancel your registration
-          cancel_waitlist: Leave the waiting list
-          leave_confirmation: Are you sure you want to cancel your registration for this meeting?
           link_available_soon: Link available soon
           link_closed: The link to join the meeting will be available a few minutes before it starts
           live_event: This meeting is happening right now
@@ -610,13 +609,17 @@ en:
           organizations: Attending organizations
           redirect_notice: This meeting is part of another space, so you have been moved to %{current_space_name}. <br>If you prefer, you can go back to <a href="%{previous_space_url}">%{previous_space_name}</a>.
           registration_code_help_text: Your registration code
+          registration_confirmation: Are you sure you want to cancel your registration for this meeting?
           registration_state:
             validated: VALIDATED
             validation_pending: VALIDATION PENDING
+          registration_title: Cancel your registration
           remaining_slots:
             one: "%{count} slot remaining"
             other: "%{count} slots remaining"
           visit_finished: View past meeting
+          waitlist_confirmation: Are you sure you want to cancel your waitlist registration for this meeting?
+          waitlist_title: Cancel your waitlist registration
           withdraw_btn_hint: You can withdraw your meeting if you change your mind. The meeting is not deleted, it will appear in the list of withdrawn meetings.
           withdraw_confirmation_html: Are you sure you want to withdraw this meeting?<br><br><strong>This action cannot be cancelled!</strong>
           withdraw_meeting: Withdraw
@@ -701,8 +704,12 @@ en:
           invalid: There was a problem declining the invitation.
           success: You have declined the invitation successfully.
         destroy:
-          invalid: There was a problem leaving this meeting.
-          success: You have left the meeting successfully.
+          on_waiting_list:
+            invalid: There was a problem leaving the waiting list.
+            success: You have left the waiting list successfully.
+          registered:
+            invalid: There was a problem leaving this meeting.
+            success: You have left the meeting successfully.
         waitlist:
           invalid: There was a problem joining the waiting list.
           success: You have joined the waiting list successfully.

From 1672e51ea06d5a048c014b481d84b69bc0ba1ce9 Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Tue, 25 Feb 2025 15:22:43 +0100
Subject: [PATCH 06/14] add tests

---
 .../meetings/registrations_controller.rb      |  14 +-
 .../app/models/decidim/meetings/meeting.rb    |   2 +-
 .../lib/decidim/meetings/test/factories.rb    |   1 +
 .../admin/update_registrations_spec.rb        |   4 +-
 .../spec/commands/join_waitlist_spec.rb       | 100 ++++++++++
 .../meetings/registrations_controller_spec.rb | 181 ++++++++++++++++++
 6 files changed, 294 insertions(+), 8 deletions(-)
 create mode 100644 decidim-meetings/spec/commands/join_waitlist_spec.rb
 create mode 100644 decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb

diff --git a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
index d4a108e49431b..2756d11b78da7 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
@@ -10,22 +10,24 @@ def answer
         enforce_permission_to(:join, :meeting, meeting:)
 
         @form = form(Decidim::Forms::QuestionnaireForm).from_params(params, session_token:)
-        command = params[:waitlist] ? JoinWaitlist : JoinMeeting
+
+        waitlist = ActiveModel::Type::Boolean.new.cast(params[:waitlist])
+        command = waitlist ? JoinWaitlist : JoinMeeting
 
         command.call(meeting, @form) do
           on(:ok) do
-            flash[:notice] = I18n.t("registrations.#{params[:waitlist] ? "waitlist" : "create"}.success", scope: "decidim.meetings")
+            flash[:notice] = I18n.t("registrations.#{waitlist ? "waitlist" : "create"}.success", scope: "decidim.meetings")
             redirect_to after_answer_path
           end
 
           on(:invalid) do
-            flash.now[:alert] = I18n.t("registrations.#{params[:waitlist] ? "waitlist" : "create"}.invalid", scope: "decidim.meetings")
-            render template: "decidim/forms/questionnaires/show"
+            flash.now[:alert] = I18n.t("registrations.#{waitlist ? "waitlist" : "create"}.invalid", scope: "decidim.meetings")
+            render template: "decidim/forms/questionnaires/show", status: :unprocessable_entity
           end
 
           on(:invalid_form) do
             flash.now[:alert] = I18n.t("answer.invalid", scope: i18n_flashes_scope)
-            render template: "decidim/forms/questionnaires/show"
+            render template: "decidim/forms/questionnaires/show", status: :unprocessable_entity
           end
         end
       end
@@ -109,7 +111,7 @@ def after_answer_path
       # You can implement this method in your controller to change the URL
       # where the questionnaire will be submitted.
       def update_url
-        answer_meeting_registration_path(meeting_id: meeting.id, waitlist: request.path.include?("join_waitlist"))
+        answer_meeting_registration_path(meeting_id: meeting.id, waitlist: params[:waitlist] || request.path.include?("join_waitlist"))
       end
 
       def questionnaire_for
diff --git a/decidim-meetings/app/models/decidim/meetings/meeting.rb b/decidim-meetings/app/models/decidim/meetings/meeting.rb
index 62b844187c10a..9f4071506b7cf 100644
--- a/decidim-meetings/app/models/decidim/meetings/meeting.rb
+++ b/decidim-meetings/app/models/decidim/meetings/meeting.rb
@@ -206,7 +206,7 @@ def emendation?
       end
 
       def has_available_slots?
-        return true if available_slots.zero?
+        return false if available_slots.zero?
 
         (available_slots - reserved_slots) > registrations.registered.count
       end
diff --git a/decidim-meetings/lib/decidim/meetings/test/factories.rb b/decidim-meetings/lib/decidim/meetings/test/factories.rb
index 7ad7fbfbde41b..1ee2b74b9e113 100644
--- a/decidim-meetings/lib/decidim/meetings/test/factories.rb
+++ b/decidim-meetings/lib/decidim/meetings/test/factories.rb
@@ -44,6 +44,7 @@
     registration_terms { generate_localized_description(:meeting_registration_terms, skip_injection:) }
     registration_type { :on_this_platform }
     type_of_meeting { :in_person }
+    waitlist_enabled { false }
     component { build(:meeting_component) }
     iframe_access_level { :all }
     iframe_embed_type { :none }
diff --git a/decidim-meetings/spec/commands/admin/update_registrations_spec.rb b/decidim-meetings/spec/commands/admin/update_registrations_spec.rb
index 5858b5145a096..e841c8373a65f 100644
--- a/decidim-meetings/spec/commands/admin/update_registrations_spec.rb
+++ b/decidim-meetings/spec/commands/admin/update_registrations_spec.rb
@@ -28,6 +28,7 @@ module Decidim::Meetings
         registration_form_enabled:,
         available_slots:,
         reserved_slots:,
+        waitlist_enabled: true,
         customize_registration_email:,
         registration_email_custom_content:,
         registration_terms:,
@@ -57,12 +58,13 @@ module Decidim::Meetings
         expect(meeting.customize_registration_email).to be true
         expect(meeting.registration_email_custom_content).to eq(registration_email_custom_content)
         expect(translated(meeting.registration_terms)).to eq "A legal text"
+        expect(meeting.waitlist_enabled).to be true
       end
     end
 
     describe "events" do
       let(:user) { create(:user, :confirmed, organization: meeting.organization) }
-      let!(:follow) { create(:follow, followable: meeting, user:) }
+      let!(:follow) { create(:follow, followable: meeting, user: user) }
 
       context "when registrations are enabled" do
         it "notifies the change" do
diff --git a/decidim-meetings/spec/commands/join_waitlist_spec.rb b/decidim-meetings/spec/commands/join_waitlist_spec.rb
new file mode 100644
index 0000000000000..b9c7d8fa008f1
--- /dev/null
+++ b/decidim-meetings/spec/commands/join_waitlist_spec.rb
@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Meetings
+  describe JoinWaitlist do
+    subject { described_class.new(meeting, form) }
+
+    let(:organization) { create(:organization) }
+    let(:participatory_process) { create(:participatory_process, organization: organization) }
+    let(:component) { create(:component, manifest_name: :meetings, participatory_space: participatory_process) }
+    let(:available_slots) { 2 }
+    let(:waitlist_enabled) { true }
+    let(:meeting) do
+      create(:meeting,
+             component: component,
+             waitlist_enabled: waitlist_enabled,
+             registrations_enabled: true,
+             available_slots: available_slots)
+    end
+
+    let(:user) { create(:user, :confirmed, organization: organization, notifications_sending_frequency: "none") }
+    let(:user_group) { create(:user_group) }
+    let(:form_params) { { user_group_id: user_group.id } }
+    let(:form) do
+      Decidim::Meetings::JoinMeetingForm.from_params(form_params).with_context(current_user: user)
+    end
+
+    let(:waitlist_notification) do
+      {
+        event: "decidim.events.meetings.meeting_waitlist_added",
+        event_class: MeetingRegistrationNotificationEvent,
+        resource: meeting,
+        affected_users: [user]
+      }
+    end
+
+    context "when all conditions are met" do
+      before do
+        create_list(:registration, available_slots, meeting: meeting, status: :registered)
+      end
+
+      it "broadcasts ok" do
+        expect { subject.call }.to broadcast(:ok)
+      end
+
+      it "creates a waitlist registration with correct attributes" do
+        expect { subject.call }.to change(Registration, :count).by(1)
+        last_registration = Registration.last
+        expect(last_registration.user).to eq(user)
+        expect(last_registration.meeting).to eq(meeting)
+        expect(last_registration.status).to eq("on_waiting_list")
+      end
+
+      it "publishes waitlist notification" do
+        expect(Decidim::EventsManager).to receive(:publish).with(waitlist_notification)
+        subject.call
+      end
+    end
+
+    context "when waitlist is disabled" do
+      let(:waitlist_enabled) { false }
+
+      before do
+        create_list(:registration, available_slots, meeting: meeting, status: :registered)
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+      end
+    end
+
+    context "when the user is already registered" do
+      before do
+        create(:registration, meeting: meeting, user: user, status: :registered)
+      end
+
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+      end
+    end
+
+    context "when meeting has available slots" do
+      it "broadcasts invalid" do
+        expect { subject.call }.to broadcast(:invalid)
+      end
+    end
+
+    context "when the form is invalid" do
+      before do
+        create_list(:registration, available_slots, meeting: meeting, status: :registered)
+        allow(form).to receive(:valid?).and_return(false)
+      end
+
+      it "broadcasts invalid_form" do
+        expect { subject.call }.to broadcast(:invalid_form)
+      end
+    end
+  end
+end
diff --git a/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb b/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb
new file mode 100644
index 0000000000000..79f3c29a2db93
--- /dev/null
+++ b/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb
@@ -0,0 +1,181 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Decidim::Meetings
+  describe RegistrationsController do
+    routes { Decidim::Meetings::Engine.routes }
+
+    let(:organization) { create(:organization) }
+    let(:user) { create(:user, :confirmed, organization:) }
+    let(:participatory_process) { create(:participatory_process, organization:) }
+    let(:component) { create(:meeting_component, participatory_space: participatory_process) }
+    let(:meeting) { create(:meeting, :published, component:, registrations_enabled: true, available_slots: 10) }
+
+    before do
+      request.env["decidim.current_organization"] = organization
+      request.env["decidim.current_participatory_space"] = participatory_process
+      request.env["decidim.current_component"] = component
+    end
+
+    describe "POST create" do
+      let(:params) { { meeting_id: meeting.id } }
+
+      context "when user is authenticated" do
+        before { sign_in user }
+
+        context "with available slots" do
+          it "creates registration and redirects" do
+            expect do
+              post :create, params: params
+            end.to change(Registration, :count).by(1)
+
+            expect(flash[:notice]).to eq(I18n.t("registrations.create.success", scope: "decidim.meetings"))
+            expect(response).to redirect_to(meeting_path(meeting))
+          end
+        end
+
+        context "when no available slots" do
+          let(:meeting) { create(:meeting, component:, available_slots: 0, registrations_enabled: true, waitlist_enabled: false) }
+
+          it "shows error message" do
+            post :create, params: params
+
+            expect(flash[:alert]).to eq(I18n.t("registrations.create.invalid", scope: "decidim.meetings"))
+            expect(response).to redirect_to(meeting_path(meeting))
+          end
+        end
+      end
+
+      context "when user not authenticated" do
+        it "redirects to login" do
+          post :create, params: params
+          expect(response).to redirect_to("/users/sign_in")
+        end
+      end
+    end
+
+    describe "POST answer" do
+      let(:questionnaire) { create(:questionnaire, :with_questions, questionnaire_for: meeting) }
+      let(:question) { questionnaire.questions.first }
+      let(:params) do
+        {
+          meeting_id: meeting.id,
+          waitlist: waitlist,
+          questionnaire: {
+            responses: [
+              {
+                body: "Answer",
+                question_id: question.id
+              }
+            ],
+            tos_agreement: true
+          }
+        }
+      end
+      let(:waitlist) { false }
+
+      before do
+        sign_in user
+        meeting.update!(
+          registrations_enabled: true,
+          registration_form_enabled: true,
+          questionnaire: questionnaire
+        )
+      end
+
+      context "with valid params" do
+        before do
+          if waitlist
+            meeting.update!(waitlist_enabled: true, available_slots: 0)
+          else
+            meeting.update!(available_slots: 5)
+          end
+        end
+
+        context "when joining directly" do
+          it "answers questionnaire and redirects" do
+            puts "Test Params: #{params.inspect}"
+
+            expect do
+              post :answer, params: params
+            end.to change { meeting.registrations.count }.by(1)
+
+            expect(flash[:notice]).to eq(I18n.t("registrations.create.success", scope: "decidim.meetings"))
+            expect(response).to redirect_to(meeting_path(meeting))
+          end
+        end
+
+        context "when joining waitlist" do
+          let(:waitlist) { true }
+
+          it "adds user to waitlist and redirects" do
+            expect do
+              post :answer, params: params
+            end.to change { meeting.registrations.where(status: :on_waiting_list).count }.by(1)
+
+            expect(flash[:notice]).to eq(I18n.t("registrations.waitlist.success", scope: "decidim.meetings"))
+            expect(response).to redirect_to(meeting_path(meeting))
+          end
+        end
+      end
+
+      context "with invalid params" do
+        let(:params) do
+          {
+            meeting_id: meeting.id,
+            waitlist: waitlist,
+            questionnaire: { responses: [] } # Пустые ответы
+          }
+        end
+
+        before do
+          meeting.update!(available_slots: 0, waitlist_enabled: waitlist, registrations_enabled: true)
+        end
+
+        it "shows error message" do
+          post :answer, params: params
+
+          expected_key = waitlist ? "waitlist" : "create"
+          expect(flash[:alert]).to eq(I18n.t("registrations.#{expected_key}.invalid", scope: "decidim.meetings"))
+          expect(response).to render_template("decidim/forms/questionnaires/show")
+        end
+      end
+    end
+
+    describe "POST join_waitlist" do
+      let(:meeting) { create(:meeting, component:, available_slots: available_slots, waitlist_enabled: true) }
+      let(:params) { { meeting_id: meeting.id } }
+      let(:available_slots) { 0 }
+
+      before { sign_in user }
+
+      context "when meeting has no available slots" do
+        it "adds user to waitlist" do
+          expect do
+            post :join_waitlist, params: params
+          end.to change(Registration.on_waiting_list, :count).by(1)
+
+          expect(flash[:notice]).to eq(I18n.t("registrations.waitlist.success", scope: "decidim.meetings"))
+          expect(response).to redirect_to(meeting_path(meeting))
+        end
+      end
+    end
+
+    describe "DELETE destroy" do
+      let!(:registration) { create(:registration, meeting:, user:) }
+      let(:params) { { meeting_id: meeting.id } }
+
+      before { sign_in user }
+
+      it "destroys registration" do
+        expect do
+          delete :destroy, params: params
+        end.to change(Registration, :count).by(-1)
+
+        expect(flash[:notice]).to match(/successfully/)
+        expect(response).to redirect_to(meeting_path(meeting))
+      end
+    end
+  end
+end

From ed5d4037c49a0fad243ba0ca6974a0c64b611e83 Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Wed, 26 Feb 2025 12:28:59 +0100
Subject: [PATCH 07/14] fix tests

---
 .../app/models/decidim/meetings/meeting.rb    |  2 +-
 .../meetings/registrations_controller_spec.rb | 29 +++++--------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/decidim-meetings/app/models/decidim/meetings/meeting.rb b/decidim-meetings/app/models/decidim/meetings/meeting.rb
index 9f4071506b7cf..62b844187c10a 100644
--- a/decidim-meetings/app/models/decidim/meetings/meeting.rb
+++ b/decidim-meetings/app/models/decidim/meetings/meeting.rb
@@ -206,7 +206,7 @@ def emendation?
       end
 
       def has_available_slots?
-        return false if available_slots.zero?
+        return true if available_slots.zero?
 
         (available_slots - reserved_slots) > registrations.registered.count
       end
diff --git a/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb b/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb
index 79f3c29a2db93..554df129ec6fb 100644
--- a/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb
+++ b/decidim-meetings/spec/controllers/decidim/meetings/registrations_controller_spec.rb
@@ -36,7 +36,7 @@ module Decidim::Meetings
         end
 
         context "when no available slots" do
-          let(:meeting) { create(:meeting, component:, available_slots: 0, registrations_enabled: true, waitlist_enabled: false) }
+          let!(:registrations) { create_list(:registration, 10, meeting: meeting) }
 
           it "shows error message" do
             post :create, params: params
@@ -85,18 +85,8 @@ module Decidim::Meetings
       end
 
       context "with valid params" do
-        before do
-          if waitlist
-            meeting.update!(waitlist_enabled: true, available_slots: 0)
-          else
-            meeting.update!(available_slots: 5)
-          end
-        end
-
         context "when joining directly" do
           it "answers questionnaire and redirects" do
-            puts "Test Params: #{params.inspect}"
-
             expect do
               post :answer, params: params
             end.to change { meeting.registrations.count }.by(1)
@@ -107,6 +97,8 @@ module Decidim::Meetings
         end
 
         context "when joining waitlist" do
+          let(:meeting) { create(:meeting, component:, available_slots: 10, waitlist_enabled: true) }
+          let!(:registrations) { create_list(:registration, 10, meeting: meeting) }
           let(:waitlist) { true }
 
           it "adds user to waitlist and redirects" do
@@ -124,29 +116,24 @@ module Decidim::Meetings
         let(:params) do
           {
             meeting_id: meeting.id,
-            waitlist: waitlist,
-            questionnaire: { responses: [] } # Пустые ответы
+            waitlist: false,
+            questionnaire: { responses: [] }
           }
         end
 
-        before do
-          meeting.update!(available_slots: 0, waitlist_enabled: waitlist, registrations_enabled: true)
-        end
-
         it "shows error message" do
           post :answer, params: params
 
-          expected_key = waitlist ? "waitlist" : "create"
-          expect(flash[:alert]).to eq(I18n.t("registrations.#{expected_key}.invalid", scope: "decidim.meetings"))
+          expect(flash[:alert]).to eq(I18n.t("answer.invalid", scope: "decidim.forms.questionnaires"))
           expect(response).to render_template("decidim/forms/questionnaires/show")
         end
       end
     end
 
     describe "POST join_waitlist" do
-      let(:meeting) { create(:meeting, component:, available_slots: available_slots, waitlist_enabled: true) }
+      let(:meeting) { create(:meeting, component:, available_slots: 10, waitlist_enabled: true) }
+      let!(:registrations) { create_list(:registration, 10, meeting: meeting) }
       let(:params) { { meeting_id: meeting.id } }
-      let(:available_slots) { 0 }
 
       before { sign_in user }
 

From 4dfd971a977e0286850d075fa903bf40df993b3e Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Wed, 26 Feb 2025 15:21:08 +0100
Subject: [PATCH 08/14] fix cell, add tests

---
 .../registration_modal.erb                    |   7 +-
 .../meetings/join_meeting_button_cell.rb      |   4 -
 .../meetings/join_waitlist_button/show.erb    |   5 +-
 .../meetings/join_waitlist_button_cell.rb     |   4 -
 .../meetings/registrations_controller.rb      |   4 +-
 decidim-meetings/config/locales/en.yml        |   1 +
 .../spec/system/meeting_registrations_spec.rb |  29 +++
 .../spec/system/meeting_waiting_list_spec.rb  | 185 ++++++++++++++++++
 8 files changed, 223 insertions(+), 16 deletions(-)
 create mode 100644 decidim-meetings/spec/system/meeting_waiting_list_spec.rb

diff --git a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb
index da05b241e4e8c..e7894b22818ff 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb
@@ -1,8 +1,9 @@
-<%= decidim_modal id: "meeting-registration-confirm-#{model.id}", class: "meeting__registration-modal" do %>
+<% action = model.has_available_slots? ? "registration" : "waitlist" %>
+<%= decidim_modal id: "meeting-#{action}-confirm-#{model.id}", class: "meeting__registration-modal" do %>
   <%= decidim_form_for(registration_form, url: model.has_available_slots? ? meeting_registration_path(model) : join_waitlist_meeting_registration_path(model), method: :post) do |form| %>
     <div data-dialog-container>
       <%= icon "login-circle-line" %>
-      <h2 id="dialog-title-meeting-registration-confirm-<%= model.id %>" data-dialog-title><%= t("join", scope: "decidim.meetings.meetings.show") %></h2>
+      <h2 id="dialog-title-meeting-registration-confirm-<%= model.id %>" data-dialog-title><%= t(model.has_available_slots? ? "join" : "join_waitlist", scope: "decidim.meetings.meetings.show")  %></h2>
       <div>
 
         <div class="form__wrapper">
@@ -13,7 +14,7 @@
       </div>
     </div>
     <div data-dialog-actions>
-      <button type="button" class="button button__sm md:button__lg button__transparent-secondary" data-dialog-close="meeting-registration-confirm-<%= model.id %>">
+      <button type="button" class="button button__sm md:button__lg button__transparent-secondary" data-dialog-close="meeting-<%= action %>-confirm-<%= model.id %>">
         <span><%= i18n_cancel_text %></span>
       </button>
       <button type="submit" class="button button__sm md:button__lg button__secondary">
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
index 75de873e82281..afc05a17d6da1 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button_cell.rb
@@ -12,10 +12,6 @@ def show
         render
       end
 
-      def registration_modal
-        render
-      end
-
       private
 
       delegate :current_user, to: :controller, prefix: false
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb
index 14d6a1ec9182a..2c91bb7ea5a97 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button/show.erb
@@ -8,14 +8,11 @@
     <%= icon(icon_name) %>
   <% end %>
 <% else %>
-  <% unless options[:hide_modal] %>
-    <%= render_registration_modal %>
-  <% end %>
   <%= action_authorized_button_to(
         :join_waitlist,
         "#",
         class: button_classes,
-        data: { "dialog-open": current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" },
+        data: { "dialog-open": current_user.present? ? "meeting-waitlist-confirm-#{model.id}" : "loginModal" },
         resource: model
       )  do %>
     <%= i18n_join_waitlist_text %>
diff --git a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
index b5325c8ed5458..57986bfb72302 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_waitlist_button_cell.rb
@@ -13,10 +13,6 @@ def show
         render
       end
 
-      def render_registration_modal
-        cell(JoinMeetingButtonCell, model, current_user: current_user).call(:registration_modal)
-      end
-
       private
 
       def current_component
diff --git a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
index 2756d11b78da7..5be93bce8b126 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
@@ -101,7 +101,9 @@ def decline_invitation
       end
 
       def allow_answers?
-        meeting.registrations_enabled? && meeting.registration_form_enabled? && (meeting.has_available_slots? || meeting.waitlist_enabled?)
+        return false unless meeting.registrations_enabled? && meeting.registration_form_enabled?
+
+        meeting.has_available_slots? || (meeting.waitlist_enabled? && request.path.include?("join_waitlist"))
       end
 
       def after_answer_path
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 39cccd8388e60..36a30b4f2d802 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -599,6 +599,7 @@ en:
           cancel_waitlist: Leave the waiting list
           contributions: Contributions count
           join: Register
+          join_waitlist: Join the waiting list
           leave: Cancel your registration
           link_available_soon: Link available soon
           link_closed: The link to join the meeting will be available a few minutes before it starts
diff --git a/decidim-meetings/spec/system/meeting_registrations_spec.rb b/decidim-meetings/spec/system/meeting_registrations_spec.rb
index 6366ffcf5837f..fd3389986ac96 100644
--- a/decidim-meetings/spec/system/meeting_registrations_spec.rb
+++ b/decidim-meetings/spec/system/meeting_registrations_spec.rb
@@ -14,6 +14,7 @@
   let(:registrations_enabled) { true }
   let(:registration_form_enabled) { false }
   let(:available_slots) { 20 }
+  let(:waitlist_enabled) { true }
   let(:registration_terms) do
     {
       en: "A legal text",
@@ -30,6 +31,10 @@ def questionnaire_public_path
     Decidim::EngineRouter.main_proxy(component).join_meeting_registration_path(meeting_id: meeting.id)
   end
 
+  def questionnaire_waitlist_public_path
+    Decidim::EngineRouter.main_proxy(component).join_waitlist_meeting_registration_path(meeting_id: meeting.id)
+  end
+
   def see_questionnaire_questions; end
 
   before do
@@ -38,6 +43,7 @@ def see_questionnaire_questions; end
       registrations_enabled:,
       registration_form_enabled:,
       available_slots:,
+      waitlist_enabled:,
       registration_terms:
     )
   end
@@ -52,6 +58,12 @@ def see_questionnaire_questions; end
       expect(page).to have_no_text("20 slots remaining")
     end
 
+    it "the waitlist button is not visible" do
+      visit_meeting
+
+      expect(page).to have_no_content("Join the waiting list")
+    end
+
     context "and registration form is also enabled" do
       let(:registration_form_enabled) { true }
 
@@ -83,6 +95,14 @@ def see_questionnaire_questions; end
         expect(page).to have_text("0 slots remaining")
       end
 
+      context "and waitlist is enabled" do
+        it "the waitlist button is visible" do
+          visit_meeting
+
+          expect(page).to have_content("Join the waiting list")
+        end
+      end
+
       context "and registration form is enabled" do
         let(:registration_form_enabled) { true }
 
@@ -100,6 +120,15 @@ def see_questionnaire_questions; end
 
           expect(page).to have_content("The form is closed and cannot be answered")
         end
+
+        it "can answer the waitlist form" do
+          visit questionnaire_waitlist_public_path
+
+          expect(page).to have_i18n_content(questionnaire.title)
+          expect(page).to have_i18n_content(questionnaire.description, strip_tags: true)
+          expect(page).to have_i18n_content(question.body)
+          expect(page).to have_css(".form.answer-questionnaire")
+        end
       end
     end
 
diff --git a/decidim-meetings/spec/system/meeting_waiting_list_spec.rb b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
new file mode 100644
index 0000000000000..2a332e88d58bb
--- /dev/null
+++ b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
@@ -0,0 +1,185 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Meeting registrations" do
+  include_context "with a component"
+  let(:manifest_name) { "meetings" }
+
+  let!(:questionnaire) { create(:questionnaire) }
+  let!(:question) { create(:questionnaire_question, questionnaire:, position: 0) }
+  let!(:meeting) { create(:meeting, :published, component:, questionnaire:, waitlist_enabled:) }
+  let!(:user) { create(:user, :confirmed, organization:) }
+
+  let(:registrations_enabled) { true }
+  let(:registration_form_enabled) { false }
+  let(:available_slots) { 10 }
+  let(:waitlist_enabled) { true }
+  let(:registration_terms) do
+    {
+      en: "A legal text",
+      es: "Un texto legal",
+      ca: "Un text legal"
+    }
+  end
+
+  def visit_meeting
+    visit resource_locator(meeting).path
+  end
+
+  def questionnaire_waitlist_public_path
+    Decidim::EngineRouter.main_proxy(component).join_waitlist_meeting_registration_path(meeting_id: meeting.id)
+  end
+
+  before do
+    stub_geocoding_coordinates([meeting.latitude, meeting.longitude])
+    meeting.update!(
+      registrations_enabled:,
+      registration_form_enabled:,
+      available_slots:,
+      registration_terms:
+    )
+  end
+
+  context "when the registration form is enabled" do
+    let(:registration_form_enabled) { true }
+
+    context "when the waitlist is enabled" do
+      context "when the meeting has available slots" do
+        before do
+          visit_meeting
+          login_as user, scope: :user
+        end
+
+        it "doesn't show the join waitlist button" do
+          expect(page).to have_no_content("Join the waiting list")
+        end
+      end
+
+      context "when the meeting has no available slots" do
+        before do
+          create_list(:registration, available_slots, meeting: meeting)
+        end
+
+        context "when the user is not logged in" do
+          before do
+            visit_meeting
+          end
+
+          it "shows the join waitlist button" do
+            expect(page).to have_content("Join the waiting list")
+          end
+
+          it "shows the login modal when clicking the join waitlist button" do
+            click_on "Join the waiting list"
+            expect(page).to have_css("#loginModal", visible: :visible)
+            expect(page).to have_content("Please log in")
+          end
+        end
+
+        context "when the user is logged in" do
+          before do
+            login_as user, scope: :user
+            visit_meeting
+          end
+
+          it "shows the join waitlist button" do
+            expect(page).to have_content("Join the waiting list")
+          end
+
+          it "shows the join waitlist registration form when clicking the join waitlist button" do
+            click_on "Join the waiting list"
+            expect(page).to have_i18n_content(questionnaire.title)
+            expect(page).to have_i18n_content(questionnaire.description, strip_tags: true)
+            expect(page).to have_i18n_content(question.body)
+            expect(page).to have_css(".form.answer-questionnaire")
+          end
+        end
+      end
+    end
+
+    context "when the waitlist is disabled" do
+      let(:waitlist_enabled) { false }
+
+      context "when the meeting has available slots" do
+        before do
+          visit_meeting
+          login_as user, scope: :user
+        end
+
+        it "doesn't show the join waitlist button" do
+          expect(page).to have_no_content("Join the waiting list")
+        end
+      end
+
+      context "when the meeting has no available slots" do
+        before do
+          create_list(:registration, available_slots, meeting: meeting)
+        end
+
+        context "when the user is not logged in" do
+          before do
+            visit_meeting
+          end
+
+          it "doesn't show the join waitlist button" do
+            expect(page).to have_no_content("Join the waiting list")
+          end
+        end
+
+        context "when the user is logged in" do
+          before do
+            login_as user, scope: :user
+            visit_meeting
+          end
+
+          it "doesn't show the join waitlist button" do
+            expect(page).to have_no_content("Join the waiting list")
+          end
+        end
+      end
+    end
+  end
+
+  context "when the registration form is disabled" do
+    context "when the waitlist is enabled" do
+      context "when the meeting has available slots" do
+        before do
+          visit_meeting
+          login_as user, scope: :user
+        end
+
+        it "doesn't show the join waitlist button" do
+          expect(page).to have_no_content("Join the waiting list")
+        end
+      end
+
+      context "when the meeting has no available slots" do
+        before do
+          create_list(:registration, available_slots, meeting: meeting)
+          login_as user, scope: :user
+          visit_meeting
+        end
+
+        it "shows the join waitlist button" do
+          expect(page).to have_content("Join the waiting list")
+        end
+
+        it "can join the waitlist" do
+          click_on "Join the waiting list"
+
+          within "#meeting-waitlist-confirm-#{meeting.id}" do
+            expect(page).to have_content "Join the waiting list"
+            click_on "Confirm"
+          end
+
+          expect(page).to have_content("You have joined the waiting list successfully.")
+        end
+      end
+    end
+
+    context "when the waitlist is disabled" do
+      let(:waitlist_enabled) { false }
+    end
+  end
+end

From 4ea96951a0809ad9e948e90d1286ff9fe585e791 Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Wed, 26 Feb 2025 22:03:13 +0100
Subject: [PATCH 09/14] add tests, fix email notification

---
 .../registration_modal.erb                    |  2 +-
 .../decidim/meetings/join_waitlist.rb         |  1 -
 .../decidim/meetings/leave_meeting.rb         | 10 ++-
 .../meetings/registrations_controller.rb      |  6 +-
 .../models/decidim/meetings/registration.rb   |  2 -
 decidim-meetings/config/locales/en.yml        |  2 +
 .../spec/system/meeting_waiting_list_spec.rb  | 87 ++++++++++++++++---
 7 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb
index e7894b22818ff..87f4ce6948368 100644
--- a/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb
@@ -3,7 +3,7 @@
   <%= decidim_form_for(registration_form, url: model.has_available_slots? ? meeting_registration_path(model) : join_waitlist_meeting_registration_path(model), method: :post) do |form| %>
     <div data-dialog-container>
       <%= icon "login-circle-line" %>
-      <h2 id="dialog-title-meeting-registration-confirm-<%= model.id %>" data-dialog-title><%= t(model.has_available_slots? ? "join" : "join_waitlist", scope: "decidim.meetings.meetings.show")  %></h2>
+      <h2 id="dialog-title-meeting-registration-confirm-<%= model.id %>" data-dialog-title><%= t(model.has_available_slots? ? "join" : "join_waitlist", scope: "decidim.meetings.meetings.show") %></h2>
       <div>
 
         <div class="form__wrapper">
diff --git a/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb b/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb
index 84746211e4229..bc7fd301af3c7 100644
--- a/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/join_waitlist.rb
@@ -44,7 +44,6 @@ def create_waitlist_entry
         )
       end
 
-      # TODO: Implement this method
       def send_waitlist_notification
         Decidim::EventsManager.publish(
           event: "decidim.events.meetings.meeting_waitlist_added",
diff --git a/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb
index 67c963ae51079..5873555f487d3 100644
--- a/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/leave_meeting.rb
@@ -52,6 +52,10 @@ def decrement_score
         Decidim::Gamification.decrement_score(@user, :attended_meetings)
       end
 
+      def send_email_confirmation(registration, user, meeting)
+        Decidim::Meetings::RegistrationMailer.confirmation(user, meeting, registration).deliver_later
+      end
+
       def move_from_waitlist!
         return unless @meeting.remaining_slots.positive?
 
@@ -59,12 +63,16 @@ def move_from_waitlist!
         return unless on_waiting_list_user
 
         on_waiting_list_user.update!(status: :registered)
+        send_email_confirmation(on_waiting_list_user, on_waiting_list_user.user, @meeting)
 
         Decidim::EventsManager.publish(
           event: "decidim.events.meetings.meeting_registration_confirmed",
           event_class: Decidim::Meetings::MeetingRegistrationNotificationEvent,
           resource: @meeting,
-          affected_users: [on_waiting_list_user.user]
+          affected_users: [on_waiting_list_user.user],
+          extra: {
+            registration_code: on_waiting_list_user.code
+          }
         )
       end
     end
diff --git a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
index 5be93bce8b126..228d09c429b28 100644
--- a/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
+++ b/decidim-meetings/app/controllers/decidim/meetings/registrations_controller.rb
@@ -70,15 +70,15 @@ def join_waitlist
 
       def destroy
         enforce_permission_to(:leave, :meeting, meeting:)
-
+        status = registration.status
         LeaveMeeting.call(meeting, current_user) do
           on(:ok) do
-            flash[:notice] = I18n.t("registrations.destroy.#{registration.status}.success", scope: "decidim.meetings")
+            flash[:notice] = I18n.t("registrations.destroy.#{status}.success", scope: "decidim.meetings")
             redirect_after_path
           end
 
           on(:invalid) do
-            flash.now[:alert] = I18n.t("registrations.destroy.#{registration.status}.invalid", scope: "decidim.meetings")
+            flash.now[:alert] = I18n.t("registrations.destroy.#{status}.invalid", scope: "decidim.meetings")
             redirect_after_path
           end
         end
diff --git a/decidim-meetings/app/models/decidim/meetings/registration.rb b/decidim-meetings/app/models/decidim/meetings/registration.rb
index f19d08a56badf..a5e647ee68ea6 100644
--- a/decidim-meetings/app/models/decidim/meetings/registration.rb
+++ b/decidim-meetings/app/models/decidim/meetings/registration.rb
@@ -45,8 +45,6 @@ def validated?
       private
 
       def generate_code
-        return if on_waiting_list?
-
         self[:code] ||= calculate_registration_code
       end
 
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 36a30b4f2d802..5687ee81672cb 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -231,6 +231,8 @@ en:
           email_outro: You have received this notification because you are following the "%{resource_title}" meeting. You can unfollow it from the previous link.
           email_subject: The "%{resource_title}" meeting was updated
           notification_title: The <a href="%{resource_path}">%{resource_title}</a> meeting was updated.
+        meeting_waitlist_added:
+          notification_title: You have been added to the waiting list for the <a href="%{resource_url}">%{resource_title}</a> meeting.
         registration_code_validated:
           email_intro: Your registration code "%{registration_code}" for the "%{resource_title}" meeting has been validated.
           email_outro: You have received this notification because your registration code for the "%{resource_title}" meeting has been validated.
diff --git a/decidim-meetings/spec/system/meeting_waiting_list_spec.rb b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
index 2a332e88d58bb..8c8ca686feecc 100644
--- a/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
+++ b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
@@ -2,7 +2,7 @@
 
 require "spec_helper"
 
-describe "Meeting registrations" do
+describe "Meeting waiting list" do
   include_context "with a component"
   let(:manifest_name) { "meetings" }
 
@@ -10,7 +10,6 @@
   let!(:question) { create(:questionnaire_question, questionnaire:, position: 0) }
   let!(:meeting) { create(:meeting, :published, component:, questionnaire:, waitlist_enabled:) }
   let!(:user) { create(:user, :confirmed, organization:) }
-
   let(:registrations_enabled) { true }
   let(:registration_form_enabled) { false }
   let(:available_slots) { 10 }
@@ -27,10 +26,6 @@ def visit_meeting
     visit resource_locator(meeting).path
   end
 
-  def questionnaire_waitlist_public_path
-    Decidim::EngineRouter.main_proxy(component).join_waitlist_meeting_registration_path(meeting_id: meeting.id)
-  end
-
   before do
     stub_geocoding_coordinates([meeting.latitude, meeting.longitude])
     meeting.update!(
@@ -51,7 +46,7 @@ def questionnaire_waitlist_public_path
           login_as user, scope: :user
         end
 
-        it "doesn't show the join waitlist button" do
+        it "does not show the join waitlist button" do
           expect(page).to have_no_content("Join the waiting list")
         end
       end
@@ -94,6 +89,16 @@ def questionnaire_waitlist_public_path
             expect(page).to have_i18n_content(question.body)
             expect(page).to have_css(".form.answer-questionnaire")
           end
+
+          it "can join the waitlist" do
+            click_on "Join the waiting list"
+            fill_in question.body["en"], with: "My first answer"
+            check "questionnaire_tos_agreement"
+            accept_confirm do
+              click_on "Submit"
+            end
+            expect(page).to have_content("You have joined the waiting list successfully.")
+          end
         end
       end
     end
@@ -107,7 +112,7 @@ def questionnaire_waitlist_public_path
           login_as user, scope: :user
         end
 
-        it "doesn't show the join waitlist button" do
+        it "does not show the join waitlist button" do
           expect(page).to have_no_content("Join the waiting list")
         end
       end
@@ -122,7 +127,7 @@ def questionnaire_waitlist_public_path
             visit_meeting
           end
 
-          it "doesn't show the join waitlist button" do
+          it "does not show the join waitlist button" do
             expect(page).to have_no_content("Join the waiting list")
           end
         end
@@ -133,7 +138,7 @@ def questionnaire_waitlist_public_path
             visit_meeting
           end
 
-          it "doesn't show the join waitlist button" do
+          it "does not show the join waitlist button" do
             expect(page).to have_no_content("Join the waiting list")
           end
         end
@@ -149,7 +154,7 @@ def questionnaire_waitlist_public_path
           login_as user, scope: :user
         end
 
-        it "doesn't show the join waitlist button" do
+        it "does not show the join waitlist button" do
           expect(page).to have_no_content("Join the waiting list")
         end
       end
@@ -180,6 +185,66 @@ def questionnaire_waitlist_public_path
 
     context "when the waitlist is disabled" do
       let(:waitlist_enabled) { false }
+
+      context "when the meeting has available slots" do
+        before do
+          visit_meeting
+          login_as user, scope: :user
+        end
+
+        it "does not show the join waitlist button" do
+          expect(page).to have_no_content("Join the waiting list")
+        end
+      end
+
+      context "when the meeting has no available slots" do
+        before do
+          create_list(:registration, available_slots, meeting: meeting)
+          login_as user, scope: :user
+          visit_meeting
+        end
+
+        it "does not show the join waitlist button" do
+          expect(page).to have_no_content("Join the waiting list")
+        end
+      end
+    end
+  end
+
+  def leave_meeting(user)
+    login_as user, scope: :user
+    visit_meeting
+    click_on "Cancel your registration"
+    logout :user
+  end
+
+  context "when the meeting is full and a user cancels their registration" do
+    context "and there are users on the waiting list" do
+      let!(:registrations) { create_list(:registration, available_slots, meeting: meeting) }
+      let(:users_on_waitlist) { create_list(:user, 5, :confirmed, organization:) }
+      let(:first_waitlist_user) { users_on_waitlist.first }
+
+      let!(:waitlist_entries) do
+        users_on_waitlist.map.with_index do |user, index|
+          create(:registration, meeting: meeting, user: user, status: "on_waiting_list", created_at: Time.current - index.minutes)
+        end
+      end
+
+      let(:earliest_waitlist_entry) { waitlist_entries.min_by(&:created_at) }
+      let(:earliest_waitlist_user) { earliest_waitlist_entry.user }
+
+      before do
+        perform_enqueued_jobs { Decidim::Meetings::LeaveMeeting.call(meeting, registrations.first.user) }
+        login_as earliest_waitlist_user, scope: :user
+      end
+
+      it "displays the registration confirmation" do
+        visit_meeting
+        email = last_email
+        expect(page).to have_content("Your registration code")
+        expect(email.subject).to eq("Your meeting's registration has been confirmed")
+        expect(email.to).to eq([earliest_waitlist_user.email])
+      end
     end
   end
 end

From 5a11501c9c00d3b49a9556e4e2bf0741f0cb30ba Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Wed, 26 Feb 2025 22:14:38 +0100
Subject: [PATCH 10/14] fix locale

---
 config/i18n-tasks.yml                  | 7 +++++++
 decidim-meetings/config/locales/en.yml | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index c659d61fc1dd0..fd824e5e21cac 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -318,6 +318,13 @@ ignore_unused:
   - decidim.meetings.meetings.show.withdraw_btn_hint
   - decidim.meetings.meetings.show.withdraw_confirmation_html
   - decidim.meetings.meetings.show.withdraw_meeting
+  - decidim.meetings.meetings.show.cancel_waitlist
+  - decidim.meetings.meetings.show.join_waitlist
+  - decidim.meetings.meetings.show.leave
+  - decidim.meetings.meetings.show.registration_confirmation
+  - decidim.meetings.meetings.show.registration_title
+  - decidim.meetings.meetings.show.waitlist_confirmation
+  - decidim.meetings.meetings.show.waitlist_title
   - decidim.proposals.proposals.show.withdraw_btn_hint
   - decidim.proposals.proposals.show.withdraw_confirmation_html
   - decidim.proposals.proposals.show.withdraw_proposal
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 5687ee81672cb..29fb053e860fb 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -43,6 +43,7 @@ en:
         title: Title
         transparent: Transparent
         type_of_meeting: Type
+        waitlist_enabled: Waitlist enabled
       meeting_agenda:
         title: Title
         visible: Visible
@@ -433,7 +434,6 @@ en:
             reserved_slots_help: Leave it to 0 if you do not have reserved slots.
             reserved_slots_less_than: Must be less than or equal to %{count}
             title: Registrations
-            waitlist_enabled: Waitlist enabled
             waitlist_enabled_help: If enabled, the user will be able to join the waitlist when the available slots are full.
           update:
             invalid: There was a problem saving the registration settings.

From e46deee8838df4837199022567c5051dbc495498 Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Wed, 5 Mar 2025 21:41:08 +0100
Subject: [PATCH 11/14] add text

---
 .../views/decidim/meetings/meetings/_meeting_aside.html.erb | 1 +
 decidim-meetings/config/locales/en.yml                      | 1 +
 decidim-meetings/spec/system/meeting_waiting_list_spec.rb   | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
index 466cf77f651b2..9931947822326 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
@@ -7,6 +7,7 @@
 <% end %>
 
 <% if meeting.waitlist_enabled? && !meeting.has_available_slots? && meeting.can_be_joined_by?(current_user) %>
+  <%= cell("decidim/announcement", t("waitlist_info", scope: "decidim.meetings.meetings.show")) %>
   <section class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons" data-sticky-buttons>
     <%= cell "decidim/meetings/join_waitlist_button", meeting, hide_modal: local_assigns[:hide_modal] %>
   </section>
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 29fb053e860fb..1626a12fbea6b 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -622,6 +622,7 @@ en:
             other: "%{count} slots remaining"
           visit_finished: View past meeting
           waitlist_confirmation: Are you sure you want to cancel your waitlist registration for this meeting?
+          waitlist_info: You have joined the waiting list for this meeting. If a spot became available you will be automatically registered and you will receive a notification.
           waitlist_title: Cancel your waitlist registration
           withdraw_btn_hint: You can withdraw your meeting if you change your mind. The meeting is not deleted, it will appear in the list of withdrawn meetings.
           withdraw_confirmation_html: Are you sure you want to withdraw this meeting?<br><br><strong>This action cannot be cancelled!</strong>
diff --git a/decidim-meetings/spec/system/meeting_waiting_list_spec.rb b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
index 8c8ca686feecc..c725c85e0b985 100644
--- a/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
+++ b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
@@ -63,6 +63,7 @@ def visit_meeting
 
           it "shows the join waitlist button" do
             expect(page).to have_content("Join the waiting list")
+            expect(page).to have_content("You have joined the waiting list for this meeting.")
           end
 
           it "shows the login modal when clicking the join waitlist button" do
@@ -114,6 +115,7 @@ def visit_meeting
 
         it "does not show the join waitlist button" do
           expect(page).to have_no_content("Join the waiting list")
+          expect(page).to have_no_content("You have joined the waiting list for this meeting.")
         end
       end
 
@@ -129,6 +131,7 @@ def visit_meeting
 
           it "does not show the join waitlist button" do
             expect(page).to have_no_content("Join the waiting list")
+            expect(page).to have_no_content("You have joined the waiting list for this meeting.")
           end
         end
 
@@ -140,6 +143,7 @@ def visit_meeting
 
           it "does not show the join waitlist button" do
             expect(page).to have_no_content("Join the waiting list")
+            expect(page).to have_no_content("You have joined the waiting list for this meeting.")
           end
         end
       end
@@ -156,6 +160,7 @@ def visit_meeting
 
         it "does not show the join waitlist button" do
           expect(page).to have_no_content("Join the waiting list")
+          expect(page).to have_no_content("You have joined the waiting list for this meeting.")
         end
       end
 
@@ -168,6 +173,7 @@ def visit_meeting
 
         it "shows the join waitlist button" do
           expect(page).to have_content("Join the waiting list")
+          expect(page).to have_content("You have joined the waiting list for this meeting.")
         end
 
         it "can join the waitlist" do

From 1604f62a5d81a8c414b6187c77802ab5006dae50 Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Thu, 6 Mar 2025 10:36:04 +0100
Subject: [PATCH 12/14] fix

---
 .../meetings/cancel_registration_meeting_button/show.erb     | 1 +
 .../meetings/cancel_registration_meeting_button_cell.rb      | 4 ++++
 .../views/decidim/meetings/meetings/_meeting_aside.html.erb  | 1 -
 decidim-meetings/spec/system/meeting_waiting_list_spec.rb    | 5 +++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb
index d0bc2bc1482ad..ecef0e2c772ed 100644
--- a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb
+++ b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb
@@ -1,3 +1,4 @@
+<%= waiting_list_info %>
 <% unless options[:hide_modal] %>
   <%= render :cancelation_modal %>
 <% end %>
diff --git a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
index a0e89a4f32635..28103c9183268 100644
--- a/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
+++ b/decidim-meetings/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb
@@ -13,6 +13,10 @@ def show
         render
       end
 
+      def waiting_list_info
+        cell("decidim/announcement", t("waitlist_info", scope: "decidim.meetings.meetings.show")) if registration_status == "on_waiting_list"
+      end
+
       private
 
       def current_component
diff --git a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
index 9931947822326..466cf77f651b2 100644
--- a/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
+++ b/decidim-meetings/app/views/decidim/meetings/meetings/_meeting_aside.html.erb
@@ -7,7 +7,6 @@
 <% end %>
 
 <% if meeting.waitlist_enabled? && !meeting.has_available_slots? && meeting.can_be_joined_by?(current_user) %>
-  <%= cell("decidim/announcement", t("waitlist_info", scope: "decidim.meetings.meetings.show")) %>
   <section class="layout-aside__section layout-aside__buttons layout-aside__ctas-buttons" data-sticky-buttons>
     <%= cell "decidim/meetings/join_waitlist_button", meeting, hide_modal: local_assigns[:hide_modal] %>
   </section>
diff --git a/decidim-meetings/spec/system/meeting_waiting_list_spec.rb b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
index c725c85e0b985..fd522ec31a864 100644
--- a/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
+++ b/decidim-meetings/spec/system/meeting_waiting_list_spec.rb
@@ -63,7 +63,7 @@ def visit_meeting
 
           it "shows the join waitlist button" do
             expect(page).to have_content("Join the waiting list")
-            expect(page).to have_content("You have joined the waiting list for this meeting.")
+            expect(page).to have_no_content("You have joined the waiting list for this meeting.")
           end
 
           it "shows the login modal when clicking the join waitlist button" do
@@ -173,7 +173,7 @@ def visit_meeting
 
         it "shows the join waitlist button" do
           expect(page).to have_content("Join the waiting list")
-          expect(page).to have_content("You have joined the waiting list for this meeting.")
+          expect(page).to have_no_content("You have joined the waiting list for this meeting.")
         end
 
         it "can join the waitlist" do
@@ -185,6 +185,7 @@ def visit_meeting
           end
 
           expect(page).to have_content("You have joined the waiting list successfully.")
+          expect(page).to have_content("You have joined the waiting list for this meeting.")
         end
       end
     end

From e7aad43c18fa8f410a2c85216f1219ff84e1d599 Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Fri, 7 Mar 2025 09:25:42 +0100
Subject: [PATCH 13/14] copy meeting

---
 .../app/commands/decidim/meetings/admin/copy_meeting.rb         | 1 +
 .../spec/commands/admin/update_registrations_spec.rb            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/decidim-meetings/app/commands/decidim/meetings/admin/copy_meeting.rb b/decidim-meetings/app/commands/decidim/meetings/admin/copy_meeting.rb
index c4d9e687bed7f..4e00c644d86e1 100644
--- a/decidim-meetings/app/commands/decidim/meetings/admin/copy_meeting.rb
+++ b/decidim-meetings/app/commands/decidim/meetings/admin/copy_meeting.rb
@@ -78,6 +78,7 @@ def fields_from_meeting
             available_slots: meeting.available_slots,
             registration_terms: meeting.registration_terms,
             reserved_slots: meeting.reserved_slots,
+            waitlist_enabled: meeting.waitlist_enabled,
             customize_registration_email: meeting.customize_registration_email,
             registration_form_enabled: meeting.registration_form_enabled,
             registration_email_custom_content: meeting.registration_email_custom_content
diff --git a/decidim-meetings/spec/commands/admin/update_registrations_spec.rb b/decidim-meetings/spec/commands/admin/update_registrations_spec.rb
index e841c8373a65f..0567d50677732 100644
--- a/decidim-meetings/spec/commands/admin/update_registrations_spec.rb
+++ b/decidim-meetings/spec/commands/admin/update_registrations_spec.rb
@@ -64,7 +64,7 @@ module Decidim::Meetings
 
     describe "events" do
       let(:user) { create(:user, :confirmed, organization: meeting.organization) }
-      let!(:follow) { create(:follow, followable: meeting, user: user) }
+      let!(:follow) { create(:follow, followable: meeting, user:) }
 
       context "when registrations are enabled" do
         it "notifies the change" do

From 5989836ab81131cc2b2411a034f2b0f62e212d5d Mon Sep 17 00:00:00 2001
From: Anna Topalidi <t.opalidisanna@gmail.com>
Date: Mon, 10 Mar 2025 12:53:56 +0100
Subject: [PATCH 14/14] change text

---
 decidim-meetings/config/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 1626a12fbea6b..4ab076bcbab2b 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -622,7 +622,7 @@ en:
             other: "%{count} slots remaining"
           visit_finished: View past meeting
           waitlist_confirmation: Are you sure you want to cancel your waitlist registration for this meeting?
-          waitlist_info: You have joined the waiting list for this meeting. If a spot became available you will be automatically registered and you will receive a notification.
+          waitlist_info: You have joined the waiting list for this meeting. If a spot for this meeting becomes available, you will register automatically and receive a notification.
           waitlist_title: Cancel your waitlist registration
           withdraw_btn_hint: You can withdraw your meeting if you change your mind. The meeting is not deleted, it will appear in the list of withdrawn meetings.
           withdraw_confirmation_html: Are you sure you want to withdraw this meeting?<br><br><strong>This action cannot be cancelled!</strong>