A platform for community discussion. Free, open, simple.
FIX: Show all users in single AI usage table (#42768)
Samf01efc147fc7
diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-usage.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-usage.gjsindex 902cf0d050b..f1cc8ea1c11 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-usage.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-usage.gjs@@ -31,6 +31,7 @@ const DATE_FORMAT = "YYYY-MM-DD";const DEFAULT_PERIOD = "month";const CUSTOM_PERIOD = "custom";const PRESET_PERIODS = ["day", "week", DEFAULT_PERIOD];+const MAX_USERS_IN_SINGLE_TABLE = 24;export default class AiUsage extends Component {@service currentUser;@@ -258,6 +259,11 @@ export default class AiUsage extends Component {if (!this.data?.users) {return 0;}++ if (this.data.users.length <= MAX_USERS_IN_SINGLE_TABLE) {+ return this.data.users.length;+ }+return Math.ceil(this.data.users.length / 2);}@@ -1046,7 +1052,10 @@ export default class AiUsage extends Component {<divclass={{dConcatClass"ai-usage__users-table-wrapper"- (if (gt this.data.users.length 24) "-multi-column")+ (if+ (gt this.data.users.length MAX_USERS_IN_SINGLE_TABLE)+ "-multi-column"+ )}}><table class="ai-usage__users-table">@@ -1096,7 +1105,9 @@ export default class AiUsage extends Component {</td></tr>{{/each}}- {{#unless (gt this.data.users.length 24)}}+ {{#unless+ (gt this.data.users.length MAX_USERS_IN_SINGLE_TABLE)+ }}<tr class="ai-usage__total-row"><td>{{i18n "discourse_ai.usage.total"}}</td><td title={{this.usersTotals.usage_count}}>{{number@@ -1113,7 +1124,9 @@ export default class AiUsage extends Component {</tbody></table>- {{#if (gt this.data.users.length 24)}}+ {{#if+ (gt this.data.users.length MAX_USERS_IN_SINGLE_TABLE)+ }}<table class="ai-usage__users-table"><thead><tr>diff --git a/plugins/discourse-ai/test/javascripts/integration/components/ai-usage-test.gjs b/plugins/discourse-ai/test/javascripts/integration/components/ai-usage-test.gjsnew file mode 100644index 00000000000..07f1e1ca21c--- /dev/null+++ b/plugins/discourse-ai/test/javascripts/integration/components/ai-usage-test.gjs@@ -0,0 +1,57 @@+import { render } from "@ember/test-helpers";+import { module, test } from "qunit";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import pretender, { response } from "discourse/tests/helpers/create-pretender";+import AiUsage from "discourse/plugins/discourse-ai/discourse/components/ai-usage";++module("Integration | Component | AiUsage", function (hooks) {+ setupRenderingTest(hooks);++ test("shows all users in a single table", async function (assert) {+ await renderUsage(24);++ assert+ .dom(".ai-usage__users-table")+ .exists({ count: 1 }, "renders one users table");+ assert+ .dom(".ai-usage__users-row")+ .exists({ count: 24 }, "renders every user");+ });++ test("splits larger user lists across two tables", async function (assert) {+ await renderUsage(25);++ assert+ .dom(".ai-usage__users-table")+ .exists({ count: 2 }, "renders two users tables");+ assert+ .dom(".ai-usage__users-row")+ .exists({ count: 25 }, "renders every user");+ });+});++async function renderUsage(userCount) {+ const model = {+ features: [],+ models: [],+ summary: {},+ users: Array.from({ length: userCount }, (_, index) => ({+ avatar_template: "/letter_avatar_proxy/v4/letter/u/45deac/{size}.png",+ username: `user-${index}`,+ usage_count: 1,+ total_tokens: 1,+ total_spending: 0,+ })),+ };+ const queryParams = {};++ pretender.get("/admin/plugins/discourse-ai/ai-usage-report.json", () =>+ response(model)+ );++ await render(+ <template>+ <AiUsage @model={{model}} @queryParams={{queryParams}} />+ </template>+ );+}