Skip to content

A platform for community discussion. Free, open, simple.

DEV: Type strict-narrowed members in admin components (#44656)

Sérgio Saquetime078c478da24
diff --git a/frontend/discourse/admin/components/admin-badges-award.gjs b/frontend/discourse/admin/components/admin-badges-award.gjs
index 9c211c331b5..d63615bbd9a 100644
--- a/frontend/discourse/admin/components/admin-badges-award.gjs
+++ b/frontend/discourse/admin/components/admin-badges-award.gjs
@@ -20,7 +20,11 @@ export default class AdminBadgesAward extends Component {
@tracked replaceBadgeOwners = false;
@tracked grantExistingHolders = false;
@tracked fileSelected = false;
+
+ /** @type {string[] | null} */
@tracked unmatchedEntries = null;
+
+ /** @type {string | null} */
@tracked resultsMessage = null;
@tracked success = false;
@tracked unmatchedEntriesCount = 0;
diff --git a/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs b/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs
index 2b53df069d9..0a8a54d7576 100644
--- a/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs
@@ -18,6 +18,30 @@ import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-s
import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n";
+/**
+ * @typedef {{
+ * scope_id: string,
+ * key: string,
+ * name: string,
+ * params: string[] | null,
+ * urls: string[]
+ * }} ApiKeyScopeDefinition
+ */
+/**
+ * @typedef {{
+ * scope_id: string,
+ * key: string,
+ * name: string,
+ * params: string[]
+ * } & Record<string, string | string[] | undefined>} SelectedApiKeyScope
+ */
+/**
+ * @typedef {{
+ * description: string,
+ * scopeMode: "global" | "read_only" | "granular",
+ * scopes: SelectedApiKeyScope[] | null
+ * }} CreatedApiKeyData
+ */
export default class AdminConfigAreasApiKeysNew extends Component {
@service modal;
@service store;
@@ -25,9 +49,14 @@ export default class AdminConfigAreasApiKeysNew extends Component {
@tracked username;
@tracked loadingScopes = false;
+
+ /** @type {Record<string, ApiKeyScopeDefinition[]> | null} */
@tracked scopes = null;
+ /** @type {string | null} */
@tracked generatedApiKey = null;
+
+ /** @type {CreatedApiKeyData | null} */
@tracked createdKeyData = null;
userModes = [
@@ -39,6 +68,7 @@ export default class AdminConfigAreasApiKeysNew extends Component {
return { id: scopeMode, name: i18n(`admin.api.scopes.${scopeMode}`) };
});
+ /** @type {ApiKeyScopeDefinition[] | null} */
globalScopes = null;
constructor() {
diff --git a/frontend/discourse/admin/components/admin-config-areas/components.gjs b/frontend/discourse/admin/components/admin-config-areas/components.gjs
index 71614caa65e..9b9ca3253c7 100644
--- a/frontend/discourse/admin/components/admin-config-areas/components.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/components.gjs
@@ -113,7 +113,8 @@ export default class AdminConfigAreasComponents extends Component {
return {
selectedType: COMPONENTS,
userId: null,
- content: [],
+ content:
+ /** @type {import("discourse/admin/models/theme").default[]} */ ([]),
installedThemes: this.components,
addTheme: this.addComponent,
updateSelectedType: () => {},
diff --git a/frontend/discourse/admin/components/admin-config-areas/emojis-import.gjs b/frontend/discourse/admin/components/admin-config-areas/emojis-import.gjs
index 32b510dec62..5e7581c6b31 100644
--- a/frontend/discourse/admin/components/admin-config-areas/emojis-import.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/emojis-import.gjs
@@ -149,11 +149,27 @@ const ImportSection = <template>
</div>
</template>;
+/**
+ * @typedef {{
+ * index: number,
+ * name: string,
+ * group: string,
+ * filename: string,
+ * category: "new" | "identical" | "invalid" | "conflict_group" | "conflict_image" | "conflict_both",
+ * errors?: string[],
+ * incoming_url?: string,
+ * existing_url?: string,
+ * existing_group?: string
+ * }} EmojiImportPreviewRow
+ */
export default class AdminConfigAreasEmojisImport extends Component {
@service router;
@service adminEmojis;
+ /** @type {string | null} */
@tracked previewToken = null;
+
+ /** @type {EmojiImportPreviewRow[] | null} */
@tracked previewRows = null;
@tracked resolutions = {};
@tracked isUploading = false;
diff --git a/frontend/discourse/admin/components/admin-config-areas/flags-reorderable.gjs b/frontend/discourse/admin/components/admin-config-areas/flags-reorderable.gjs
index 2d489298a27..0c342ce0583 100644
--- a/frontend/discourse/admin/components/admin-config-areas/flags-reorderable.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/flags-reorderable.gjs
@@ -57,7 +57,7 @@ export default class AdminConfigAreasFlags extends Component {
* landed, rolling back on failure. The server orders only the flags that
* can move, so the position sent is the flag's place among those.
*
- * @param {Object} move - The normalized move from the list.
+ * @param {import("discourse/ui-kit/d-reorderable-list/types").ReorderableMove<import("discourse/models/post-action-type").default>} move - The normalized move from the list.
*/
@action
async handleMove(move) {
diff --git a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs
index 6ec4e300507..48fc8d3c546 100644
--- a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs
@@ -38,6 +38,7 @@ export default class UpcomingChangeItem extends Component {
@tracked savingEnabledFor = false;
@tracked bufferedGroupsDirty = false;
+ /** @type {import("discourse/float-kit/lib/d-menu-instance").default | null} */
registeredMenu = null;
applyLightbox = modifier((element) => lightbox(element));
diff --git a/frontend/discourse/admin/components/admin-config-areas/user-fields-list-reorderable.gjs b/frontend/discourse/admin/components/admin-config-areas/user-fields-list-reorderable.gjs
index 58d850e4faa..c681e76a2b6 100644
--- a/frontend/discourse/admin/components/admin-config-areas/user-fields-list-reorderable.gjs
+++ b/frontend/discourse/admin/components/admin-config-areas/user-fields-list-reorderable.gjs
@@ -39,7 +39,7 @@ export default class AdminConfigAreasUserFieldsList extends Component {
* new slot — a drag can jump several rows, which the old adjacent-swap
* persistence could not express.
*
- * @param {Object} move - The normalized move from the list.
+ * @param {import("discourse/ui-kit/d-reorderable-list/types").ReorderableMove<import("discourse/admin/models/user-field").default>} move - The normalized move from the list.
*/
@action
async handleMove(move) {
diff --git a/frontend/discourse/admin/components/admin-fonts-form.gjs b/frontend/discourse/admin/components/admin-fonts-form.gjs
index dc7ac017b9b..8b7db48a5c9 100644
--- a/frontend/discourse/admin/components/admin-fonts-form.gjs
+++ b/frontend/discourse/admin/components/admin-fonts-form.gjs
@@ -26,6 +26,7 @@ export default class AdminFontsForm extends Component {
@service toasts;
@service modal;
+ /** @type {boolean | null} */
updateExistingUsers = null;
get formData() {
diff --git a/frontend/discourse/admin/components/admin-penalty-post-action.gjs b/frontend/discourse/admin/components/admin-penalty-post-action.gjs
index e5b2d1c3062..10f5548eee7 100644
--- a/frontend/discourse/admin/components/admin-penalty-post-action.gjs
+++ b/frontend/discourse/admin/components/admin-penalty-post-action.gjs
@@ -13,8 +13,13 @@ const ACTIONS = ["delete", "delete_all", "delete_replies", "edit", "none"];
export default class AdminPenaltyPostAction extends Component {
@tracked confirmDeleteAll = false;
+ /** @type {number | null | undefined} */
postId = null;
+
+ /** @type {string | null} */
postAction = null;
+
+ /** @type {string | null | undefined} */
postEdit = null;
@computed("postAction")
diff --git a/frontend/discourse/admin/components/admin-report-table-summary.gjs b/frontend/discourse/admin/components/admin-report-table-summary.gjs
index 4f10053dd7b..a460acde6db 100644
--- a/frontend/discourse/admin/components/admin-report-table-summary.gjs
+++ b/frontend/discourse/admin/components/admin-report-table-summary.gjs
@@ -15,7 +15,10 @@ import { i18n } from "discourse-i18n";
const SUMMARY_LIMIT = 5;
export default class AdminReportTableSummary extends Component {
+ /** @type {Record<string, unknown>[] | null} */
@tracked items = null;
+
+ /** @type {number | null} */
@tracked total = null;
@tracked isLoading = false;
@tracked hasError = false;
diff --git a/frontend/discourse/admin/components/admin-report.gjs b/frontend/discourse/admin/components/admin-report.gjs
index fb3ddf2721b..2638ba5c83e 100644
--- a/frontend/discourse/admin/components/admin-report.gjs
+++ b/frontend/discourse/admin/components/admin-report.gjs
@@ -58,15 +58,33 @@ export function updateReportFilters(filters, id, value) {
return customFilters;
}
+/**
+ * @typedef {import("discourse/admin/components/admin-report-table-cell").ReportTableOptions & {
+ * chartGrouping?: string,
+ * hiddenLabels?: string[],
+ * legendPosition?: string,
+ * onLegendClick?: (key: string) => void
+ * }} AdminReportOptions
+ */
export default class AdminReport extends Component {
@service siteSettings;
@tracked isLoading = false;
+
+ /** @type {string | null} */
@tracked rateLimitationString = null;
+
+ /** @type {import("discourse/admin/models/report").default | null} */
@tracked model = null;
@tracked currentMode = this.args.filters?.mode;
+
+ /** @type {AdminReportOptions | null | undefined} */
@tracked options = null;
+
+ /** @type {import("moment").Moment | null} */
@tracked dateRangeFrom = null;
+
+ /** @type {import("moment").Moment | null} */
@tracked dateRangeTo = null;
@tracked userHasCustomDates = false;
diff --git a/frontend/discourse/admin/components/admin-site-settings-filter-controls.gjs b/frontend/discourse/admin/components/admin-site-settings-filter-controls.gjs
index b4deb9191bb..f5e34a22d95 100644
--- a/frontend/discourse/admin/components/admin-site-settings-filter-controls.gjs
+++ b/frontend/discourse/admin/components/admin-site-settings-filter-controls.gjs
@@ -16,6 +16,7 @@ export default class AdminSiteSettingsFilterControls extends Component {
@tracked filter = this.args.initialFilter || "";
@tracked onlyOverridden = false;
+ /** @type {HTMLElement | null} */
menuTrigger = null;
@action
diff --git a/frontend/discourse/admin/components/admin-theme-editor.gjs b/frontend/discourse/admin/components/admin-theme-editor.gjs
index 5631e5a0883..11f225a98de 100644
--- a/frontend/discourse/admin/components/admin-theme-editor.gjs
+++ b/frontend/discourse/admin/components/admin-theme-editor.gjs
@@ -41,6 +41,7 @@ export default class AdminThemeEditor extends Component {
@tracked showAdvanced;
currentTargetName;
+ /** @type {string | false | null} */
warning = null;
@computed("fieldName", "currentTargetName", "theme")
diff --git a/frontend/discourse/admin/components/admin-user-exports-table.gjs b/frontend/discourse/admin/components/admin-user-exports-table.gjs
index 9401f0d678b..82957bd8bc0 100644
--- a/frontend/discourse/admin/components/admin-user-exports-table.gjs
+++ b/frontend/discourse/admin/components/admin-user-exports-table.gjs
@@ -18,6 +18,7 @@ export default class extends Component {
@service messageBus;
@service toasts;
+ /** @type {import("discourse/admin/models/user-export").default | null} */
@tracked userExport = null;
@tracked userExportReloading = false;
diff --git a/frontend/discourse/admin/components/dashboard/configure-menu-reorderable.gjs b/frontend/discourse/admin/components/dashboard/configure-menu-reorderable.gjs
index 2b27103506a..345f16d9b95 100644
--- a/frontend/discourse/admin/components/dashboard/configure-menu-reorderable.gjs
+++ b/frontend/discourse/admin/components/dashboard/configure-menu-reorderable.gjs
@@ -27,7 +27,7 @@ export default class ConfigureMenu extends Component {
* normalized both input paths, suppressed no-ops, and announced, so what
* remains is the owner's own index-based contract.
*
- * @param {Object} move - The normalized move.
+ * @param {import("discourse/ui-kit/d-reorderable-list/types").ReorderableMove} move - The normalized move.
*/
@action
handleMove(move) {
diff --git a/frontend/discourse/admin/components/dashboard/configure-menu.gjs b/frontend/discourse/admin/components/dashboard/configure-menu.gjs
index e6da1eda4a0..6c713a0e108 100644
--- a/frontend/discourse/admin/components/dashboard/configure-menu.gjs
+++ b/frontend/discourse/admin/components/dashboard/configure-menu.gjs
@@ -157,6 +157,7 @@ class ConfigureRow extends Component {
}
export default class ConfigureMenu extends Component {
+ /** @type {number | null} */
draggedIndex = null;
get lastIndex() {
diff --git a/frontend/discourse/admin/components/dashboard/date-range-picker.gjs b/frontend/discourse/admin/components/dashboard/date-range-picker.gjs
index 597decfa8c8..34ac2e44e53 100644
--- a/frontend/discourse/admin/components/dashboard/date-range-picker.gjs
+++ b/frontend/discourse/admin/components/dashboard/date-range-picker.gjs
@@ -21,10 +21,19 @@ function formatDate(value, pattern) {
export default class DashboardDateRangePicker extends Component {
@service site;
+ /** @type {import("moment").Moment | null} */
@tracked pendingStart = null;
+
+ /** @type {import("moment").Moment | null} */
@tracked pendingEnd = null;
+
+ /** @type {import("moment").Moment | null} */
@tracked hoveredDay = null;
+
+ /** @type {import("moment").Moment | null} */
@tracked focusedDay = null;
+
+ /** @type {import("moment").Moment | null} */
@tracked viewStartMonthOverride = null;
focusDay = modifier((element, [shouldFocus]) => {
@@ -117,6 +126,7 @@ export default class DashboardDateRangePicker extends Component {
return moment.weekdaysMin(true);
}
+ /** @returns {import("moment").Moment | null} */
get hoverRangeEnd() {
if (
this.committed ||
@@ -129,6 +139,7 @@ export default class DashboardDateRangePicker extends Component {
return this.hoveredDay;
}
+ /** @returns {import("moment").Moment | null} */
get hoverRangeStart() {
return this.hoverRangeEnd ? this.pendingStart : null;
}
@@ -210,6 +221,10 @@ export default class DashboardDateRangePicker extends Component {
);
}
+ /**
+ * @param {import("moment").Moment} day
+ * @returns {boolean | null}
+ */
@action
isHoverEndDay(day) {
return (
diff --git a/frontend/discourse/admin/components/dashboard/engagement/activity-by-category.gjs b/frontend/discourse/admin/components/dashboard/engagement/activity-by-category.gjs
index 962b53c37da..5ef6cc353c2 100644
--- a/frontend/discourse/admin/components/dashboard/engagement/activity-by-category.gjs
+++ b/frontend/discourse/admin/components/dashboard/engagement/activity-by-category.gjs
@@ -20,11 +20,28 @@ import I18n, { i18n } from "discourse-i18n";
const MAX_CATEGORIES = 10;
+/**
+ * @typedef {{
+ * category_id: number,
+ * name: string,
+ * color: string,
+ * slug: string,
+ * topics: number,
+ * posts: number,
+ * page_views: number,
+ * share: number,
+ * share_change: number,
+ * share_formatted: string,
+ * share_change_formatted: string
+ * }} CategoryActivityRow
+ */
export default class ActivityByCategory extends Component {
@service currentUser;
@service toasts;
@tracked selectedCategories = [];
+
+ /** @type {{ rows: CategoryActivityRow[], total: number } | null} */
@tracked overrideActivity = null;
@tracked loading = false;
@tracked sortBy = "share";
diff --git a/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs b/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs
index 2901b9388f3..7942654ba48 100644
--- a/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs
+++ b/frontend/discourse/admin/components/dashboard/engagement/whos-posting.gjs
@@ -30,6 +30,17 @@ function sameGroups(a, b) {
return a.length === b.length && a.every((token, index) => token === b[index]);
}
+/**
+ * @typedef {{
+ * type: string,
+ * kind: "synthetic" | "group",
+ * group_id: number | null,
+ * name: string,
+ * count: number,
+ * share: number,
+ * share_formatted: string
+ * }} MemberTypePosterRow
+ */
export default class WhosPosting extends Component {
@service currentUser;
@service toasts;
@@ -38,6 +49,8 @@ export default class WhosPosting extends Component {
@tracked selectedCategories = [];
@tracked selectedGroups = [];
+
+ /** @type {{ rows: MemberTypePosterRow[], total: number, category_ids: number[] | null | undefined, groups: string[] } | null} */
@tracked overridePosters = null;
@tracked loading = false;
diff --git a/frontend/discourse/admin/components/dashboard/reports.gjs b/frontend/discourse/admin/components/dashboard/reports.gjs
index 611a3181cfa..68da0379ba9 100644
--- a/frontend/discourse/admin/components/dashboard/reports.gjs
+++ b/frontend/discourse/admin/components/dashboard/reports.gjs
@@ -130,8 +130,14 @@ export default class DashboardReports extends Component {
@tracked cards = [];
@tracked loading = false;
+
+ /** @type {{ key: string, rows: number, cols: number } | null} */
@tracked liveResize = null;
+
+ /** @type {{ key: string, rect: { left: number, top: number, width: number, height: number } } | null} */
@tracked freeFollow = null;
+
+ /** @type {string | null} */
@tracked activeResizeKey = null;
measureCard = (handle) => handle.closest(".db-report__card");
diff --git a/frontend/discourse/admin/components/dashboard/site-advice.gjs b/frontend/discourse/admin/components/dashboard/site-advice.gjs
index 283d36e0aa9..30951fb6534 100644
--- a/frontend/discourse/admin/components/dashboard/site-advice.gjs
+++ b/frontend/discourse/admin/components/dashboard/site-advice.gjs
@@ -15,6 +15,8 @@ export default class DashboardSiteAdvice extends Component {
@service currentUser;
@tracked refreshing = false;
+
+ /** @type {number | null} */
@tracked ignoringId = null;
get sortedProblems() {
diff --git a/frontend/discourse/admin/components/embeddable-host.gjs b/frontend/discourse/admin/components/embeddable-host.gjs
index 330ce605bd6..9a6484c7bf7 100644
--- a/frontend/discourse/admin/components/embeddable-host.gjs
+++ b/frontend/discourse/admin/components/embeddable-host.gjs
@@ -12,8 +12,13 @@ import { i18n } from "discourse-i18n";
export default class EmbeddableHost extends Component {
@service dialog;
+ /** @type {import("discourse/models/category").default | null | undefined} */
@tracked category = null;
+
+ /** @type {string | null} */
@tracked tags = null;
+
+ /** @type {string | null} */
@tracked user = null;
constructor() {
diff --git a/frontend/discourse/admin/components/emoji-uploader.gjs b/frontend/discourse/admin/components/emoji-uploader.gjs
index d0ca1557cde..8169047bb04 100644
--- a/frontend/discourse/admin/components/emoji-uploader.gjs
+++ b/frontend/discourse/admin/components/emoji-uploader.gjs
@@ -51,7 +51,11 @@ export default class EmojiUploader extends Component {
});
group = "default";
+
+ /** @type {string[] | null} */
emojiGroups = null;
+
+ /** @type {string[] | null} */
newEmojiGroups = null;
@computed("name")
diff --git a/frontend/discourse/admin/components/emoji-value-list.gjs b/frontend/discourse/admin/components/emoji-value-list.gjs
index e8d94b41f05..2c237729c26 100644
--- a/frontend/discourse/admin/components/emoji-value-list.gjs
+++ b/frontend/discourse/admin/components/emoji-value-list.gjs
@@ -105,7 +105,7 @@ export default class EmojiValueList extends Component {
* Applies a committed move and persists the new order. Wrapping and
* announcements are the list's own.
*
- * @param {Object} move - The normalized move from the list.
+ * @param {import("discourse/ui-kit/d-reorderable-list/types").ReorderableMove<{ value: string, isEditable: boolean, isEditing: boolean }>} move - The normalized move from the list.
*/
@action
handleMove(move) {
diff --git a/frontend/discourse/admin/components/modal/change-theme-source.gjs b/frontend/discourse/admin/components/modal/change-theme-source.gjs
index b178f020a19..eaab5381ac2 100644
--- a/frontend/discourse/admin/components/modal/change-theme-source.gjs
+++ b/frontend/discourse/admin/components/modal/change-theme-source.gjs
@@ -12,10 +12,13 @@ import DModal from "discourse/ui-kit/d-modal";
import { i18n } from "discourse-i18n";
export default class ChangeThemeSourceModal extends Component {
+ /** @type {string | null} */
@tracked publicKey = null;
@tracked loading = false;
@tracked generateNewKey = false;
@tracked remoteUrl = this.args.model.theme.remote_theme?.remote_url || "";
+
+ /** @type {{ submit: (event?: Event) => Promise<void> } | null} */
@tracked formApi = null;
@cached
diff --git a/frontend/discourse/admin/components/modal/edit-badge-groupings-reorderable.gjs b/frontend/discourse/admin/components/modal/edit-badge-groupings-reorderable.gjs
index e859bd413dc..04d10674945 100644
--- a/frontend/discourse/admin/components/modal/edit-badge-groupings-reorderable.gjs
+++ b/frontend/discourse/admin/components/modal/edit-badge-groupings-reorderable.gjs
@@ -32,7 +32,7 @@ export default class EditBadgeGroupings extends Component {
/**
* Applies a committed move onto the staged working copy.
*
- * @param {Object} move - The normalized move from the list.
+ * @param {import("discourse/ui-kit/d-reorderable-list/types").ReorderableMove<import("discourse/models/badge-grouping").default>} move - The normalized move from the list.
*/
@action
handleMove(move) {
diff --git a/frontend/discourse/admin/components/modal/manage-reports-reorderable.gjs b/frontend/discourse/admin/components/modal/manage-reports-reorderable.gjs
index 300dcdd371a..507f5160d07 100644
--- a/frontend/discourse/admin/components/modal/manage-reports-reorderable.gjs
+++ b/frontend/discourse/admin/components/modal/manage-reports-reorderable.gjs
@@ -32,6 +32,8 @@ export default class ManageReports extends Component {
@tracked allKeys = [];
@tracked providers = [];
@tracked search = "";
+
+ /** @type {{ title: string, key: string } | null} */
@tracked nextCursor = null;
@tracked hasMore = false;
@tracked loading = true;
diff --git a/frontend/discourse/admin/components/modal/manage-reports.gjs b/frontend/discourse/admin/components/modal/manage-reports.gjs
index 9a53037bd02..05e3e6fd996 100644
--- a/frontend/discourse/admin/components/modal/manage-reports.gjs
+++ b/frontend/discourse/admin/components/modal/manage-reports.gjs
@@ -26,6 +26,8 @@ export default class ManageReports extends Component {
@tracked allKeys = [];
@tracked providers = [];
@tracked search = "";
+
+ /** @type {{ title: string, key: string } | null} */
@tracked nextCursor = null;
@tracked hasMore = false;
@tracked loading = true;
diff --git a/frontend/discourse/admin/components/modal/reseed.gjs b/frontend/discourse/admin/components/modal/reseed.gjs
index 63e3966f320..11181dbd73b 100644
--- a/frontend/discourse/admin/components/modal/reseed.gjs
+++ b/frontend/discourse/admin/components/modal/reseed.gjs
@@ -9,10 +9,17 @@ import DModal from "discourse/ui-kit/d-modal";
import DModalCancel from "discourse/ui-kit/d-modal-cancel";
import { i18n } from "discourse-i18n";
+/**
+ * @typedef {{ id: string, name: string, selected: boolean }} ReseedOption
+ */
export default class Reseed extends Component {
@tracked loading = true;
@tracked reseeding = false;
+
+ /** @type {ReseedOption[] | null} */
@tracked categories = null;
+
+ /** @type {ReseedOption[] | null} */
@tracked topics = null;
@tracked flash;
diff --git a/frontend/discourse/admin/components/og-image-preview.gjs b/frontend/discourse/admin/components/og-image-preview.gjs
index 59f6d5aefd4..0f4ec0053f1 100644
--- a/frontend/discourse/admin/components/og-image-preview.gjs
+++ b/frontend/discourse/admin/components/og-image-preview.gjs
@@ -7,8 +7,11 @@ import { extractError } from "discourse/lib/ajax-error";
import { i18n } from "discourse-i18n";
export default class OgImagePreview extends Component {
+ /** @type {string | null} */
@tracked imageUrl = null;
@tracked loading = false;
+
+ /** @type {string | null} */
@tracked errorMessage = null;
formData = { topic_id: "" };
diff --git a/frontend/discourse/admin/components/reports/posters-by-member-type-report.gjs b/frontend/discourse/admin/components/reports/posters-by-member-type-report.gjs
index 4efa8f0ca82..91b6aa708d5 100644
--- a/frontend/discourse/admin/components/reports/posters-by-member-type-report.gjs
+++ b/frontend/discourse/admin/components/reports/posters-by-member-type-report.gjs
@@ -12,6 +12,8 @@ import { i18n } from "discourse-i18n";
export default class PostersByMemberTypeReport extends Component {
@tracked selectedGroupKey = this.args.model?.data?.[0]?.type ?? null;
+
+ /** @type {number | null} */
@tracked memberCount = null;
get rows() {
diff --git a/frontend/discourse/admin/components/simple-list.gjs b/frontend/discourse/admin/components/simple-list.gjs
index e25579fdd58..d24790f0d09 100644
--- a/frontend/discourse/admin/components/simple-list.gjs
+++ b/frontend/discourse/admin/components/simple-list.gjs
@@ -88,7 +88,7 @@ export default class SimpleList extends Component {
* Applies a committed move onto the delimited collection and reports the
* new order. Wrapping and announcements are the list's own.
*
- * @param {Object} move - The normalized move from the list.
+ * @param {import("discourse/ui-kit/d-reorderable-list/types").ReorderableMove<string>} move - The normalized move from the list.
*/
@action
handleMove(move) {
diff --git a/frontend/discourse/admin/components/site-setting.gjs b/frontend/discourse/admin/components/site-setting.gjs
index f4b3d415a20..335592df012 100644
--- a/frontend/discourse/admin/components/site-setting.gjs
+++ b/frontend/discourse/admin/components/site-setting.gjs
@@ -108,11 +108,18 @@ export default class SiteSettingComponent extends Component {
@service messageBus;
@service site;
+ /** @type {boolean | null | undefined} */
@tracked isSecret = null;
+
+ /** @type {"enqueued" | "completed" | null} */
@tracked status = null;
+
+ /** @type {string | null | undefined} */
@tracked progress = null;
updateExistingUsers = null;
trackChanges = true;
+
+ /** @type {{ get: (name: string) => unknown, set: (name: string, value: unknown) => Promise<void>, submit: (event?: Event) => Promise<void> } | null} */
formApi = null;
#formKitData;
diff --git a/frontend/discourse/admin/components/site-settings/compact-list.gjs b/frontend/discourse/admin/components/site-settings/compact-list.gjs
index 588cf43080e..406a3e6fbcf 100644
--- a/frontend/discourse/admin/components/site-settings/compact-list.gjs
+++ b/frontend/discourse/admin/components/site-settings/compact-list.gjs
@@ -17,6 +17,7 @@ import ListSetting from "discourse/select-kit/components/list-setting";
* @param {boolean} allowAny - Whether to allow arbitrary values
*/
export default class CompactList extends Component {
+ /** @type {Array<string | { name: string, value: string }> | null} */
@tracked createdChoices = null;
tokenSeparator = "|";
diff --git a/frontend/discourse/admin/components/site-settings/file-types-list.gjs b/frontend/discourse/admin/components/site-settings/file-types-list.gjs
index 10159dcd08f..5e658fd62bd 100644
--- a/frontend/discourse/admin/components/site-settings/file-types-list.gjs
+++ b/frontend/discourse/admin/components/site-settings/file-types-list.gjs
@@ -33,6 +33,7 @@ const DOCUMENT_TYPES_STRING = DOCUMENT_TYPES.join(", ");
export default class FileTypesList extends Component {
@service toasts;
+ /** @type {string[] | null} */
@tracked createdChoices = null;
get settingValue() {
diff --git a/frontend/discourse/admin/components/site-settings/upload.gjs b/frontend/discourse/admin/components/site-settings/upload.gjs
index 3212c602a6e..3a49c00a3c3 100644
--- a/frontend/discourse/admin/components/site-settings/upload.gjs
+++ b/frontend/discourse/admin/components/site-settings/upload.gjs
@@ -70,10 +70,21 @@ const FilePreview = <template>
</div>
</template>;
+/**
+ * @typedef {{
+ * file_name: string,
+ * url?: string,
+ * original_filename?: string,
+ * human_filesize?: string,
+ * width?: number | null,
+ * height?: number | null
+ * }} SiteSettingUploadedFile
+ */
export default class SiteSettingUpload extends Component {
@service currentUser;
@service siteSettings;
+ /** @type {SiteSettingUploadedFile | null} */
@tracked uploadedFile = null;
uppyUpload = new UppyUpload(getOwner(this), {
diff --git a/frontend/discourse/admin/components/theme-site-settings.gjs b/frontend/discourse/admin/components/theme-site-settings.gjs
index 1ec475ed370..72cee788f7a 100644
--- a/frontend/discourse/admin/components/theme-site-settings.gjs
+++ b/frontend/discourse/admin/components/theme-site-settings.gjs
@@ -14,12 +14,34 @@ import DPageSubheader from "discourse/ui-kit/d-page-subheader";
import dBasePath from "discourse/ui-kit/helpers/d-base-path";
import { i18n } from "discourse-i18n";
+/**
+ * @typedef {{
+ * name: string,
+ * id: number | null,
+ * color_scheme_id?: number | null,
+ * dark_color_scheme_id?: number | null,
+ * only_theme_color_schemes?: boolean
+ * }} SelectableTheme
+ */
+/**
+ * @typedef {{
+ * setting: string,
+ * default: unknown,
+ * description: string,
+ * humanized_name: string,
+ * themes: Array<{ theme_id: number, theme_name: string, value: unknown }>
+ * } & Record<string, unknown>} ThemeSiteSettingOverrides
+ */
export default class ThemeSiteSettings extends Component {
@service site;
+ /** @type {Record<string, ThemeSiteSettingOverrides> | null} */
@tracked themesWithSiteSettingOverrides = null;
+
+ /** @type {Array<{ name: undefined, value: string }> | null} */
@tracked themeableSiteSettings = null;
+ /** @returns {SelectableTheme[] | null} */
get themes() {
return listThemes(this.site);
}
@@ -28,6 +50,7 @@ export default class ThemeSiteSettings extends Component {
return currentThemeId();
}
+ /** @returns {SelectableTheme | undefined} */
get currentTheme() {
return this.themes.find((theme) => {
return eq(theme.id, this.currentThemeIdValue);
diff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjs
index f122a4bc8b7..2916c4fe6a3 100644
--- a/frontend/discourse/admin/components/upsert-category/general.gjs
+++ b/frontend/discourse/admin/components/upsert-category/general.gjs
@@ -55,6 +55,8 @@ export default class UpsertCategoryGeneral extends Component {
@service categoryTypeChooser;
@tracked loadingDescription = false;
+
+ /** @type {string | null} */
@tracked descriptionHtml = null;
@tracked descriptionExpanded = false;
@tracked descriptionOverflows = false;
diff --git a/frontend/discourse/admin/components/value-list.gjs b/frontend/discourse/admin/components/value-list.gjs
index 53873c12042..a445e527e37 100644
--- a/frontend/discourse/admin/components/value-list.gjs
+++ b/frontend/discourse/admin/components/value-list.gjs
@@ -32,12 +32,20 @@ const INDEX_KEY = "@index";
export default class ValueList extends Component {
@service siteSettings;
+ /** @type {string[] | null} */
@autoTrackedArray collection = null;
+ /** @type {string | null} */
inputDelimiter = null;
+
+ /** @type {"array" | null} */
inputType = null;
newValue = "";
+
+ /** @type {string | string[] | null | undefined} */
values = null;
+
+ /** @type {((values: string[]) => void | Promise<void>) | null} */
onChange = null;
valueLabel = (value) => value;
@@ -121,7 +129,7 @@ export default class ValueList extends Component {
* Applies a committed move onto the collection and persists the new order.
* Wrapping and announcements are the list's own.
*
- * @param {Object} move - The normalized move from the list.
+ * @param {import("discourse/ui-kit/d-reorderable-list/types").ReorderableMove<string>} move - The normalized move from the list.
*/
@action
handleMove(move) {
diff --git a/frontend/discourse/admin/components/watched-word-form.gjs b/frontend/discourse/admin/components/watched-word-form.gjs
index 39118fcd2e7..cb037b1c4f7 100644
--- a/frontend/discourse/admin/components/watched-word-form.gjs
+++ b/frontend/discourse/admin/components/watched-word-form.gjs
@@ -16,6 +16,8 @@ import { i18n } from "discourse-i18n";
@tagName("")
export default class WatchedWordForm extends Component {
formSubmitted = false;
+
+ /** @type {string | null} */
actionKey = null;
showMessage = false;
isCaseSensitive = false;
diff --git a/frontend/discourse/admin/components/webhook-event.gjs b/frontend/discourse/admin/components/webhook-event.gjs
index fa16153ada5..9cb426c6507 100644
--- a/frontend/discourse/admin/components/webhook-event.gjs
+++ b/frontend/discourse/admin/components/webhook-event.gjs
@@ -14,6 +14,8 @@ export default class WebhookEvent extends Component {
@tracked body = "";
@tracked bodyLabel = "";
+
+ /** @type {string | null} */
@tracked expandDetails = null;
@tracked headers = "";
expandDetailsRequestKey = "request";