A platform for community discussion. Free, open, simple.
FIX: Avoid `TypeError` when `DLoadMore` fires before staff action logs model is ready (#43672)
Steven Chang7430bee2a7d8
diff --git a/frontend/discourse/admin/controllers/admin-logs/staff-action-logs.js b/frontend/discourse/admin/controllers/admin-logs/staff-action-logs.jsindex 58e64c9e0d7..2cd0dcf5bd6 100644--- a/frontend/discourse/admin/controllers/admin-logs/staff-action-logs.js+++ b/frontend/discourse/admin/controllers/admin-logs/staff-action-logs.js@@ -23,6 +23,11 @@ export default class AdminLogsStaffActionLogsController extends Controller {/** @type {moment.Moment | null} */endDate = null;+ @computed("model")+ get initialModelLoading() {+ return !this.model?.content;+ }+@computed("filters.action_name")get actionFilter() {return this.filters?.action_namediff --git a/frontend/discourse/admin/templates/admin-logs/staff-action-logs.gjs b/frontend/discourse/admin/templates/admin-logs/staff-action-logs.gjsindex 4e1e204d99f..eb28847c68d 100644--- a/frontend/discourse/admin/templates/admin-logs/staff-action-logs.gjs+++ b/frontend/discourse/admin/templates/admin-logs/staff-action-logs.gjs@@ -107,7 +107,10 @@ export default <template><div class="clearfix"></div><StaffActions>- <DLoadMore @action={{@controller.loadMore}}>+ <DLoadMore+ @action={{@controller.loadMore}}+ @isLoading={{@controller.initialModelLoading}}+ >{{#if @controller.model.content}}<table class="table staff-logs grid"><thead>