A platform for community discussion. Free, open, simple.
FIX: Handle invalid Ask AI report references and expand report history (#44365)
Natalie Tay2bb38be03bae
diff --git a/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-report-subject.gjs b/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-report-subject.gjsindex 1d8b999ed5e..77bc62f5c9f 100644--- a/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-report-subject.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-report-subject.gjs@@ -19,32 +19,48 @@ export default class AskAiReportSubject extends Component {<template><div class="ask-ai-report-subject">- <DButton- aria-controls={{this.questionsId}}- aria-expanded={{if this.expanded "true" "false"}}- class="btn-flat ask-ai-report-subject__toggle"- @action={{this.toggle}}- @icon={{if this.expanded "chevron-down" "chevron-right"}}- >- <span class="ask-ai-report-subject__label">+ {{#if @subject.ask_count}}+ <DButton+ aria-controls={{this.questionsId}}+ aria-expanded={{if this.expanded "true" "false"}}+ class="btn-flat ask-ai-report-subject__toggle"+ @action={{this.toggle}}+ @icon={{if this.expanded "chevron-down" "chevron-right"}}+ >+ <span class="ask-ai-report-subject__label">+ <strong>{{@subject.name}}</strong>+ <span+ class="ask-ai-report-subject__description"+ >{{@subject.description}}</span>+ </span>+ <span class="ask-ai-report-subject__count">{{i18n+ "admin.dashboard.ask_ai.reports.subject_count"+ [email protected]_count+ }}</span>+ </DButton>+ <div hidden={{unless this.expanded true}} id={{this.questionsId}}>+ {{#if this.expanded}}+ <AskAiReportQuestions+ @reportId={{@reportId}}+ @subjectId={{@subject.id}}+ />+ {{/if}}+ </div>+ {{else}}+ <div class="ask-ai-report-subject__empty"><strong>{{@subject.name}}</strong>+ <span class="ask-ai-report-subject__count">{{i18n+ "admin.dashboard.ask_ai.reports.subject_count"+ [email protected]_count+ }}</span><spanclass="ask-ai-report-subject__description">{{@subject.description}}</span>- </span>- <span class="ask-ai-report-subject__count">{{i18n- "admin.dashboard.ask_ai.reports.subject_count"- [email protected]_count- }}</span>- </DButton>- <div hidden={{unless this.expanded true}} id={{this.questionsId}}>- {{#if this.expanded}}- <AskAiReportQuestions- @reportId={{@reportId}}- @subjectId={{@subject.id}}- />- {{/if}}- </div>+ <p class="ask-ai-report-subject__no-valid-questions">{{i18n+ "admin.dashboard.ask_ai.reports.no_valid_questions"+ }}</p>+ </div>+ {{/if}}</div></template>}diff --git a/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-report-subjects.gjs b/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-report-subjects.gjsindex 80dd8a5b6e7..6f0a55d24ba 100644--- a/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-report-subjects.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-report-subjects.gjs@@ -68,11 +68,23 @@ export default class AskAiReportSubjects extends Component {</a>{{/if}}</div>- <span class="ask-ai-reports__hint">{{i18n- "admin.dashboard.ask_ai.reports.coverage"- [email protected]_ask_count- [email protected]_ask_count- }}+ <span class="ask-ai-reports__hint">+ {{#if @reportQueryUrl}}+ <a+ class="ask-ai-report-subjects__coverage-link"+ href={{@reportQueryUrl}}+ >{{i18n+ "admin.dashboard.ask_ai.reports.coverage"+ [email protected]_ask_count+ [email protected]_ask_count+ }}</a>+ {{else}}+ {{i18n+ "admin.dashboard.ask_ai.reports.coverage"+ [email protected]_ask_count+ [email protected]_ask_count+ }}+ {{/if}}·{{i18n "admin.dashboard.ask_ai.reports.overlap"}}</span></div>diff --git a/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-reports.gjs b/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-reports.gjsindex c513b801f98..d29512a4b7b 100644--- a/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-reports.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/admin/components/dashboard/ask-ai-reports.gjs@@ -11,6 +11,7 @@ import DButton from "discourse/ui-kit/d-button";import DModal from "discourse/ui-kit/d-modal";import DModalCancel from "discourse/ui-kit/d-modal-cancel";import DNativeSelect from "discourse/ui-kit/d-native-select";+import dObserveIntersection from "discourse/ui-kit/modifiers/d-observe-intersection";import { i18n } from "discourse-i18n";import AskAiReportSubjects from "discourse/plugins/discourse-ai/admin/components/dashboard/ask-ai-report-subjects";@@ -39,10 +40,15 @@ const reportSettingsURL = getURL(export default class AskAiReports extends Component {@tracked reports = [];@tracked dataExplorerQueryId;+ @tracked periodQueryId;@tracked selectedReportId;@tracked loading = true;@tracked failed = false;@tracked submitting = false;+ @tracked reportOpened = false;+ @tracked reportLoading = false;+ @tracked reportFailed = false;+ @tracked detailedReport;@tracked showGenerateModal = false;@tracked recipientGroups = [];@@ -52,6 +58,7 @@ export default class AskAiReports extends Component {reportEndDate;#timer;+ #detailRequest = 0;constructor() {super(...arguments);@@ -63,6 +70,21 @@ export default class AskAiReports extends Component {clearTimeout(this.#timer);}+ get periodQueryUrl() {+ if (!this.periodQueryId) {+ return;+ }+ const params = encodeURIComponent(+ JSON.stringify({+ start_date: this.args.startDate,+ end_date: this.args.endDate,+ })+ );+ return getURL(+ `/admin/plugins/discourse-data-explorer/queries/${this.periodQueryId}?params=${params}`+ );+ }+get reportQueryUrl() {if (!this.dataExplorerQueryId || !this.visibleReportId) {return;@@ -114,9 +136,54 @@ export default class AskAiReports extends Component {return this.recipientGroups.join(", ");}+ @action+ reportEnteredView(entry) {+ if (entry.isIntersecting && !this.reportOpened) {+ this.loadReport();+ }+ }+@actionselectReport(id) {this.selectedReportId = id;+ this.loadReport();+ }++ @action+ async loadReport() {+ clearTimeout(this.#timer);+ const id = this.visibleReportId;+ if (!id) {+ return;+ }+ const request = ++this.#detailRequest;+ this.reportOpened = true;+ this.reportLoading = true;+ this.reportFailed = false;+ this.detailedReport = null;+ try {+ const result = await ajax(+ `/admin/plugins/discourse-ai/ask-ai-reports/${id}`+ );+ if (this.isDestroying || request !== this.#detailRequest) {+ return;+ }+ this.detailedReport = result.report;+ this.reports = this.reports.map((report) =>+ report.id === result.report.id+ ? { ...report, report_status: result.report.report_status }+ : report+ );+ this.#scheduleRefresh();+ } catch {+ if (!this.isDestroying && request === this.#detailRequest) {+ this.reportFailed = true;+ }+ } finally {+ if (!this.isDestroying && request === this.#detailRequest) {+ this.reportLoading = false;+ }+ }}@action@@ -155,9 +222,17 @@ export default class AskAiReports extends Component {this.reports = [result.report,...this.reports.filter((report) => report.id !== result.report.id),- ].slice(0, 3);+ ];this.selectedReportId = String(result.report.id);+ this.#detailRequest++;+ this.detailedReport = null;+ this.reportOpened = true;+ this.reportFailed = false;+ this.reportLoading = false;this.#scheduleRefresh();+ if (result.report.report_status === "completed") {+ this.loadReport();+ }this.closeGenerateModal();} catch (error) {popupAjaxError(error);@@ -178,9 +253,9 @@ export default class AskAiReports extends Component {}this.reports = result.reports;this.dataExplorerQueryId = result.data_explorer_query_id;+ this.periodQueryId = result.period_query_id;this.recipientGroups = result.recipient_groups ?? [];this.failed = false;- this.#scheduleRefresh();} catch {if (!this.isDestroying) {this.failed = true;@@ -195,11 +270,10 @@ export default class AskAiReports extends Component {#scheduleRefresh() {clearTimeout(this.#timer);if (- this.reports.some((report) =>- ["queued", "running"].includes(report.report_status)- )+ this.reportOpened &&+ ["queued", "running"].includes(this.visibleReports[0]?.report_status)) {- this.#timer = setTimeout(() => this.loadReports(), 5000);+ this.#timer = setTimeout(() => this.loadReport(), 5000);}}@@ -208,8 +282,8 @@ export default class AskAiReports extends Component {<section class="db-section__row-block"><div class="db-section__row-block-header"><h3 class="db-section__row-block-title">- {{#if this.reportQueryUrl}}- <a href={{this.reportQueryUrl}}>{{copy "title"}}</a>+ {{#if this.periodQueryUrl}}+ <a href={{this.periodQueryUrl}}>{{copy "title"}}</a>{{else}}{{copy "title"}}{{/if}}@@ -241,14 +315,35 @@ export default class AskAiReports extends Component {/></div>{{#each this.visibleReports key="id" as |report|}}- <article class="ask-ai-reports__report">+ <article+ class="ask-ai-reports__report"+ {{dObserveIntersection+ this.reportEnteredView+ threshold=0+ isLoading=this.reportOpened+ }}+ >{{#if (state report)}}<div class="ask-ai-reports__report-header"><span class="ask-ai-reports__hint">{{state report}}</span></div>{{/if}}- {{#if report.subjects.length}}- <AskAiReportSubjects @report={{report}} />+ {{#if this.reportLoading}}+ <p>{{copy "loading"}}</p>+ {{/if}}+ {{#if this.reportFailed}}+ <p role="alert">{{copy "load_failed"}}</p>+ <DButton+ class="ask-ai-reports__retry-report"+ @action={{this.loadReport}}+ @translatedLabel={{copy "reload"}}+ />+ {{/if}}+ {{#if this.detailedReport.subjects.length}}+ <AskAiReportSubjects+ @report={{this.detailedReport}}+ @reportQueryUrl={{this.reportQueryUrl}}+ />{{/if}}</article>{{else}}diff --git a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ask_ai_reports_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ask_ai_reports_controller.rbindex 988b9cb082c..bb4f9fbab6f 100644--- a/plugins/discourse-ai/app/controllers/discourse_ai/admin/ask_ai_reports_controller.rb+++ b/plugins/discourse-ai/app/controllers/discourse_ai/admin/ask_ai_reports_controller.rb@@ -8,11 +8,17 @@ module DiscourseAidef indexAskAiReport.expire_stale!- reports = AskAiReport.order(created_at: :desc).limit(3).preload(:subjects, :topic)+ reports =+ AskAiReport+ .select(:id, :start_date, :end_date, :report_status)+ .order(created_at: :desc, id: :desc)+ .limit(20)render json: {- reports: reports.map { |report| serialize_report(report) },+ reports: reports.map { |report| serialize_report_entry(report) },data_explorer_query_id:defined?(DiscourseDataExplorer) && SiteSetting.data_explorer_enabled ? -47 : nil,+ period_query_id:+ defined?(DiscourseDataExplorer) && SiteSetting.data_explorer_enabled ? -48 : nil,recipient_groups:Group.where(id: SiteSetting.ai_ask_ai_report_recipient_groups.split("|"))@@ -21,6 +27,12 @@ module DiscourseAi}end+ def show+ AskAiReport.where(id: params[:id]).expire_stale!+ report = AskAiReport.find(params[:id])+ render json: { report: serialize_report(report) }+ end+def asksreport = AskAiReport.find(params[:report_id])subject = report.subjects.find(params[:subject_id])@@ -96,6 +108,10 @@ module DiscourseAiend,}end++ def serialize_report_entry(report)+ report.slice(:id, :start_date, :end_date, :report_status)+ endendendenddiff --git a/plugins/discourse-ai/assets/stylesheets/modules/admin-dashboard/common/ask-ai-dashboard.scss b/plugins/discourse-ai/assets/stylesheets/modules/admin-dashboard/common/ask-ai-dashboard.scssindex fd789b14e1e..7149c85bc84 100644--- a/plugins/discourse-ai/assets/stylesheets/modules/admin-dashboard/common/ask-ai-dashboard.scss+++ b/plugins/discourse-ai/assets/stylesheets/modules/admin-dashboard/common/ask-ai-dashboard.scss@@ -75,6 +75,21 @@.ask-ai-report-subject {border-block-start: 1px solid var(--primary-low);+ &__empty {+ padding-block: var(--space-4);+ font-size: var(--font-down-1);+ overflow-wrap: anywhere;++ .ask-ai-report-subject__count {+ margin-inline-start: var(--space-3);+ }+ }++ &__no-valid-questions {+ margin-block: var(--space-2) 0;+ color: var(--primary-high);+ }+&__toggle.btn {--d-button-flat-bg-color--hover: transparent;display: flex;diff --git a/plugins/discourse-ai/config/locales/client.en.yml b/plugins/discourse-ai/config/locales/client.en.ymlindex 67e2b649a18..5f638ec4c09 100644--- a/plugins/discourse-ai/config/locales/client.en.yml+++ b/plugins/discourse-ai/config/locales/client.en.yml@@ -45,12 +45,13 @@ en:questions_failed: "Questions could not be loaded."more_questions: "Show more questions"no_questions: "The original asks are no longer available."+ no_valid_questions: "No valid questions were linked to this subject."loading: "Loading reports…"queued: "Queued"running: "Generating…"failed: "Failed — generate again to retry. If this keeps happening, consider reducing <a href='%{max_asks_url}' target='_blank' rel='noopener noreferrer'>max asks</a>."- view_pm: "View full report"- view_pm_new_tab: "View full report (opens in a new tab)"+ view_pm: "View report PM"+ view_pm_new_tab: "View report PM (opens in a new tab)"load_failed: "Reports could not be loaded."reload: "Reload reports"coverage: "%{count} of %{total} questions analyzed"diff --git a/plugins/discourse-ai/config/routes.rb b/plugins/discourse-ai/config/routes.rbindex 01d1cd32607..2d0d860c008 100644--- a/plugins/discourse-ai/config/routes.rb+++ b/plugins/discourse-ai/config/routes.rb@@ -106,7 +106,7 @@ Discourse::Application.routes.draw do:format => :jsonresources :ask_ai_reports,- only: %i[index create],+ only: %i[index show create],path: "ask-ai-reports",controller: "discourse_ai/admin/ask_ai_reports",defaults: {diff --git a/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_generator.rb b/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_generator.rbindex abb36a607fc..f5243d1c3d8 100644--- a/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_generator.rb+++ b/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_generator.rb@@ -102,16 +102,13 @@ module DiscourseAisubject["name"].length.between?(1, 100) &&subject["description"].is_a?(String) &&subject["description"].length.between?(1, 1000) &&- subject["ask_ids"].is_a?(Array) && subject["ask_ids"].present? &&- subject["ask_ids"].all? { |id| id.is_a?(Integer) } &&- subject["ask_ids"].uniq.size == subject["ask_ids"].size+ subject["ask_ids"].is_a?(Array) &&+ subject["ask_ids"].all? { |id| id.is_a?(Integer) }raise InvalidAnalysisend+ subject["ask_ids"] &= idsendvalidate_insights!(result["insights"], ids)- assigned = subjects.flat_map { |subject| subject["ask_ids"] }- unknown = assigned - ids- raise InvalidAnalysis, "Unknown IDs: #{unknown}" if unknown.present?enddef validate_insights!(insights, ids)diff --git a/plugins/discourse-ai/spec/jobs/regular/generate_ask_ai_report_spec.rb b/plugins/discourse-ai/spec/jobs/regular/generate_ask_ai_report_spec.rbindex 21861732c85..0d85d02b935 100644--- a/plugins/discourse-ai/spec/jobs/regular/generate_ask_ai_report_spec.rb+++ b/plugins/discourse-ai/spec/jobs/regular/generate_ask_ai_report_spec.rb@@ -107,24 +107,6 @@ describe Jobs::GenerateAskAiReport doexpect(report.subjects).to be_emptyend- it "fails without publishing when the model invents ask IDs" do- ask = AskAiLog.create!(user:, query: "Email", asked_at: Time.current)- report = request_report- output = {- insights: [],- summary: "Email",- subjects: [{ name: "Email", description: "Email questions", ask_ids: [ask.id + 1] }],- }-- DiscourseAi::Completions::Llm.with_prepared_responses([output.to_json]) do- described_class.new.execute(report_id: report.id)- end-- expect(report.reload).to be_report_status_failed- expect(report.topic_id).to be_nil- expect(report.subjects).to be_empty- end-it "keeps ungrouped questions without requesting a second analysis" dogrouped = AskAiLog.create!(user:, query: "Email setup", asked_at: Time.current)ungrouped = AskAiLog.create!(user:, query: "猫", asked_at: Time.current)@@ -145,24 +127,73 @@ describe Jobs::GenerateAskAiReport doexpect(report.topic_id).to be_presentend- it "rejects duplicate assignments without requesting a corrected report" do+ it "deduplicates subjects and removes unknown references without another analysis" do+ ask = AskAiLog.create!(user:, query: "猫", asked_at: Time.current)+ report = request_report+ outside_report = AskAiLog.create!(user:, query: "Email", asked_at: Time.current)+ unknown_id = outside_report.id+ output = {+ insights: [],+ summary: "Cats",+ subjects: [+ { name: "Cats", description: "Cat questions", ask_ids: [ask.id, ask.id, unknown_id] },+ { name: "Unknown", description: "Unknown questions", ask_ids: [unknown_id] },+ ],+ }++ DiscourseAi::Completions::Llm.with_prepared_responses([output.to_json]) do+ described_class.new.execute(report_id: report.id)+ end++ expect(report.reload).to be_report_status_completed+ expect(report.subjects.pluck(:name)).to eq(%w[Cats Unknown])+ expect(report.subjects.first.ask_count).to eq(1)+ expect(report.subjects.first.ask_ai_logs).to contain_exactly(ask)+ expect(report.subjects.last.ask_count).to eq(0)+ expect(report.subjects.last.ask_ai_logs).to be_empty+ expect(report.topic_id).to be_present+ end++ it "keeps subjects without valid references and places supplied questions in ungrouped" doask = AskAiLog.create!(user:, query: "猫", asked_at: Time.current)report = request_report- subject = { name: "Cats", description: "Cat questions", ask_ids: [ask.id] }- invalid = {+ output = {insights: [],summary: "Cats",- subjects: [subject.merge(ask_ids: [ask.id, ask.id])],+ subjects: [+ { name: "Unknown", description: "Unknown questions", ask_ids: [-1] },+ { name: "Empty", description: "No references", ask_ids: [] },+ ],+ }++ DiscourseAi::Completions::Llm.with_prepared_responses([output.to_json]) do+ described_class.new.execute(report_id: report.id)+ end++ expect(report.reload).to be_report_status_completed+ expect(report.subjects.pluck(:name, :ask_count)).to eq(+ [["Ungrouped questions", 1], ["Unknown", 0], ["Empty", 0]],+ )+ expect(report.subjects.first.ask_ai_logs).to contain_exactly(ask)+ expect(report.subjects.where(ask_count: 0).flat_map(&:ask_ai_logs)).to be_empty+ end++ it "rejects malformed subject question IDs even when valid questions are included" do+ ask = AskAiLog.create!(user:, query: "Email", asked_at: Time.current)+ report = request_report+ output = {+ insights: [],+ summary: "Email",+ subjects: [{ name: "Email", description: "Email questions", ask_ids: [ask.id, "invalid"] }],}- corrected = { insights: [], summary: "Cats", subjects: [subject] }- DiscourseAi::Completions::Llm.with_prepared_responses([invalid.to_json, corrected.to_json]) do+ DiscourseAi::Completions::Llm.with_prepared_responses([output.to_json]) dodescribed_class.new.execute(report_id: report.id)endexpect(report.reload).to be_report_status_failed- expect(report.subjects).to be_emptyexpect(report.topic_id).to be_nil+ expect(report.subjects).to be_emptyendit "delivers to the admins group only when selected" dodiff --git a/plugins/discourse-ai/spec/requests/admin/ask_ai_reports_spec.rb b/plugins/discourse-ai/spec/requests/admin/ask_ai_reports_spec.rbindex ac4440e2b6e..b22f0fe695e 100644--- a/plugins/discourse-ai/spec/requests/admin/ask_ai_reports_spec.rb+++ b/plugins/discourse-ai/spec/requests/admin/ask_ai_reports_spec.rb@@ -38,7 +38,7 @@ describe DiscourseAi::Admin::AskAiReportsController doexpect(report.total_ask_count).to eq(1)end- it "expires abandoned reports when loading the dashboard and returns saved summaries" do+ it "expires abandoned reports and only returns summaries when a report is opened" dosign_in(admin)report =AskAiReport.create!(@@ -54,7 +54,52 @@ describe DiscourseAi::Admin::AskAiReportsController doexpect(response.parsed_body["reports"].first["report_status"]).to eq("failed")report.update!(report_status: :completed, summary: "Questions about 猫.")get "/admin/plugins/discourse-ai/ask-ai-reports.json"- expect(response.parsed_body["reports"].first["summary"]).to eq("Questions about 猫.")+ expect(response.parsed_body["reports"].first.keys).to contain_exactly(+ "id",+ "start_date",+ "end_date",+ "report_status",+ )+ get "/admin/plugins/discourse-ai/ask-ai-reports/#{report.id}.json"+ expect(response.status).to eq(200)+ expect(response.parsed_body["report"]["summary"]).to eq("Questions about 猫.")+ end++ it "lists the latest twenty reports without loading subjects or topics" do+ sign_in(admin)+ reports =+ 21.times.map do+ AskAiReport.create!(+ requested_by: admin,+ start_date: Date.current,+ end_date: Date.current,+ total_ask_count: 1,+ reported_ask_count: 1,+ report_status: :completed,+ summary: "Summary 猫",+ created_at: Time.utc(2026, 9, 1),+ )+ end++ queries = track_sql_queries { get "/admin/plugins/discourse-ai/ask-ai-reports.json" }+ expect(response.parsed_body["reports"].pluck("id")).to eq(reports.last(20).reverse.map(&:id))+ expect(queries.grep(/FROM "(?:ask_ai_report_subjects|topics)"/i)).to be_empty+ end++ it "restricts report details to admins" do+ report =+ AskAiReport.create!(+ requested_by: admin,+ start_date: Date.current,+ end_date: Date.current,+ total_ask_count: 1,+ reported_ask_count: 1,+ )+ get "/admin/plugins/discourse-ai/ask-ai-reports/#{report.id}.json"+ expect(response.status).to eq(404)+ sign_in(moderator)+ get "/admin/plugins/discourse-ai/ask-ai-reports/#{report.id}.json"+ expect(response.status).to eq(404)endit "only exposes the query when Data Explorer is available" do@@ -62,9 +107,11 @@ describe DiscourseAi::Admin::AskAiReportsController doSiteSetting.data_explorer_enabled = trueget "/admin/plugins/discourse-ai/ask-ai-reports.json"expect(response.parsed_body["data_explorer_query_id"]).to eq(-47)+ expect(response.parsed_body["period_query_id"]).to eq(-48)SiteSetting.data_explorer_enabled = falseget "/admin/plugins/discourse-ai/ask-ai-reports.json"expect(response.parsed_body["data_explorer_query_id"]).to be_nil+ expect(response.parsed_body["period_query_id"]).to be_nilhide_const("DiscourseDataExplorer")allow(SiteSetting).to receive(:data_explorer_enabled).and_raise(NoMethodError)get "/admin/plugins/discourse-ai/ask-ai-reports.json"diff --git a/plugins/discourse-ai/test/javascripts/integration/components/ask-ai-report-subjects-test.gjs b/plugins/discourse-ai/test/javascripts/integration/components/ask-ai-report-subjects-test.gjsindex ad3a95e4ea4..87952cf3d7a 100644--- a/plugins/discourse-ai/test/javascripts/integration/components/ask-ai-report-subjects-test.gjs+++ b/plugins/discourse-ai/test/javascripts/integration/components/ask-ai-report-subjects-test.gjs@@ -3,6 +3,7 @@ import { module, test } from "qunit";import ModalContainer from "discourse/components/modal-container";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import pretender, { response } from "discourse/tests/helpers/create-pretender";+import { i18n } from "discourse-i18n";import AskAiReportSubjects from "discourse/plugins/discourse-ai/admin/components/dashboard/ask-ai-report-subjects";const endpoint = "/admin/plugins/discourse-ai/ask-ai-reports/1/subjects";@@ -25,6 +26,24 @@ module("Integration | Component | AskAiReportSubjects", function (hooks) {};});+ test("keeps subjects without valid questions visible without an expand button", async function (assert) {+ this.report.subjects = [+ { id: 1, name: "Cats", description: "Questions about 猫", ask_count: 0 },+ ];+ await render(+ <template><AskAiReportSubjects @report={{this.report}} /></template>+ );+ assert.dom(".ask-ai-report-subject").includesText("Cats");+ assert+ .dom(".ask-ai-report-subject__description")+ .hasText("Questions about 猫");+ assert+ .dom(".ask-ai-report-subject__no-valid-questions")+ .hasText(i18n("admin.dashboard.ask_ai.reports.no_valid_questions"));+ assert.dom(".ask-ai-report-subject__toggle").doesNotExist();+ assert.dom(".ask-ai-report-questions").doesNotExist();+ });+test("shows the saved summary as plain text without requiring a PM", async function (assert) {this.report.summary = "<img src=x> Users ask about 猫 and settings.";this.report.topic_url = null;@@ -68,14 +87,21 @@ module("Integration | Component | AskAiReportSubjects", function (hooks) {.hasAttribute("href", "/t/report/123").hasAttribute("target", "_blank").hasAttribute("rel", "noopener noreferrer")- .hasAttribute("aria-label", "View full report (opens in a new tab)")+ .hasAttribute(+ "aria-label",+ i18n("admin.dashboard.ask_ai.reports.view_pm_new_tab")+ ).hasText(- "View full report",+ i18n("admin.dashboard.ask_ai.reports.view_pm"),"groups the report link with the subject toggle");- assert- .dom(".ask-ai-report-subjects__footer")- .includesText("20 of 100", "shows coverage");+ assert.dom(".ask-ai-report-subjects__footer").includesText(+ i18n("admin.dashboard.ask_ai.reports.coverage", {+ count: 20,+ total: 100,+ }),+ "shows coverage"+ );await click(".ask-ai-report-subject__toggle");assert.dom('.ask-ai-report-subject__toggle[aria-expanded="true"]')@@ -178,7 +204,7 @@ module("Integration | Component | AskAiReportSubjects", function (hooks) {await click(".ask-ai-report-questions__query");assert.dom(".ask-ai-report-answer", document)- .includesText("No answer text was stored for this ask.");+ .includesText(i18n("admin.dashboard.ask_ai.reports.no_stored_answer"));});test("allows retry and explains when the original logs have been deleted", async function (assert) {@@ -197,13 +223,16 @@ module("Integration | Component | AskAiReportSubjects", function (hooks) {await click(".ask-ai-report-subject__toggle");assert.dom('[role="alert"]')- .hasText("Questions could not be loaded.", "shows a request failure");+ .hasText(+ i18n("admin.dashboard.ask_ai.reports.questions_failed"),+ "shows a request failure"+ );fail = false;await click(".ask-ai-report-questions__retry");assert.dom(".ask-ai-report-questions").includesText(- "The original asks are no longer available.",+ i18n("admin.dashboard.ask_ai.reports.no_questions"),"explains missing logs");assert.dom('[role="alert"]').doesNotExist("clears the failure after retry");diff --git a/plugins/discourse-ai/test/javascripts/integration/components/ask-ai-reports-test.gjs b/plugins/discourse-ai/test/javascripts/integration/components/ask-ai-reports-test.gjsindex ef48b8406fb..a8cedb1d069 100644--- a/plugins/discourse-ai/test/javascripts/integration/components/ask-ai-reports-test.gjs+++ b/plugins/discourse-ai/test/javascripts/integration/components/ask-ai-reports-test.gjs@@ -3,6 +3,8 @@ import { module, test } from "qunit";import ModalContainer from "discourse/components/modal-container";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import pretender, { response } from "discourse/tests/helpers/create-pretender";+import stubIntersectionObserver from "discourse/tests/helpers/stub-intersection-observer";+import { i18n } from "discourse-i18n";import AskAiReports from "discourse/plugins/discourse-ai/admin/components/dashboard/ask-ai-reports";const endpoint = "/admin/plugins/discourse-ai/ask-ai-reports";@@ -10,35 +12,83 @@ const endpoint = "/admin/plugins/discourse-ai/ask-ai-reports";module("Integration | Component | AskAiReports", function (hooks) {setupRenderingTest(hooks);- hooks.beforeEach(() => {+ hooks.beforeEach(function () {+ this.observations = stubIntersectionObserver();pretender.get(endpoint, () =>response({reports: [],data_explorer_query_id: -47,+ period_query_id: -48,recipient_groups: ["admins", "community_team"],}));});- test("links to the selected report rather than the dashboard period", async function (assert) {+ test("links separately to the dashboard period and the selected report", async function (assert) {pretender.get(endpoint, () =>response({data_explorer_query_id: -47,+ period_query_id: -48,reports: [11, 10].map((id) => ({id,start_date: "2026-08-01",end_date: "2026-08-31",report_status: "completed",- subjects: [],})),}));+ const requestedIds = [];+ pretender.get(`${endpoint}/:id`, (request) => {+ requestedIds.push(request.params.id);+ return response({+ report: {+ id: Number(request.params.id),+ report_status: "completed",+ reported_ask_count: 10,+ total_ask_count: 20,+ subjects: [+ {+ id: 1,+ name: "Email",+ description: "Email questions",+ ask_count: 10,+ },+ ],+ },+ });+ });await render(<template><AskAiReports @endDate="2026-09-16" @startDate="2026-09-01" /></template>);- const link = ".ask-ai-reports .db-section__row-block-title a";+ const periodLink = ".ask-ai-reports .db-section__row-block-title a";+ const periodUrl =+ "/admin/plugins/discourse-data-explorer/queries/-48?params=" ++ encodeURIComponent(+ JSON.stringify({ start_date: "2026-09-01", end_date: "2026-09-16" })+ );+ assert.dom(periodLink).hasAttribute("href", periodUrl);+ const link = ".ask-ai-report-subjects__coverage-link";+ assert.deepEqual(+ requestedIds,+ [],+ "does not fetch report details on dashboard load"+ );+ assert.dom(link).doesNotExist();+ assert.dom(".ask-ai-reports__view").doesNotExist();+ await this.observations[0].trigger({ isIntersecting: false });+ assert.deepEqual(requestedIds, []);+ await this.observations[0].trigger();+ assert.deepEqual(requestedIds, ["11"]);+ await this.observations[0].trigger();+ assert.deepEqual(requestedIds, ["11"], "loads once when entering view");+ assert.dom(link).hasText(+ i18n("admin.dashboard.ask_ai.reports.coverage", {+ count: 10,+ total: 20,+ })+ );assert.dom(link).hasAttribute(@@ -47,6 +97,8 @@ module("Integration | Component | AskAiReports", function (hooks) {encodeURIComponent(JSON.stringify({ report_id: 11 })));await fillIn(".ask-ai-reports__period-picker select", "10");+ assert.deepEqual(requestedIds, ["11", "10"]);+ assert.dom(periodLink).hasAttribute("href", periodUrl);assert.dom(link).hasAttribute(@@ -84,7 +136,6 @@ module("Integration | Component | AskAiReports", function (hooks) {assert.dom(".ask-ai-reports__generate").isNotDisabled("allows manual generation after failure or expiry");- assert.dom(".ask-ai-reports .db-section__row-block-title a").doesNotExist();assert.dom(".ask-ai-reports__report-header").includesText("If this keeps happening, consider reducing max asks.");@@ -98,6 +149,63 @@ module("Integration | Component | AskAiReports", function (hooks) {.hasAttribute("target", "_blank");});+ test("retries a report detail failure without reloading the history", async function (assert) {+ let historyRequests = 0;+ let detailRequests = 0;+ pretender.get(endpoint, () => {+ historyRequests++;+ return response({+ reports: [+ {+ id: 1,+ start_date: "2026-09-01",+ end_date: "2026-09-09",+ report_status: "completed",+ },+ ],+ });+ });+ pretender.get(`${endpoint}/1`, () => {+ detailRequests++;+ return detailRequests === 1+ ? [500, {}, "{}"]+ : response({+ report: {+ id: 1,+ report_status: "completed",+ summary: "Questions about 猫",+ reported_ask_count: 1,+ total_ask_count: 1,+ subjects: [+ {+ id: 1,+ name: "Cats",+ description: "Cat questions",+ ask_count: 1,+ },+ ],+ },+ });+ });+ await render(+ <template>+ <AskAiReports @endDate="2026-09-09" @startDate="2026-09-01" />+ </template>+ );+ assert.strictEqual(detailRequests, 0);+ await this.observations[0].trigger();+ assert+ .dom(".ask-ai-reports [role=alert]")+ .hasText(i18n("admin.dashboard.ask_ai.reports.load_failed"));+ await click(".ask-ai-reports__retry-report");+ assert+ .dom(".ask-ai-report-subjects__summary")+ .hasText("Questions about 猫");+ assert.dom(".ask-ai-reports [role=alert]").doesNotExist();+ assert.strictEqual(historyRequests, 1);+ assert.strictEqual(detailRequests, 2);+ });+test("shows the first-report empty state", async function (assert) {await render(<template>@@ -111,7 +219,15 @@ module("Integration | Component | AskAiReports", function (hooks) {assert.dom(".ask-ai-reports").includesText("No reports generated yet.", "explains the empty history");- assert.dom(".ask-ai-reports .db-section__row-block-title a").doesNotExist();+ assert+ .dom(".ask-ai-reports .db-section__row-block-title a")+ .hasAttribute(+ "href",+ "/admin/plugins/discourse-data-explorer/queries/-48?params=" ++ encodeURIComponent(+ JSON.stringify({ start_date: "2026-09-01", end_date: "2026-09-09" })+ )+ );assert.dom(".ask-ai-reports__period-picker").doesNotExist("has no period selector before the first report");@@ -211,6 +327,25 @@ module("Integration | Component | AskAiReports", function (hooks) {});test("shows stored subjects and the PM for a previous period", async function (assert) {+ pretender.get(`${endpoint}/1`, () =>+ response({+ report: {+ id: 1,+ report_status: "completed",+ reported_ask_count: 200,+ total_ask_count: 300,+ subjects: [+ {+ id: 9,+ name: "Email",+ description: "Setting up email.",+ ask_count: 200,+ },+ ],+ topic_url: "/t/report/123",+ },+ })+ );pretender.get(endpoint, () =>response({reports: [@@ -219,17 +354,6 @@ module("Integration | Component | AskAiReports", function (hooks) {start_date: "2026-08-01",end_date: "2026-08-31",report_status: "completed",- reported_ask_count: 200,- total_ask_count: 300,- subjects: [- {- id: 9,- name: "Email",- description: "Setting up email.",- ask_count: 200,- },- ],- topic_url: "/t/report/123",},],})@@ -244,10 +368,7 @@ module("Integration | Component | AskAiReports", function (hooks) {/></template>);- assert- .dom(".ask-ai-reports__report")- .includesText("200 of 300", "shows sampling coverage");- assert.dom(".ask-ai-reports__report").includesText("Subjects may overlap");+ await this.observations[0].trigger();assert.dom(".ask-ai-report-subject__toggle").includesText("Email", "shows saved subject");@@ -260,12 +381,6 @@ module("Integration | Component | AskAiReports", function (hooks) {assert.dom(".db-section__row-block").exists({ count: 1 }, "keeps reports in one section");- assert- .dom(".ask-ai-reports__report")- .includesText(- "Setting up email.",- "shows the selected subject description"- );assert.dom(".ask-ai-reports__generate").isDisabled("does not request an empty period");diff --git a/plugins/discourse-data-explorer/lib/discourse_data_explorer/queries.rb b/plugins/discourse-data-explorer/lib/discourse_data_explorer/queries.rbindex 7eb36d7ad32..448e5885c57 100644--- a/plugins/discourse-data-explorer/lib/discourse_data_explorer/queries.rb+++ b/plugins/discourse-data-explorer/lib/discourse_data_explorer/queries.rb@@ -280,10 +280,16 @@ module DiscourseDataExplorer},"ask-ai-report-questions": {id: -47,- name: "Ask AI - What users are asking",+ name: "Ask AI - Questions included in this report",description:"Questions included in a particular Ask AI report, with their subjects and logged answers. Questions assigned to multiple subjects appear once per subject. Requires Discourse AI.",},+ "ask-ai-questions": {+ id: -48,+ name: "Ask AI - What users are asking",+ description:+ "All Ask AI questions between start_date and end_date, inclusive (UTC), with logged answers. Includes groups excluded from generated reports and is not limited by the report sample size. Requires Discourse AI.",+ },}.with_indifferent_accessqueries["most-common-likers"]["sql"] = <<~SQL@@ -1688,6 +1694,30 @@ module DiscourseDataExplorerORDER BY subjects.position, subjects.id, logs.asked_at DESC, logs.id DESCSQL+ queries["ask-ai-questions"]["sql"] = <<~SQL+ -- [params]+ -- date :start_date+ -- date :end_date++ SELECT+ user_id,+ TO_CHAR(asked_at, 'Mon DD HH24:MI "UTC"') AS asked_at,+ query,+ answer_title,+ answer,+ CASE ask_outcome+ WHEN 0 THEN 'answered'+ WHEN 1 THEN 'no_answer'+ WHEN 2 THEN 'failed'+ WHEN 3 THEN 'cancelled'+ ELSE 'pending'+ END AS outcome+ FROM ask_ai_logs+ WHERE asked_at >= :start_date::date+ AND asked_at < :end_date::date + INTERVAL '1 day'+ ORDER BY ask_ai_logs.asked_at DESC, id DESC+ SQL+# convert query ids from "mostcommonlikers" to "-1", "mostmessages" to "-2" etc.queries.transform_keys!.with_index { |key, idx| "-#{idx + 1}" }queriesdiff --git a/plugins/discourse-data-explorer/spec/lib/ask_ai_queries_spec.rb b/plugins/discourse-data-explorer/spec/lib/ask_ai_queries_spec.rbindex c04f2b6a626..cb37ba7ace1 100644--- a/plugins/discourse-data-explorer/spec/lib/ask_ai_queries_spec.rb+++ b/plugins/discourse-data-explorer/spec/lib/ask_ai_queries_spec.rb@@ -63,4 +63,15 @@ describe DiscourseDataExplorer::Queries doexpect(run_query(-46).first["outcome"]).to eq("pending")expect(run_query(-45).last["asks"].to_i).to eq(1)end++ it "lists all asks in the period without requiring a report or applying report exclusions" do+ SiteSetting.ai_ask_ai_report_max_asks = 1+ SiteSetting.ai_ask_ai_report_exclude_groups = Group::AUTO_GROUPS[:staff].to_s+ AskAiLog.create!(user: admin, query: "Before", asked_at: Time.utc(2026, 9, 7, 23, 59, 59))+ AskAiLog.create!(user: admin, query: "猫", asked_at: Time.utc(2026, 9, 8))+ AskAiLog.create!(user: admin, query: "Last", asked_at: Time.utc(2026, 9, 9, 23, 59, 59))+ AskAiLog.create!(user: admin, query: "After", asked_at: Time.utc(2026, 9, 10))++ expect(run_query(-48).pluck("query")).to eq(%w[Last 猫])+ endend