- <%= form.translated :text_area, :location, help_text: t(".location_help") %>
+
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 1b6e07e1f396f..7388469ded749 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -358,6 +358,8 @@ en:
iframe_embed_type_html: 'Only a few services allow embedding in meeting or live event from the following domains: %{domains}'
location_help: 'Location: message directed to the users implying the spot to meet at'
location_hints_help: 'Location hints: additional info. Example: the floor of the building if it is an in-person meeting, or the meeting password if it is an online meeting with restricted access.'
+ location_pending: In-person/Hybrid, venue to be decided
+ location_pending_help: Select this option if the venue has not been decided yet. The message 'Place will be communicated soon' will be shown on the public page.
online_meeting_url_help: 'Link: allow participants to connect directly to your meeting'
registration_url_help: 'Link: allow participants to go on the external service you are using for registrations'
select_a_meeting_type: Please select a meeting type
@@ -604,6 +606,7 @@ en:
micro_camera_permissions_warning: When you click on the button below, you will be asked for microphone and/or camera permissions, and you will join the videoconference
no_slots_available: No slots available
organizations: Attending organizations
+ pending_address: Place will be communicated soon.
redirect_notice: This meeting is part of another space, so you have been moved to %{current_space_name}.
If you prefer, you can go back to
%{previous_space_name}.
registration_code_help_text: Your registration code
registration_state:
diff --git a/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb b/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb
index 5dca45d71537b..6b6958e8afb69 100644
--- a/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb
@@ -12,6 +12,7 @@ module Decidim::Meetings
let!(:meeting) { create(:meeting, component:, taxonomies: [taxonomy]) }
let(:current_user) { create(:user, :admin, :confirmed, organization:) }
+ let(:location_pending) { false }
let(:address) { "address" }
let(:invalid) { false }
let(:latitude) { 40.1234 }
@@ -32,6 +33,7 @@ module Decidim::Meetings
invalid?: invalid,
title: { en: "title" },
description: { en: "description" },
+ location_pending:,
location: { en: "location" },
location_hints: { en: "location hints" },
start_time:,
@@ -90,6 +92,17 @@ module Decidim::Meetings
expect { subject.call }.to broadcast(:ok)
end
+ context "and location_pending is true" do
+ let(:location_pending) { true }
+
+ it "sets location to nil" do
+ expect { subject.call }.to change(Meeting, :count).by(1)
+ new_meeting = Meeting.last
+ expect(new_meeting.location).to be_empty
+ expect(new_meeting.address).to be_empty
+ end
+ end
+
context "and saves the correct meeting type" do
context "with in_person meeting type" do
let!(:meeting) { create(:meeting, :in_person, component:) }
diff --git a/decidim-meetings/spec/commands/admin/create_meeting_spec.rb b/decidim-meetings/spec/commands/admin/create_meeting_spec.rb
index 932882eb3712c..162972dfa9222 100644
--- a/decidim-meetings/spec/commands/admin/create_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/create_meeting_spec.rb
@@ -10,6 +10,7 @@ module Decidim::Meetings
let(:current_user) { create(:user, :admin, :confirmed, organization:) }
let(:participatory_process) { create(:participatory_process, organization:) }
let(:current_component) { create(:component, participatory_space: participatory_process, manifest_name: "meetings") }
+ let(:location_pending) { false }
let(:address) { "address" }
let(:invalid) { false }
let(:latitude) { 40.1234 }
@@ -54,6 +55,7 @@ module Decidim::Meetings
location_hints: { en: "location_hints" },
start_time:,
end_time: 1.day.from_now + 1.hour,
+ location_pending:,
address:,
latitude:,
longitude:,
@@ -94,6 +96,17 @@ module Decidim::Meetings
expect { subject.call }.to change(Meeting, :count).by(1)
end
+ context "and location_pending is true" do
+ let(:location_pending) { true }
+
+ it "sets location to nil" do
+ expect { subject.call }.to change(Meeting, :count).by(1)
+ new_meeting = Meeting.last
+ expect(new_meeting.location).to be_empty
+ expect(new_meeting.address).to be_empty
+ end
+ end
+
it "sets the taxonomies" do
subject.call
expect(meeting.taxonomizations).to match_array(taxonomizations)
diff --git a/decidim-meetings/spec/commands/admin/update_meeting_spec.rb b/decidim-meetings/spec/commands/admin/update_meeting_spec.rb
index 982e0b2242708..e1baab21532c2 100644
--- a/decidim-meetings/spec/commands/admin/update_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/update_meeting_spec.rb
@@ -8,6 +8,7 @@ module Decidim::Meetings
let(:meeting) { create(:meeting, :published) }
let(:organization) { meeting.component.organization }
+ let(:location_pending) { false }
let(:address) { meeting.address }
let(:invalid) { false }
let(:latitude) { 40.1234 }
@@ -39,6 +40,7 @@ module Decidim::Meetings
invalid?: invalid,
title: { en: "title" },
description: { en: "description" },
+ location_pending:,
location: { en: "location" },
location_hints: { en: "location_hints" },
start_time: 1.day.from_now,
@@ -80,6 +82,16 @@ module Decidim::Meetings
expect(translated(meeting.title)).to eq "title"
end
+ context "and location_pending is true" do
+ let(:location_pending) { true }
+
+ it "sets location to nil" do
+ subject.call
+ expect(translated(meeting.location)).to be_nil
+ expect(meeting.address).to be_empty
+ end
+ end
+
it "sets the taxonomies" do
subject.call
expect(meeting.reload.taxonomies).to eq(taxonomizations.map(&:taxonomy))
@@ -137,6 +149,7 @@ module Decidim::Meetings
invalid?: false,
title:,
description: meeting.description,
+ location_pending:,
location: meeting.location,
location_hints: meeting.location_hints,
start_time:,
diff --git a/decidim-meetings/spec/forms/admin/meeting_form_spec.rb b/decidim-meetings/spec/forms/admin/meeting_form_spec.rb
index c7f4b1caf1f3f..ca4fb3f89da38 100644
--- a/decidim-meetings/spec/forms/admin/meeting_form_spec.rb
+++ b/decidim-meetings/spec/forms/admin/meeting_form_spec.rb
@@ -37,6 +37,7 @@ module Decidim::Meetings
let(:services_attributes) do
services.map(&:attributes)
end
+ let(:location_pending) { false }
let(:address) { "Somewhere over the rainbow" }
let(:latitude) { 40.1234 }
let(:longitude) { 2.1234 }
@@ -59,6 +60,7 @@ module Decidim::Meetings
title_en: title[:en],
description_en: description[:en],
short_description_en: short_description[:en],
+ location_pending:,
location_en: location[:en],
location_hints_en: location_hints[:en],
address:,
@@ -93,6 +95,36 @@ module Decidim::Meetings
it { is_expected.to be_valid }
+ describe "when location_pending enabled" do
+ let(:location_pending) { true }
+
+ it { is_expected.to be_valid }
+
+ context "and location is missing" do
+ let(:location) { { en: nil } }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "and address is missing" do
+ let(:address) { nil }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "and location is present" do
+ let(:location) { { en: "location" } }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "and address is present" do
+ let(:address) { "Somewhere over the rainbow" }
+
+ it { is_expected.to be_valid }
+ end
+ end
+
describe "when title is missing" do
let(:title) { { en: nil } }
diff --git a/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb b/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb
index 7fa5700ea9c95..04a7ccfbde12b 100644
--- a/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb
+++ b/decidim-meetings/spec/system/admin/admin_manages_meetings_spec.rb
@@ -324,6 +324,43 @@
expect(page).to have_content("created the #{translated(attributes[:title])} meeting on the")
end
+ context "when the venue has not been decided yet" do
+ it "creates a new meeting without a location" do
+ click_on "New meeting"
+
+ fill_in_i18n(:meeting_title, "#meeting-title-tabs", **attributes[:title].except("machine_translations"))
+
+ expect(page).to have_no_field("In-person/Hybrid, venue to be decided")
+
+ select "In person", from: :meeting_type_of_meeting
+
+ expect(page).to have_field("In-person/Hybrid, venue to be decided")
+
+ check "In-person/Hybrid, venue to be decided"
+
+ expect(page).to have_no_field(:meeting_location_en)
+ expect(page).to have_no_field(:meeting_address)
+
+ fill_in_i18n_editor(:meeting_description, "#meeting-description-tabs", **attributes[:description].except("machine_translations"))
+ select "Registration disabled", from: :meeting_registration_type
+ fill_in_datepicker :meeting_start_time_date, with: meeting_start_date
+ fill_in_timepicker :meeting_start_time_time, with: meeting_start_time
+ fill_in_datepicker :meeting_end_time_date, with: meeting_end_date
+ fill_in_timepicker :meeting_end_time_time, with: meeting_end_time
+
+ within ".new_meeting" do
+ find("*[type=submit]").click
+ end
+
+ expect(page).to have_admin_callout("successfully")
+
+ new_meeting = Decidim::Meetings::Meeting.last
+ puts "Meeting location: #{new_meeting.location}"
+ expect(new_meeting.location).to be_empty
+ expect(new_meeting.address).to be_empty
+ end
+ end
+
context "when no taxonomy filter is selected" do
let(:taxonomy_filter_ids) { [] }
diff --git a/decidim-meetings/spec/system/meeting_spec.rb b/decidim-meetings/spec/system/meeting_spec.rb
index 1171522c2869b..5e8ccfb093b5c 100644
--- a/decidim-meetings/spec/system/meeting_spec.rb
+++ b/decidim-meetings/spec/system/meeting_spec.rb
@@ -80,6 +80,17 @@ def visit_meeting
expect(page).to have_css("div.meeting__calendar-container .static-map")
end
+
+ context "and meeting has no address" do
+ let(:meeting) { create(:meeting, :published, :with_services, component:, address: "", location: {}) }
+
+ it "hides the map and displays pending address text" do
+ visit_meeting
+
+ expect(page).to have_no_css("div.meeting__calendar-container .static-map")
+ expect(page).to have_content(I18n.t("show.pending_address", scope: "decidim.meetings.meetings"))
+ end
+ end
end
context "and meeting is hybrid" do
@@ -138,6 +149,28 @@ def visit_meeting
end
end
+ context "when the meeting has no address and location" do
+ let(:meeting) { create(:meeting, :published, component:, address: "", location: {}) }
+
+ it "displays the pending address text" do
+ visit_meeting
+
+ expect(page).to have_content(I18n.t("show.pending_address", scope: "decidim.meetings.meetings"))
+ end
+ end
+
+ context "when meeting has an address and location" do
+ let(:meeting) { create(:meeting, :published, component:, address: "123 Main St", location: { "en" => "Central Park" }) }
+
+ it "displays the location and address" do
+ visit_meeting
+
+ expect(page).to have_content("123 Main St")
+ expect(page).to have_content("Central Park")
+ expect(page).to have_no_content(I18n.t("show.pending_address", scope: "decidim.meetings.meetings"))
+ end
+ end
+
context "when user is logged and session is about to timeout" do
before do
allow(Decidim.config).to receive(:expire_session_after).and_return(2.minutes)