DEV: rename Discourse Calendar to Discourse Events (#42021)

Moves the plugin directory and associated files, along with updating
various import references.
This commit is contained in:
David Battersby
2026-08-12 11:34:15 +04:00
committed by GitHub
parent e971bdff54
commit 629c919eb2
958 changed files with 287 additions and 145 deletions
+2 -2
View File
@@ -106,9 +106,9 @@ discourse-gamification:
- changed-files: - changed-files:
- any-glob-to-any-file: plugins/discourse-gamification/**/* - any-glob-to-any-file: plugins/discourse-gamification/**/*
discourse-calendar: discourse-events:
- changed-files: - changed-files:
- any-glob-to-any-file: plugins/discourse-calendar/**/* - any-glob-to-any-file: plugins/discourse-events/**/*
discourse-policy: discourse-policy:
- changed-files: - changed-files:
+1 -1
View File
@@ -64,7 +64,7 @@
!/plugins/discourse-subscriptions !/plugins/discourse-subscriptions
!/plugins/discourse-captcha !/plugins/discourse-captcha
!/plugins/discourse-gamification !/plugins/discourse-gamification
!/plugins/discourse-calendar !/plugins/discourse-events
!/plugins/discourse-policy !/plugins/discourse-policy
!/plugins/discourse-github !/plugins/discourse-github
!/plugins/discourse-adplugin !/plugins/discourse-adplugin
@@ -113,7 +113,7 @@ Current examples:
- Core table and empty list: `frontend/discourse/admin/templates/admin-permalinks/index.gjs` - Core table and empty list: `frontend/discourse/admin/templates/admin-permalinks/index.gjs`
- Plugin table: `plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs` - Plugin table: `plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs`
- Toggle rows: `plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list-item.gjs` - Toggle rows: `plugins/discourse-events/assets/javascripts/discourse/components/admin-holidays-list-item.gjs`
## Empty lists ## Empty lists
+1 -1
View File
@@ -1,3 +1,3 @@
--print-width=100 --print-width=100
--plugins=plugin/trailing_comma,plugin/disable_auto_ternary --plugins=plugin/trailing_comma,plugin/disable_auto_ternary
--ignore-files=plugins/discourse-calendar/vendor/* --ignore-files=plugins/discourse-events/vendor/*
+1 -1
View File
@@ -10,7 +10,7 @@
"discourse-bbcode", "discourse-bbcode",
"discourse-bbcode-color", "discourse-bbcode-color",
"discourse-cakeday", "discourse-cakeday",
"discourse-calendar", "discourse-events",
"discourse-categories-suppressed", "discourse-categories-suppressed",
"discourse-category-experts", "discourse-category-experts",
"discourse-characters-required", "discourse-characters-required",
@@ -134,7 +134,7 @@ No arguments passed to this event.
### calendar ### calendar
#### calendar:create-invitee-status [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L70) #### calendar:create-invitee-status [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L70)
| Position | Argument | Type | Always Present | Description | | Position | Argument | Type | Always Present | Description |
| -------- | ----------------- | -------- | -------------- | ----------- | | -------- | ----------------- | -------- | -------------- | ----------- |
@@ -142,7 +142,7 @@ No arguments passed to this event.
| - | objectArg1.status | variable | True | - | | - | objectArg1.status | variable | True | - |
| - | objectArg1.postId | property | True | - | | - | objectArg1.postId | property | True | - |
#### calendar:invitee-left-event [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L42) #### calendar:invitee-left-event [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L42)
| Position | Argument | Type | Always Present | Description | | Position | Argument | Type | Always Present | Description |
| -------- | ------------------ | -------- | -------------- | ----------- | | -------- | ------------------ | -------- | -------------- | ----------- |
@@ -150,7 +150,7 @@ No arguments passed to this event.
| - | objectArg1.invitee | variable | True | - | | - | objectArg1.invitee | variable | True | - |
| - | objectArg1.postId | property | True | - | | - | objectArg1.postId | property | True | - |
#### calendar:update-invitee-status [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L56) #### calendar:update-invitee-status [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/assets/javascripts/discourse/components/discourse-post-event/status.gjs#L56)
| Position | Argument | Type | Always Present | Description | | Position | Argument | Type | Always Present | Description |
| -------- | ----------------- | -------- | -------------- | ----------- | | -------- | ----------------- | -------- | -------------- | ----------- |
@@ -1050,70 +1050,70 @@ No arguments passed to this event.
| - | objectArg1.currentRouteName | property | - | | - | objectArg1.currentRouteName | property | - |
| - | objectArg1.replacedOnlyQueryParams | variable | - | | - | objectArg1.replacedOnlyQueryParams | variable | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#37 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L37) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#37 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L37)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
| 1 | objectArg1 | object | - | | 1 | objectArg1 | object | - |
| - | objectArg1.url | string | - | | - | objectArg1.url | string | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#53 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L53) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#53 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L53)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
| 1 | objectArg1 | object | - | | 1 | objectArg1 | object | - |
| - | objectArg1.url | string | - | | - | objectArg1.url | string | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#93 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L93) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#93 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L93)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
| 1 | objectArg1 | object | - | | 1 | objectArg1 | object | - |
| - | objectArg1.url | string | - | | - | objectArg1.url | string | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#124 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L124) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#124 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L124)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
| 1 | objectArg1 | object | - | | 1 | objectArg1 | object | - |
| - | objectArg1.url | string | - | | - | objectArg1.url | string | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#141 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L141) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#141 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L141)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
| 1 | objectArg1 | object | - | | 1 | objectArg1 | object | - |
| - | objectArg1.url | string | - | | - | objectArg1.url | string | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#153 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L153) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#153 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L153)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
| 1 | objectArg1 | object | - | | 1 | objectArg1 | object | - |
| - | objectArg1.url | string | - | | - | objectArg1.url | string | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#172 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L172) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#172 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L172)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
| 1 | objectArg1 | object | - | | 1 | objectArg1 | object | - |
| - | objectArg1.url | string | - | | - | objectArg1.url | string | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#201 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L201) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#201 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L201)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
| 1 | objectArg1 | object | - | | 1 | objectArg1 | object | - |
| - | objectArg1.url | string | - | | - | objectArg1.url | string | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#218 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L218) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#218 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L218)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
| 1 | objectArg1 | object | - | | 1 | objectArg1 | object | - |
| - | objectArg1.url | string | - | | - | objectArg1.url | string | - |
##### /plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#239 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-calendar/test/javascripts/integration/components/upcoming-events-list-test.gjs#L239) ##### /plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#239 [:link:](https://github.com/discourse/discourse/blob/main/plugins/discourse-events/test/javascripts/integration/components/upcoming-events-list-test.gjs#L239)
| Position | Argument | Type | Description | | Position | Argument | Type | Description |
| -------- | -------------- | ------ | ----------- | | -------- | -------------- | ------ | ----------- |
+1 -1
View File
@@ -589,10 +589,10 @@ plugins:
- "discourse-apple-auth" - "discourse-apple-auth"
- "discourse-assign" - "discourse-assign"
- "discourse-cakeday" - "discourse-cakeday"
- "discourse-calendar"
- "discourse-chat-integration" - "discourse-chat-integration"
- "discourse-data-explorer" - "discourse-data-explorer"
- "discourse-details" - "discourse-details"
- "discourse-events"
- "discourse-gamification" - "discourse-gamification"
- "discourse-github" - "discourse-github"
- "discourse-graphviz" - "discourse-graphviz"
@@ -7,8 +7,8 @@ Migrations::Tooling::Schema.ignored do
plugin :discourse_adplugin, "Not migrated yet" plugin :discourse_adplugin, "Not migrated yet"
plugin :discourse_ai, "Not migrated yet" plugin :discourse_ai, "Not migrated yet"
plugin :discourse_assign, "Not migrated yet" plugin :discourse_assign, "Not migrated yet"
plugin :discourse_calendar, "Not migrated yet"
plugin :discourse_data_explorer, "Not migrated yet" plugin :discourse_data_explorer, "Not migrated yet"
plugin :discourse_events, "Not migrated yet"
plugin :discourse_gamification, "Not migrated yet" plugin :discourse_gamification, "Not migrated yet"
plugin :discourse_github, "Not migrated yet" plugin :discourse_github, "Not migrated yet"
plugin :discourse_oauth2_basic, "Not migrated yet" plugin :discourse_oauth2_basic, "Not migrated yet"
@@ -110,7 +110,13 @@ plugins:
- assignable_level - assignable_level
user_options: user_options:
- notification_level_when_assigned - notification_level_when_assigned
discourse-calendar: discourse-data-explorer:
tables:
- data_explorer_queries
- data_explorer_query_groups
- data_explorer_query_stats
columns: {}
discourse-events:
tables: tables:
- calendar_events - calendar_events
- discourse_calendar_disabled_holidays - discourse_calendar_disabled_holidays
@@ -119,12 +125,6 @@ plugins:
- discourse_post_event_invitees - discourse_post_event_invitees
- livestream_topic_chat_channels - livestream_topic_chat_channels
columns: {} columns: {}
discourse-data-explorer:
tables:
- data_explorer_queries
- data_explorer_query_groups
- data_explorer_query_stats
columns: {}
discourse-gamification: discourse-gamification:
tables: tables:
- gamification_leaderboard_scores - gamification_leaderboard_scores
@@ -228,10 +228,10 @@ plugin_checksums:
discourse-ai: 4ff4f60e8c1744603f7f8590f8f99447 discourse-ai: 4ff4f60e8c1744603f7f8590f8f99447
discourse-assign: 7a7a36e8ac0214e8a6aca1a1ed9899aa discourse-assign: 7a7a36e8ac0214e8a6aca1a1ed9899aa
discourse-cakeday: a5bb91366c8dc8d267088eb0c2679187 discourse-cakeday: a5bb91366c8dc8d267088eb0c2679187
discourse-calendar: 6a305b06fa9121f17245cefbc726ce20
discourse-captcha: fd538c1338062354276ccfda4cbafd55 discourse-captcha: fd538c1338062354276ccfda4cbafd55
discourse-chat-integration: ffa3bf5dba9089491d2fc02971eb96f8 discourse-chat-integration: ffa3bf5dba9089491d2fc02971eb96f8
discourse-data-explorer: fb71ab79dbe07af481ba147ea526406f discourse-data-explorer: fb71ab79dbe07af481ba147ea526406f
discourse-events: 6a305b06fa9121f17245cefbc726ce20
discourse-gamification: 633256e241b030fddcc059076f7474f8 discourse-gamification: 633256e241b030fddcc059076f7474f8
discourse-github: 3bd17b2c09828e232e7565edbf2c746f discourse-github: 3bd17b2c09828e232e7565edbf2c746f
discourse-graphviz: 8a1835520fbf8f7f5d1ef8a25d737e20 discourse-graphviz: 8a1835520fbf8f7f5d1ef8a25d737e20
@@ -1,4 +1,4 @@
# Discourse Calendar # Discourse Events
Adds the ability to create a dynamic calendar in the first post of a topic. Adds the ability to create a dynamic calendar in the first post of a topic.
@@ -2,6 +2,6 @@ export default {
resource: "admin.adminPlugins.show", resource: "admin.adminPlugins.show",
path: "/plugins", path: "/plugins",
map() { map() {
this.route("discourse-calendar-holidays", { path: "holidays" }); this.route("discourse-events-holidays", { path: "holidays" });
}, },
}; };
@@ -16,13 +16,13 @@ import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";
import dConcatClass from "discourse/ui-kit/helpers/d-concat-class"; import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";
import dIcon from "discourse/ui-kit/helpers/d-icon"; import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n"; import { i18n } from "discourse-i18n";
import PostEventBuilder from "discourse/plugins/discourse-calendar/discourse/components/modal/post-event-builder"; import PostEventBuilder from "discourse/plugins/discourse-events/discourse/components/modal/post-event-builder";
import { import {
defaultEventState, defaultEventState,
isLivestreamUrl, isLivestreamUrl,
reconcileDefaultReminder, reconcileDefaultReminder,
} from "discourse/plugins/discourse-calendar/discourse/lib/raw-event-helper"; } from "discourse/plugins/discourse-events/discourse/lib/raw-event-helper";
import DiscoursePostEventEvent from "discourse/plugins/discourse-calendar/discourse/models/discourse-post-event-event"; import DiscoursePostEventEvent from "discourse/plugins/discourse-events/discourse/models/discourse-post-event-event";
export default class CompactEventEditor extends Component { export default class CompactEventEditor extends Component {
@service capabilities; @service capabilities;
@@ -10,7 +10,7 @@ import {
parseEventAttrs, parseEventAttrs,
parseEventBlock, parseEventBlock,
stateToEventInput, stateToEventInput,
} from "discourse/plugins/discourse-calendar/discourse/lib/raw-event-helper"; } from "discourse/plugins/discourse-events/discourse/lib/raw-event-helper";
import CompactEventEditor from "./compact-event-editor"; import CompactEventEditor from "./compact-event-editor";
export default class ComposerEventEditor extends Component { export default class ComposerEventEditor extends Component {
@@ -6,7 +6,7 @@ import { modifier } from "ember-modifier";
import { or } from "discourse/truth-helpers"; import { or } from "discourse/truth-helpers";
import dIcon from "discourse/ui-kit/helpers/d-icon"; import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n"; import { i18n } from "discourse-i18n";
import openLinksInNewTab from "discourse/plugins/discourse-calendar/discourse/modifiers/open-links-in-new-tab"; import openLinksInNewTab from "discourse/plugins/discourse-events/discourse/modifiers/open-links-in-new-tab";
export default class DiscoursePostEventDescription extends Component { export default class DiscoursePostEventDescription extends Component {
@tracked expanded = false; @tracked expanded = false;
@@ -1,7 +1,7 @@
import Component from "@glimmer/component"; import Component from "@glimmer/component";
import { trustHTML } from "@ember/template"; import { trustHTML } from "@ember/template";
import dIcon from "discourse/ui-kit/helpers/d-icon"; import dIcon from "discourse/ui-kit/helpers/d-icon";
import openLinksInNewTab from "discourse/plugins/discourse-calendar/discourse/modifiers/open-links-in-new-tab"; import openLinksInNewTab from "discourse/plugins/discourse-events/discourse/modifiers/open-links-in-new-tab";
const BARE_URL_REGEX = /^https?:\/\/\S+$/; const BARE_URL_REGEX = /^https?:\/\/\S+$/;
@@ -9,7 +9,7 @@ import {
getCustomFieldNames, getCustomFieldNames,
parseEventAttrs, parseEventAttrs,
stateToEventInput, stateToEventInput,
} from "discourse/plugins/discourse-calendar/discourse/lib/raw-event-helper"; } from "discourse/plugins/discourse-events/discourse/lib/raw-event-helper";
import CompactEventEditor from "./compact-event-editor"; import CompactEventEditor from "./compact-event-editor";
const CLEARABLE_ATTRS = [ const CLEARABLE_ATTRS = [
@@ -11,7 +11,7 @@ import loadFullCalendar from "discourse/lib/load-full-calendar";
import { sanitize } from "discourse/lib/text"; import { sanitize } from "discourse/lib/text";
import DiscourseURL from "discourse/lib/url"; import DiscourseURL from "discourse/lib/url";
import { i18n } from "discourse-i18n"; import { i18n } from "discourse-i18n";
import DiscoursePostEvent from "discourse/plugins/discourse-calendar/discourse/components/discourse-post-event"; import DiscoursePostEvent from "discourse/plugins/discourse-events/discourse/components/discourse-post-event";
import { import {
getCalendarButtonsText, getCalendarButtonsText,
getCurrentBcp47Locale, getCurrentBcp47Locale,
@@ -9,8 +9,8 @@ import getURL from "discourse/lib/get-url";
import { wantsNewWindow } from "discourse/lib/intercept-click"; import { wantsNewWindow } from "discourse/lib/intercept-click";
import DButton from "discourse/ui-kit/d-button"; import DButton from "discourse/ui-kit/d-button";
import { i18n } from "discourse-i18n"; import { i18n } from "discourse-i18n";
import DiscoursePostEvent from "discourse/plugins/discourse-calendar/discourse/components/discourse-post-event"; import DiscoursePostEvent from "discourse/plugins/discourse-events/discourse/components/discourse-post-event";
import DiscoursePostEventEvent from "discourse/plugins/discourse-calendar/discourse/models/discourse-post-event-event"; import DiscoursePostEventEvent from "discourse/plugins/discourse-events/discourse/models/discourse-post-event-event";
import fetchZoomJoinPayload from "../../lib/fetch-zoom-join-payload"; import fetchZoomJoinPayload from "../../lib/fetch-zoom-join-payload";
import { loadZoomMeetingSdk } from "../../lib/load-zoom-meeting-sdk"; import { loadZoomMeetingSdk } from "../../lib/load-zoom-meeting-sdk";
import { isWithinEventTimeframe } from "../../models/discourse-post-event-event"; import { isWithinEventTimeframe } from "../../models/discourse-post-event-event";

Some files were not shown because too many files have changed in this diff Show More