A platform for community discussion. Free, open, simple.
FIX: Accept Ask AI report dates ahead of UTC and show report settings (#43749)
Natalie Tay15acc3b935d6
diff --git a/plugins/discourse-ai/assets/javascripts/discourse/lib/ai-feature-setting-groups.js b/plugins/discourse-ai/assets/javascripts/discourse/lib/ai-feature-setting-groups.jsindex 1deb007b64c..be8fe952091 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/lib/ai-feature-setting-groups.js+++ b/plugins/discourse-ai/assets/javascripts/discourse/lib/ai-feature-setting-groups.js@@ -189,6 +189,15 @@ export const AI_FEATURE_SETTING_GROUPS = {titleKey: "discourse_ai.features.search.setting_groups.access_control",settings: ["ai_ask_ai_allowed_groups"],},+ {+ key: "ask_ai_reports",+ titleKey: "discourse_ai.features.search.setting_groups.ask_ai_reports",+ settings: [+ "ai_ask_ai_report_weekly_enabled",+ "ai_ask_ai_report_max_asks",+ "ai_ask_ai_report_recipient_groups",+ ],+ },],translation: [diff --git a/plugins/discourse-ai/config/locales/client.en.yml b/plugins/discourse-ai/config/locales/client.en.ymlindex 93126934dbb..1e49ba9896b 100644--- a/plugins/discourse-ai/config/locales/client.en.yml+++ b/plugins/discourse-ai/config/locales/client.en.yml@@ -421,6 +421,7 @@ en:settings: "Basic Settings"agents: "Agents"access_control: "Access Control"+ ask_ai_reports: "Ask AI reports"embeddings:name: "Embeddings"description: "Powers features like Related Topics and AI Search by generating semantic representations of text"diff --git a/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_request.rb b/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_request.rbindex 3c2b8cf40df..7b1ae1e68e6 100644--- a/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_request.rb+++ b/plugins/discourse-ai/lib/admin_dashboard/ask_ai_report_request.rb@@ -17,7 +17,7 @@ module DiscourseAirescue Date::Errorraise Discourse::InvalidParameters.new(:date_range)end- raise Discourse::InvalidParameters.new(:date_range) if first > last || last > Date.current+ raise Discourse::InvalidParameters.new(:date_range) if first > last || first > Date.currentagent = AiAgent.find_by(id: SiteSetting.ai_ask_ai_report_agent)model_id = agent&.default_llm_id.presence || SiteSetting.ai_default_llm_modelunless agent && LlmModel.exists?(id: model_id)diff --git a/plugins/discourse-ai/spec/lib/admin_dashboard/ask_ai_report_request_spec.rb b/plugins/discourse-ai/spec/lib/admin_dashboard/ask_ai_report_request_spec.rbindex f394a2e4355..115df7559b0 100644--- a/plugins/discourse-ai/spec/lib/admin_dashboard/ask_ai_report_request_spec.rb+++ b/plugins/discourse-ai/spec/lib/admin_dashboard/ask_ai_report_request_spec.rb@@ -81,7 +81,7 @@ describe DiscourseAi::AdminDashboard::AskAiReportRequest do%w[invalid 2026-09-09],%w[2026-09-09 2026-09-01],%w[2020-01-01 2026-09-09],- %w[2026-09-01 2026-09-10],+ %w[2026-09-10 2026-09-11],%w[2026-09-01 2026-09-09],].each do |first, last|expect {diff --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 e2de1a44b04..64a42e01493 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@@ -11,6 +11,32 @@ describe DiscourseAi::Admin::AskAiReportsController doallow(SiteSetting).to receive(:ai_default_llm_model).and_return(llm_model.id)end+ it "accepts the dashboard date range when the browser is ahead of UTC" do+ freeze_time Time.utc(2026, 9, 16, 17)+ sign_in(admin)+ ask = AskAiLog.create!(user: admin, query: "猫", asked_at: Time.current)+ AskAiLog.create!(user: admin, query: "Future", asked_at: 1.hour.from_now)+ dashboard =+ DiscourseAi::AdminDashboard::AskAi.build(+ start_date: "2026-08-19",+ end_date: "2026-09-17",+ current_user: admin,+ )++ post "/admin/plugins/discourse-ai/ask-ai-reports.json",+ params: {+ start_date: dashboard[:start_date].iso8601,+ end_date: dashboard[:end_date].iso8601,+ }++ expect(response.status).to eq(202)+ report = AskAiReport.find(response.parsed_body["report"]["id"])+ expect(report.start_date).to eq(Date.new(2026, 8, 19))+ expect(report.end_date).to eq(Date.new(2026, 9, 17))+ expect(report.selected_ask_ids).to eq([ask.id])+ expect(report.total_ask_count).to eq(1)+ end+it "expires abandoned reports when loading the dashboard and returns saved summaries" dosign_in(admin)report =diff --git a/plugins/discourse-ai/test/javascripts/unit/lib/ai-feature-setting-groups-test.js b/plugins/discourse-ai/test/javascripts/unit/lib/ai-feature-setting-groups-test.jsindex 7ac29fa48bf..a89aa44eda4 100644--- a/plugins/discourse-ai/test/javascripts/unit/lib/ai-feature-setting-groups-test.js+++ b/plugins/discourse-ai/test/javascripts/unit/lib/ai-feature-setting-groups-test.js@@ -73,7 +73,7 @@ module("Unit | Lib | ai-feature-setting-groups", function () {assert.deepEqual(groups.map((group) => group.key),- ["settings", "agents", "access_control"]+ ["settings", "agents", "access_control", "ask_ai_reports"]);assert.deepEqual(groups[0].settings, ["ai_discover_enabled",@@ -89,6 +89,11 @@ module("Unit | Lib | ai-feature-setting-groups", function () {"ai_ask_ai_follow_up_agent",]);assert.deepEqual(groups[2].settings, ["ai_ask_ai_allowed_groups"]);+ assert.deepEqual(groups[3].settings, [+ "ai_ask_ai_report_weekly_enabled",+ "ai_ask_ai_report_max_asks",+ "ai_ask_ai_report_recipient_groups",+ ]);});test("returns correct groups for translation", function (assert) {