DEV: full calendar v6 #33737

jjaffeux · 2025-07-21T15:28:42Z

This commit makes the following changes:

uses fullcalendar 6
replaces the server generated upcoming dates for recurring events with a frontend implementation of the RRULE standard (using the fullcalendar RRULE plugin)
displays a preview of the event on click on the upcoming events calendar

jjaffeux · 2025-08-18T18:08:00Z

app/assets/javascripts/discourse/app/components/modal/download-calendar.gjs

@@ -30,7 +30,7 @@ export default class DownloadCalendar extends Component {
        this.args.model.calendar.title,
        this.args.model.calendar.dates,
        {
-          recurrenceRule: this.args.model.calendar.recurrenceRule,


just using the same rrule name everywhere

jjaffeux · 2025-08-18T18:08:49Z

plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb

      render json:
               ActiveModel::ArraySerializer.new(
                 @events,
-                 each_serializer: serializer,
+                 each_serializer: BasicEventSerializer,


always using the same serializer for lists, technically that could break stuff, but I didn't find anything

I think this has potential to strip fields that our frontend isn't using, but customers are relying on externally (not sure, I didn't compare field-by-field yet). Context from Meta: /t/-/287566/14

jjaffeux · 2025-08-18T18:09:55Z

plugins/discourse-calendar/app/controllers/discourse_post_event/events_controller.rb

@@ -124,6 +121,8 @@ def filtered_events_params
        :limit,
        :before,
        :attending_user,
+        :before,


we only had before, I added after to be able to have a range

jjaffeux · 2025-08-18T18:10:21Z

plugins/discourse-calendar/app/models/discourse_post_event/event.rb

@@ -59,40 +59,19 @@ def create_or_update_event_date

      return if !starts_at_changed && !ends_at_changed

-      event_dates.update_all(finished_at: Time.current)


this was fixing a bug introduced months ago which was causing recurring events to be marke as finished

jjaffeux · 2025-08-18T18:10:36Z

plugins/discourse-calendar/app/models/discourse_post_event/event.rb

@@ -59,40 +59,19 @@ def create_or_update_event_date

      return if !starts_at_changed && !ends_at_changed

-      event_dates.update_all(finished_at: Time.current)
      set_next_date
    end

    def set_next_date


just a full refactoring of these methods

jjaffeux · 2025-08-18T18:11:20Z

plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb

+    end
+
+    def starts_at
+      # For recurring events, use the original start time to be consistent with rrule


that was a bug we have had for a long time, but now that we use rrule everywhere we can just use the original start

jjaffeux · 2025-08-18T18:11:56Z

...ns/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjs

-          ),
-          this.siteSettings
-        );
+        schedule("afterRender", () => {


without this the dates are not in the DOM yet at this point

jjaffeux · 2025-08-18T18:12:20Z

...ns/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs

-            <Description @description={{@event.description}} />
-            {{#if @event.canUpdateAttendance}}
-              <Status @event={{@event}} />
+    <AsyncContent @asyncData={{this.loadEvent}}>


the biggest change is to make it possible to load an event if not provided as param

jjaffeux · 2025-08-18T18:12:40Z

plugins/discourse-calendar/assets/javascripts/discourse/components/category-calendar.gjs

@@ -0,0 +1,165 @@
+import Component from "@glimmer/component";


this was all in JS/DOM code before, I made it a proper component

jjaffeux · 2025-08-18T18:12:54Z

plugins/discourse-calendar/assets/javascripts/discourse/components/full-calendar.gjs

+  />
+</template>;
+
+export default class FullCalendar extends Component {


same this was all JS/DOM code before

jjaffeux · 2025-08-18T18:13:19Z

plugins/discourse-calendar/assets/stylesheets/common/discourse-calendar.scss

@@ -1,163 +1,9 @@
-.discourse-calendar-wrap {


I removed most styling as things changed too much

jjaffeux · 2025-08-18T18:13:46Z

plugins/discourse-calendar/assets/stylesheets/colors.scss

@@ -12,4 +12,17 @@
      desaturate(lighten($tertiary, 40%), 20%),
      darken($tertiary, 10%)
    )};
+  --fc-border-color: var(--primary-low);


this is where most styling is decided for the full calendar now

jjaffeux · 2025-08-18T18:14:03Z

plugins/discourse-calendar/lib/discourse_post_event/event_finder.rb

@@ -4,85 +4,154 @@ module DiscoursePostEvent
  class EventFinder
    def self.search(user, params = {})
      guardian = Guardian.new(user)
+


refactored the whole file and added few filtering options

jjaffeux · 2025-08-18T18:14:49Z

app/assets/javascripts/discourse/app/static/full-calendar-bundle.js

@@ -2,3 +2,5 @@ export { Calendar } from "@fullcalendar/core";
 export { default as DayGrid } from "@fullcalendar/daygrid";


this file allows to efficiently load the full calendar when needed

martin-brennan

Not sure if this is just my local setup being weird, but the event popover is unstyled:

This is in a topic calendar with this post :

Anyway, looking really excellent man, approving because all my review comments are stylistic kind of ones, and testing is happening already for the UI internally.

plugins/discourse-calendar/app/serializers/discourse_post_event/basic_event_serializer.rb

plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb

plugins/discourse-calendar/assets/javascripts/discourse/components/full-calendar.gjs

plugins/discourse-calendar/assets/javascripts/discourse/components/post-calendar.gjs

martin-brennan · 2025-08-19T05:22:47Z

plugins/discourse-calendar/assets/javascripts/discourse/initializers/discourse-calendar.gjs

+
+      // header is now generated in the component
+      // remove the old header generated when cooking if it exists
+      element.querySelector(".discourse-calendar-header")?.remove?.();


I feel like there can't be many of these in the wild...maybe we mark these posts for rebake in a migration so we can remove this at some point?

Also fine if not, just would be good if we didn't have to keep forever

No it should be good to use const here, const allows mutation, but not reassignement:

> const test = []; > undefined > test.push(1); > 1

plugins/discourse-calendar/assets/javascripts/discourse/initializers/discourse-calendar.gjs

martin-brennan · 2025-08-19T05:26:30Z

plugins/discourse-calendar/config/settings.yml

@@ -47,18 +47,10 @@ discourse_calendar:
    default: 2


Need a DB migration to cleanup all these removed settings from the site_settings table

Ah yes right, thanks.

2799cc0

plugins/discourse-calendar/lib/discourse_post_event/event_finder.rb

jjaffeux · 2025-08-19T12:36:58Z

Not sure if this is just my local setup being weird, but the event popover is unstyled:
This is in a topic calendar with this post : Anyway, looking really excellent man, approving because all my review comments are stylistic kind of ones, and testing is happening already for the UI internally.

I fixed this I think

github-actions bot added i18n PRs which update English locale files or i18n related code discourse-calendar labels Jul 21, 2025

jjaffeux force-pushed the core-full-calendar-6 branch from 55dbfa9 to 1e0ae7c Compare August 12, 2025 07:40

jjaffeux marked this pull request as ready for review August 12, 2025 13:36

jjaffeux force-pushed the core-full-calendar-6 branch from d82141e to 2caa2af Compare August 18, 2025 12:34

jjaffeux commented Aug 18, 2025

View reviewed changes

martin-brennan approved these changes Aug 19, 2025

View reviewed changes

github-actions bot added chat PRs which include a change to Chat plugin migrations-tooling PR which includes changes to migrations tooling discourse-presence styleguide discourse-local-dates discourse-narrative-bot discourse-reactions poll discourse-assign labels Aug 20, 2025

jjaffeux added 3 commits August 26, 2025 10:13

fix month to week

b97632f

better navigation

d03f5a0

pass currentDay

5ec5caa

jjaffeux force-pushed the core-full-calendar-6 branch from ed52080 to 5ec5caa Compare August 26, 2025 08:13

jjaffeux merged commit 361029a into main Aug 26, 2025
16 checks passed

jjaffeux deleted the core-full-calendar-6 branch August 26, 2025 08:35

		@@ -59,40 +59,19 @@ def create_or_update_event_date

		return if !starts_at_changed && !ends_at_changed

		event_dates.update_all(finished_at: Time.current)

		@@ -0,0 +1,165 @@
		import Component from "@glimmer/component";

		@@ -2,3 +2,5 @@ export { Calendar } from "@fullcalendar/core";
		export { default as DayGrid } from "@fullcalendar/daygrid";

DEV: full calendar v6 #33737

DEV: full calendar v6 #33737

Uh oh!

Conversation

jjaffeux commented Jul 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

renato Aug 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

martin-brennan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jjaffeux commented Aug 19, 2025

Uh oh!

Uh oh!

Uh oh!

jjaffeux commented Jul 21, 2025 •

edited

Loading

renato Aug 20, 2025 •

edited

Loading