A platform for community discussion. Free, open, simple.
FIX: Preserve subfolder base path in calendar event popup link (#40515)
Alan Guo Xiang Tan75c1f1789dfc
diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjsindex 3ded821b68f..f1443bef5a2 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs@@ -7,6 +7,7 @@ import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";+import getURL from "discourse/lib/get-url";import DAsyncContent from "discourse/ui-kit/d-async-content";import DButton from "discourse/ui-kit/d-button";import dIcon from "discourse/ui-kit/helpers/d-icon";@@ -214,7 +215,7 @@ export default class DiscoursePostEvent extends Component {<span class="name">{{#if @linkToPost}}<a- href={{event.post.url}}+ href={{getURL event.post.url}}rel="noopener noreferrer">{{dReplaceEmoji this.eventName}}</a>{{else}}diff --git a/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/post_event.rb b/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/post_event.rbindex 18d95c9ce4a..c061d897f4c 100644--- a/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/post_event.rb+++ b/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/post_event.rb@@ -76,6 +76,10 @@ module PageObjectsselfend+ def has_title_link_href?(href)+ has_css?(".event-info .name a[href='#{href}']")+ end+def has_location?(text)has_css?(".event-location", text:)enddiff --git a/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/upcoming_events.rb b/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/upcoming_events.rbindex 3d1e394d96e..45d805d3cfb 100644--- a/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/upcoming_events.rb+++ b/plugins/discourse-calendar/spec/system/page_objects/discourse_calendar/upcoming_events.rb@@ -4,8 +4,8 @@ module PageObjectsmodule Pagesmodule DiscourseCalendarclass UpcomingEvents < PageObjects::Pages::Base- def visit- super("/upcoming-events")+ def visit(prefix = "")+ super("#{prefix}/upcoming-events")enddef nextdiff --git a/plugins/discourse-calendar/spec/system/upcoming_events_spec.rb b/plugins/discourse-calendar/spec/system/upcoming_events_spec.rbindex 2c5002c4be7..46fc6c5455e 100644--- a/plugins/discourse-calendar/spec/system/upcoming_events_spec.rb+++ b/plugins/discourse-calendar/spec/system/upcoming_events_spec.rb@@ -39,6 +39,8 @@ describe "Upcoming Events" doit "filters non-recurring goings out of future occurrences",time: Time.utc(2026, 5, 12, 12, 0) do+ set_subfolder "/discuss"+post =create_post(user: admin,@@ -55,12 +57,13 @@ describe "Upcoming Events" do)DiscoursePostEvent::Invitee.create_attendance!(going_once_user.id, event.id, :going)- upcoming_events.visit+ upcoming_events.visit("/discuss")upcoming_events.click_event_on("2026-05-14")expect(post_event_page).to have_going_count(2)expect(post_event_page).to have_invitee_avatar(going_recurring_user.username)expect(post_event_page).to have_invitee_avatar(going_once_user.username)+ expect(post_event_page).to have_title_link_href(post.relative_url)post_event_page.close_popupupcoming_events.click_event_on("2026-05-21")