A platform for community discussion. Free, open, simple.
FEATURE: add data explorer query tags by type (#44685)
David Battersbye8f43a53b470
diff --git a/db/structure.sql b/db/structure.sqlindex 1de3be1337c..e9205d2fda8 100644--- a/db/structure.sql+++ b/db/structure.sql@@ -26090,6 +26090,7 @@ SET search_path TO "$user", public;INSERT INTO "schema_migrations" (version) VALUES('20261015175355'),('20261015175340'),+('20261015121116'),('20261014224810'),('20261014145458'),('20261014065735'),diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjsindex ef25dedde66..4e134f965b6 100644--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs@@ -114,10 +114,8 @@ export default class QueriesEdit extends Component {{{i18n "explorer.query_tags"}}</span><QueryTagChooser- @allowDefaultTag={{@controller.model.is_default}}+ @automaticTags={{@controller.model.automatic_tags}}@availableTags={{@controller.availableTags}}- @mandatoryValues={{@controller.mandatoryTags}}- @mandatoryValueTitle={{i18n "explorer.default_tag_mandatory"}}@onChange={{@controller.updateTags}}@value={{@controller.model.tags}}/>diff --git a/plugins/discourse-data-explorer/app/models/discourse_data_explorer/query.rb b/plugins/discourse-data-explorer/app/models/discourse_data_explorer/query.rbindex 901fb36b113..48adc7432ae 100644--- a/plugins/discourse-data-explorer/app/models/discourse_data_explorer/query.rb+++ b/plugins/discourse-data-explorer/app/models/discourse_data_explorer/query.rb@@ -17,6 +17,8 @@ module DiscourseDataExplorerself.table_name = "data_explorer_queries"DEFAULT_TAG = "default"+ CUSTOM_TAG = "custom"+ RESERVED_TAGS = [DEFAULT_TAG, CUSTOM_TAG].freezehas_many :query_groupshas_many :groups, through: :query_groups@@ -46,18 +48,29 @@ module DiscourseDataExplorerArray.wrap(tag_names).reduce(all) do |scope, tag_name|- default_query_condition =- tag_name == DEFAULT_TAG ? "data_explorer_queries.id < 0 OR" : ""- scope.where(<<~SQL, tag_name)- (#{default_query_condition} EXISTS (+ automatic_condition =+ case tag_name+ when DEFAULT_TAG+ "data_explorer_queries.id < 0"+ when CUSTOM_TAG+ "data_explorer_queries.id > 0"+ else+ "data_explorer_queries.id IN (:default_query_ids)"+ end+ scope.where(+ <<~SQL,+ (#{automatic_condition} OR EXISTS (SELECT 1FROM data_explorer_query_tags query_tag_mappingsJOIN data_explorer_tags query_tagsON query_tags.id = query_tag_mappings.query_tag_idWHERE query_tag_mappings.query_id = data_explorer_queries.id- AND query_tags.name = ?+ AND query_tags.name = :tag_name))SQL+ tag_name:,+ default_query_ids: default_query_ids_tagged(tag_name),+ )endend@@ -65,6 +78,20 @@ module DiscourseDataExplorerid.to_i < 0end+ def self.automatic_tag_names(id)+ if is_default_query?(id)+ [DEFAULT_TAG, *Queries.tags[id.to_i]]+ elsif id.to_i > 0+ [CUSTOM_TAG]+ else+ []+ end+ end++ def self.default_query_ids_tagged(tag_name)+ Queries.tags.filter_map { |id, names| id if names.include?(tag_name) }+ end+def params@params ||= Parameter.create_from_sql(sql)end@@ -98,18 +125,17 @@ module DiscourseDataExplorer.where(data_explorer_queries: { hidden: false }).distinct.pluck(:name)- (tag_names << DEFAULT_TAG).uniq.sort_by(&:downcase)+ (tag_names + RESERVED_TAGS + Queries.tags.values.flatten).uniq.sort_by(&:downcase)enddef self.unpersisted_defaults(search: nil, tags: nil, tag: nil)selected_tags = QueryTag.normalize_all(tags || tag)- return [] if selected_tags.any? { |name| name != DEFAULT_TAG }-persisted_ids = where(hidden: false).where("id < 0").pluck(:id).to_setquery_text = search&.downcaseQueries.default.filter_map do |_, attributes|next if persisted_ids.include?(attributes["id"])+ next if (selected_tags - automatic_tag_names(attributes["id"])).any?if query_textname_match = attributes["name"]&.downcase&.include?(query_text)@@ -124,9 +150,7 @@ module DiscourseDataExplorerenddef tag_names- names = tags.map(&:name)- names.unshift(DEFAULT_TAG) if self.class.is_default_query?(id)- names.uniq+ (self.class.automatic_tag_names(id) + tags.map(&:name)).uniqendprivatediff --git a/plugins/discourse-data-explorer/app/models/discourse_data_explorer/query_tag.rb b/plugins/discourse-data-explorer/app/models/discourse_data_explorer/query_tag.rbindex 1c066b2b3bc..6cb19d72b50 100644--- a/plugins/discourse-data-explorer/app/models/discourse_data_explorer/query_tag.rb+++ b/plugins/discourse-data-explorer/app/models/discourse_data_explorer/query_tag.rb@@ -52,7 +52,7 @@ module DiscourseDataExplorerdef self.sync!(query:, names:)names = normalize_all(names)validate_names!(query:, names:)- names.delete(Query::DEFAULT_TAG) if query.id.negative?+ names -= Query.automatic_tag_names(query.id)desired = resolve_or_create!(names)desired_ids = desired.map(&:id)@@ -90,9 +90,10 @@ module DiscourseDataExplorerdef self.validate_names!(query:, names:)errors = ActiveModel::Errors.new(query)- validate_names(query.id.negative? ? (names | [Query::DEFAULT_TAG]) : names, errors)- if !Query.is_default_query?(query.id) && names.include?(Query::DEFAULT_TAG)- errors.add(:base, I18n.t("discourse_data_explorer.errors.default_tag_reserved"))+ automatic_names = Query.automatic_tag_names(query.id)+ validate_names(names - automatic_names, errors)+ (names & (Query::RESERVED_TAGS - automatic_names)).each do |name|+ errors.add(:base, I18n.t("discourse_data_explorer.errors.#{name}_tag_reserved"))endreturn if errors.empty?diff --git a/plugins/discourse-data-explorer/app/serializers/discourse_data_explorer/query_details_serializer.rb b/plugins/discourse-data-explorer/app/serializers/discourse_data_explorer/query_details_serializer.rbindex 45aff103c24..6e14123a889 100644--- a/plugins/discourse-data-explorer/app/serializers/discourse_data_explorer/query_details_serializer.rb+++ b/plugins/discourse-data-explorer/app/serializers/discourse_data_explorer/query_details_serializer.rb@@ -2,7 +2,13 @@module DiscourseDataExplorerclass QueryDetailsSerializer < QuerySerializer- attributes :sql, :param_info, :created_at, :hidden, :dashboard_mountable, :dashboard_mounted+ attributes :sql,+ :param_info,+ :created_at,+ :hidden,+ :automatic_tags,+ :dashboard_mountable,+ :dashboard_mounteddef include_sql?scope&.is_admin?@@ -12,6 +18,10 @@ module DiscourseDataExplorerobject&.params&.uniq { |p| p.identifier }&.map(&:to_hash)end+ def automatic_tags+ Query.automatic_tag_names(object.id)+ end+def dashboard_mountableAdminDashboardReportProvider.mountable?(object)enddiff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-tag-chooser.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-tag-chooser.gjsindex e53db47c2a1..5b399486c30 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-tag-chooser.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-tag-chooser.gjs@@ -1,14 +1,20 @@import Component from "@glimmer/component";import { hash } from "@ember/helper";import ListSetting from "discourse/select-kit/components/list-setting";+import { i18n } from "discourse-i18n";-const DEFAULT_QUERY_TAG = "default";+// Assigned by the server based on query ownership, never chosen by users+const RESERVED_QUERY_TAGS = ["default", "custom"];++function isAllowedTag(tag, automaticTags = []) {+ const name = tag?.trim().toLowerCase();+ return !RESERVED_QUERY_TAGS.includes(name) || automaticTags.includes(name);+}class QueryTagListSetting extends ListSetting {validateCreate(filter, content) {return (- (this.allowDefaultTag ||- filter.trim().toLowerCase() !== DEFAULT_QUERY_TAG) &&+ isAllowedTag(filter, this.automaticTags) &&super.validateCreate(filter, content));}@@ -21,12 +27,16 @@ export default class QueryTagChooser extends Component {...(this.args.value ?? []),];return this.#uniqueTags(- this.args.allowDefaultTag- ? tags- : tags.filter((tag) => tag?.trim().toLowerCase() !== DEFAULT_QUERY_TAG)+ tags.filter((tag) => isAllowedTag(tag, this.args.automaticTags)));}+ get mandatoryValues() {+ return this.args.automaticTags?.length+ ? this.args.automaticTags.join("|")+ : null;+ }+#uniqueTags(tags = []) {const tagsByName = new Map();@@ -46,10 +56,10 @@ export default class QueryTagChooser extends Component {<QueryTagListSettingclass="query-tag-chooser"...attributes- @allowDefaultTag={{@allowDefaultTag}}+ @automaticTags={{@automaticTags}}@choices={{this.choices}}- @mandatoryValues={{@mandatoryValues}}- @mandatoryValueTitle={{@mandatoryValueTitle}}+ @mandatoryValues={{this.mandatoryValues}}+ @mandatoryValueTitle={{i18n "explorer.automatic_tag_mandatory"}}@onChange={{@onChange}}@options={{hash allowAny=true}}@value={{@value}}diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.jsindex 2e38392d627..e68e17f877c 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/controllers/admin-plugins/show/explorer/edit.js@@ -20,7 +20,6 @@ import {} from "discourse/plugins/discourse-data-explorer/discourse/lib/data-explorer-store";import Query from "discourse/plugins/discourse-data-explorer/discourse/models/query";-const DEFAULT_QUERY_TAG = "default";const HIDE_SCHEMA_KEY = "hide_schema";const DASHBOARD_REPORT_SOURCE = "data_explorer_query";@@ -127,10 +126,6 @@ export default class PluginsExplorerController extends Controller {});}- get mandatoryTags() {- return this.model.is_default ? DEFAULT_QUERY_TAG : null;- }-get hasResults() {return !!this.results?.rows?.length;}@@ -442,9 +437,11 @@ export default class PluginsExplorerController extends Controller {@actionupdateTags(value) {- const tags = this.model.is_default- ? [DEFAULT_QUERY_TAG, ...value.filter((tag) => tag !== DEFAULT_QUERY_TAG)]- : value;+ const automaticTags = this.model.automatic_tags ?? [];+ const tags = [+ ...automaticTags,+ ...value.filter((tag) => !automaticTags.includes(tag)),+ ];this.model.set("tags", tags);this.recomputeDirty();}diff --git a/plugins/discourse-data-explorer/config/locales/client.en.yml b/plugins/discourse-data-explorer/config/locales/client.en.ymlindex 3902ae2f6dc..6146bd68aa8 100644--- a/plugins/discourse-data-explorer/config/locales/client.en.yml+++ b/plugins/discourse-data-explorer/config/locales/client.en.yml@@ -153,7 +153,7 @@ en:query_name: "Query"query_groups: "Groups"query_tags: "Tags"- default_tag_mandatory: "The default tag cannot be removed from bundled queries."+ automatic_tag_mandatory: "This tag is added automatically and cannot be removed."link: "Link for"report_name: "Report"query_description: "Description"diff --git a/plugins/discourse-data-explorer/config/locales/server.en.yml b/plugins/discourse-data-explorer/config/locales/server.en.ymlindex 89e7dc89691..ffa3deea4b9 100644--- a/plugins/discourse-data-explorer/config/locales/server.en.yml+++ b/plugins/discourse-data-explorer/config/locales/server.en.yml@@ -29,10 +29,11 @@ en:error_no_sql_returned: "AI did not return a valid SQL query. Please try again or write the query manually."errors:default_tag_reserved: "The default tag is reserved for system queries."+ custom_tag_reserved: "The custom tag is reserved for user-created queries."tag_contains_comma: "Tags cannot contain commas."tag_too_long: "A tag can have at most %{max} characters."tool_not_allowed: "You are not allowed to use this tool"- too_many_tags: "A query can have at most %{max} tags."+ too_many_tags: "A query can have at most %{max} tags, not counting automatic tags."discourse_workflows:sql_action:no_query_selected: "No query selected."diff --git a/plugins/discourse-data-explorer/db/post_migrate/20261015121116_delete_stored_custom_data_explorer_tag.rb b/plugins/discourse-data-explorer/db/post_migrate/20261015121116_delete_stored_custom_data_explorer_tag.rbnew file mode 100644index 00000000000..73ee6c2379b--- /dev/null+++ b/plugins/discourse-data-explorer/db/post_migrate/20261015121116_delete_stored_custom_data_explorer_tag.rb@@ -0,0 +1,18 @@+# frozen_string_literal: true++# "custom" is now derived from query ownership, so a stored copy is redundant on+# user queries and invalid on bundled ones.+class DeleteStoredCustomDataExplorerTag < ActiveRecord::Migration[8.1]+ def up+ execute <<~SQL+ DELETE FROM data_explorer_query_tags+ WHERE query_tag_id IN (SELECT id FROM data_explorer_tags WHERE name = 'custom')+ SQL++ execute "DELETE FROM data_explorer_tags WHERE name = 'custom'"+ end++ def down+ raise ActiveRecord::IrreversibleMigration+ end+enddiff --git a/plugins/discourse-data-explorer/lib/discourse_data_explorer/queries.rb b/plugins/discourse-data-explorer/lib/discourse_data_explorer/queries.rbindex 448e5885c57..da1f3ae0e18 100644--- a/plugins/discourse-data-explorer/lib/discourse_data_explorer/queries.rb+++ b/plugins/discourse-data-explorer/lib/discourse_data_explorer/queries.rb@@ -3,8 +3,17 @@module DiscourseDataExplorerclass Queriesdef self.default+ definitions.transform_values { |attributes| attributes.except("tags") }+ end++ # Tags shipped with default queries, in addition to the virtual "default" tag+ def self.tags+ @tags ||= definitions.to_h { |id, attributes| [id.to_i, attributes["tags"] || []] }.freeze+ end++ def self.definitions# WARNING: Edit the query hash carefully- # For each query, add id, name and description here and add sql below+ # For each query, add id, name, description and optional tags here and add sql below# Feel free to add new queries at the bottom of the hash in numerical order# If any query has been run on an instance, it is then saved in the local db# Locally stored queries are updated from the below data only when they are run again@@ -16,279 +25,327 @@ module DiscourseDataExplorerid: -1,name: "Most Common Likers",description: "Which users like particular other users the most?",+ tags: %w[users],},"most-messages": {id: -2,name: "Who has been sending the most messages in the last week?",description: "tracking down suspicious PM activity",+ tags: %w[engagement],},"edited-post-spam": {id: -3,name: "Last 500 posts that were edited by TL0/TL1 users",description: "fighting human-driven copy-paste spam",+ tags: %w[users],},"new-topics": {id: -4,name: "New Topics by Category",description:"Lists all new topics ordered by category and creation_date. The query accepts a ‘months_ago’ parameter. It defaults to 0 to give you the stats for the current month.",+ tags: %w[content],},"active-topics": {id: -5,name: "Top 100 Active Topics",description:"based on the number of replies, it accepts a ‘months_ago’ parameter, defaults to 1 to give results for the last calendar month.",+ tags: %w[content],},"top-likers": {id: -6,name: "Top 100 Likers",description:"returns the top 100 likers for a given monthly period ordered by like_count. It accepts a ‘months_ago’ parameter, defaults to 1 to give results for the last calendar month.",+ tags: %w[users],},"quality-users": {id: -7,name: "Top 50 Quality Users",description:"based on post score calculated using reply count, likes, incoming links, bookmarks, time spent and read count.",+ tags: %w[users],},"user-participation": {id: -8,name: "User Participation Statistics",description: "Detailed statistics for the most active users.",+ tags: %w[engagement],},"largest-uploads": {id: -9,name: "Top 50 Largest Uploads",description: "sorted by file size.",+ tags: %w[admin],},"inactive-users": {id: -10,name: "Inactive Users with no posts",description: "analyze pre-Discourse signups.",+ tags: %w[users],},"active-lurkers": {id: -11,name: "Most Active Lurkers",description:"active users without posts and excessive read times, it accepts a post_read_count parameter that sets the threshold for posts read.",+ tags: %w[engagement],},"topic-user-notification-level": {id: -12,name: "List of topics a user is watching/tracking/muted",description:"The query requires a ‘notification_level’ parameter. Use 0 for muted, 1 for regular, 2 for tracked and 3 for watched topics.",+ tags: %w[users],},"assigned-topics-report": {id: -13,name: "List of assigned topics by user",description: "This report requires the assign plugin, it will find all assigned topics",+ tags: %w[assign],},"group-members-reply-count": {id: -14,name: "Group Members Reply Count",description:"Number of replies by members of a group over a given time period. Requires 'group_name', 'start_date', and 'end_date' parameters. Dates need to be in the form 'yyyy-mm-dd'. Accepts an 'include_pms' parameter.",+ tags: %w[assign],},"total-assigned-topics-report": {id: -15,name: "Total topics assigned per user",description: "Count of assigned topis per user linking to assign list",+ tags: %w[assign],},"poll-results": {id: -16,name: "Poll results report",description:"Details of a poll result, including details about each vote and voter, useful for analyzing results in external software.",+ tags: %w[polls],},"top-tags-per-year": {id: -17,name: "Top tags per year",description: "List the top tags per year.",+ tags: %w[content],},number_of_replies_by_category: {id: -18,name: "Number of replies by category",description: "List the number of replies by category.",+ tags: %w[content],},"poll-results-ranked-choice": {id: -19,name: "Poll results report (for Ranked Choice polls)",description:"Details of a Ranked Choice poll result, including details about each vote and voter inc. rank, useful for analyzing results in external software.",+ tags: %w[polls],},"weekly-unique-visitors": {id: -20,name: "Weekly Unique Visitors",description:"Number of distinct users who visited the site each week. Accepts a 'weeks_ago' parameter, defaults to the last 12 weeks.",+ tags: %w[traffic],},"top-topics-by-views": {id: -21,name: "Top 100 Topics by Views",description:"The most viewed topics in a recent period, split into anonymous and logged-in views. Accepts a 'days_ago' parameter, defaults to the last 7 days.",+ tags: %w[content],},"top-search-terms": {id: -22,name: "Top 200 Search Terms",description:"The most popular search terms by number of distinct users searching for them, useful for spotting content gaps. Accepts a 'days_ago' parameter, defaults to the last 30 days.",+ tags: %w[content],},"topic-views-and-clicks": {id: -23,name: "Topic Views and Link Clicks Over Time",description:"Daily views (anonymous and logged in) and outbound link clicks for a single topic, useful for measuring how an announcement performed. Requires a 'topic_id' parameter, accepts a 'days_ago' parameter.",+ tags: %w[content],},"avg-first-response-time": {id: -24,name: "Average Time to First Response",description:"Average number of hours before a new topic receives its first reply from someone other than the topic author, grouped by week. Accepts a 'weeks_ago' parameter, defaults to the last 12 weeks.",+ tags: %w[engagement],},"new-topic-response-rate": {id: -25,name: "New Topic Response Rate",description:"Percentage of new public topics that receive any reply, and a staff reply, within 30 days of creation, grouped by month. Only counts topics old enough to have had a fair chance at a reply. Accepts a 'months_ago' parameter.",+ tags: %w[engagement],},"community-participation-trend": {id: -26,name: "Community Participation Trend",description:"Monthly count of distinct non-staff users replying in public topics, with average replies per replier, useful to distinguish 'fewer people participating' from 'the same people posting less'. Accepts a 'months_ago' parameter.",+ tags: %w[engagement],},"trust-level-growth": {id: -27,name: "Trust Level Growth Summary",description:"Number of users who reached each trust level in a recent period, alongside the current total population at each level. Accepts a 'days_ago' parameter, defaults to the last 28 days.",+ tags: %w[users],},"topics-with-no-response": {id: -28,name: "Topics With No Response",description:"Number of topics per period that never received a reply from anyone other than the topic author. Accepts 'days_ago', 'category_id', 'include_subcategories' and 'interval' (day, week, month or year) parameters.",+ tags: %w[content],},"top-posters": {id: -29,name: "Top Posters in a Given Timeframe",description:"Ranks users by topics created and replies posted in a date range. Requires 'start_date' and 'end_date' parameters (yyyy-mm-dd). Accepts a 'top_x' parameter, defaults to 10.",+ tags: %w[engagement],},"category-activity": {id: -30,name: "Category Activity Breakdown",description:"Topic count, post count, likes and reads per category for a date range. Requires 'start_date' and 'end_date' parameters (yyyy-mm-dd).",+ tags: %w[content],},"tl3-promotion-candidates": {id: -31,name: "Trust Level 3 Promotion Progress",description:"Checks every trust level 3 promotion requirement for current trust level 2 users, mirroring the logic of the built-in promotion job, including promotion blockers (locked trust level, active or recent suspensions and silences). Each threshold is a parameter defaulting to the matching site setting's default. Set 'show_all_results' to false to only list users currently meeting every requirement.",+ tags: %w[users],},"silenced-users": {id: -32,name: "Silenced Users Report",description:"Currently silenced users, when they were silenced and by whom ('system' for automatic silences). Accepts optional 'start_date', 'end_date' and 'silenced_by' parameters.",+ tags: %w[moderation],},"user-warnings": {id: -33,name: "Recent Official Warnings",description:"Official warnings issued recently, showing who was warned, who issued the warning, and the related topic. Accepts a 'days_ago' parameter, defaults to the last 28 days.",+ tags: %w[moderation],},"most-flagged-users": {id: -34,name: "Users With Most Agreed-Upon Flags",description:"Ranks users by the number of their posts that had a flag agreed with by staff, useful for finding repeat offenders.",+ tags: %w[moderation],},"subcategory-permission-drift": {id: -35,name: "Subcategory Permission Audit",description:"Finds subcategories granting a group permission that the parent category does not grant — a permission-hygiene check not surfaced by the admin UI.",+ tags: %w[admin],},"reading-participation-histogram": {id: -36,name: "Reading Participation Histogram",description:"Buckets users by how many posts they read in a given period, from a single post up to 2048+, showing the shape of your reading base (lurkers vs power readers). Accepts 'from_days_ago' and 'duration_days' parameters.",+ tags: %w[engagement],},"flags-by-type": {id: -37,name: "Flags by Type",description:"Number of flags per flag type, split into flags reported by real users and flags raised by automated accounts (system, bots). Accepts a 'days_ago' parameter, defaults to the last 90 days.",+ tags: %w[moderation],},"flags-handled-by-staff": {id: -38,name: "Flags Handled by Staff Member",description:"Number of review queue items handled per staff member, useful for recognizing moderation workload. Accepts a 'days_ago' parameter, defaults to the last 90 days.",+ tags: %w[moderation],},"suspended-users": {id: -39,name: "Suspended Users Report",description:"Currently suspended users, when they were suspended, until when, by whom and why. Accepts optional 'start_date', 'end_date' and 'suspended_by' parameters.",+ tags: %w[moderation],},"foreign-language-topics": {id: -40,name: "Topics Not in the Site's Primary Language",description:"Recently created topics whose detected language differs from the site's primary language, useful for routing content for translation or moderation. WARNING: requires content localization with locale detection to be enabled (e.g. the content_localization_enabled and ai_translation_enabled site settings); without it topics have no locale recorded and this report will be empty. Accepts 'primary_locale' and 'days_ago' parameters.",+ tags: %w[translation],},"foreign-language-posts": {id: -41,name: "Posts Not in the Site's Primary Language",description:"Recent posts whose detected language differs from the site's primary language, with a short excerpt. WARNING: requires content localization with locale detection to be enabled (e.g. the content_localization_enabled and ai_translation_enabled site settings); without it posts have no locale recorded and this report will be empty. Accepts 'primary_locale' and 'days_ago' parameters.",+ tags: %w[translation],},"crawler-traffic-overview": {id: -42,name: "Crawler and Bot Traffic Overview",description:"Buckets recent beacon pageviews by bot-likelihood score from Discourse's built-in crawler detection. Scoring lags live traffic, so the newest pageviews sit in the 'not scored' bucket alongside those that carried no bot signals at all, rather than counting as users. WARNING: requires scoring (hidden site setting experimental_detect_crawler_pageviews); without it, every pageview lands in 'not scored'. Accepts an 'hours' parameter, defaults to the last 24 hours.",+ tags: %w[traffic],},"crawler-traffic-detailed": {id: -43,name: "Crawler and Bot Traffic Detailed Report",description:"Row-per-IP breakdown of likely bot pageview activity, with the individual signals that drove the score (automated user agent, known crawler network, velocity, session churn, rapid navigation, bad referrer, no measured interaction). WARNING: requires scoring (hidden site setting experimental_detect_crawler_pageviews); without it this report will be empty. Accepts 'hours' and 'min_score' parameters.",+ tags: %w[traffic],},"suspected-bot-networks": {id: -44,name: "Suspected Automated Traffic by IP and Network",description:"Networks (ASNs) and IPs generating high pageview volume with bot-like session patterns (near 1.0 views per session, rotating user agents, systematic topic harvesting), sorted so a scrape spread across many IPs on one network floats to the top. Accepts a 'days_ago' parameter, defaults to the last 3 days.",+ tags: %w[traffic],},"ask-ai-asks-over-time": {id: -45,name: "Ask AI - Asks over time",description:"Daily Ask AI counts between start_date and end_date, inclusive (UTC). Requires Discourse AI.",+ tags: %w[ai],},"ask-ai-ask-outcomes": {id: -46,name: "Ask AI - Ask outcomes",description:"Ask AI outcome counts and percentages between start_date and end_date, inclusive (UTC). Requires Discourse AI.",+ tags: %w[ai],},"ask-ai-report-questions": {id: -47,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.",+ tags: %w[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.",+ tags: %w[ai],},}.with_indifferent_access@@ -1722,5 +1779,6 @@ module DiscourseDataExplorerqueries.transform_keys!.with_index { |key, idx| "-#{idx + 1}" }queriesend+ private_class_method :definitionsendenddiff --git a/plugins/discourse-data-explorer/spec/db/post_migrate/20261015121116_delete_stored_custom_data_explorer_tag_spec.rb b/plugins/discourse-data-explorer/spec/db/post_migrate/20261015121116_delete_stored_custom_data_explorer_tag_spec.rbnew file mode 100644index 00000000000..14091d57a8a--- /dev/null+++ b/plugins/discourse-data-explorer/spec/db/post_migrate/20261015121116_delete_stored_custom_data_explorer_tag_spec.rb@@ -0,0 +1,37 @@+# frozen_string_literal: true++require Rails.root.join(+ "plugins/discourse-data-explorer/db/post_migrate/20261015121116_delete_stored_custom_data_explorer_tag.rb",+ )++RSpec.describe DeleteStoredCustomDataExplorerTag do+ fab!(:query)++ let(:bundled_query) { DiscourseDataExplorer::Query.find(-1).tap(&:save!) }++ before do+ @original_verbose = ActiveRecord::Migration.verbose+ ActiveRecord::Migration.verbose = false+ end++ after { ActiveRecord::Migration.verbose = @original_verbose }++ def store_tags(query, names)+ DiscourseDataExplorer::QueryTag+ .resolve_or_create!(names)+ .each do |tag|+ DiscourseDataExplorer::QueryTagMapping.create!(query_id: query.id, query_tag_id: tag.id)+ end+ end++ it "deletes the stored custom tag and its mappings, keeping other tags" do+ store_tags(query, %w[custom staff])+ store_tags(bundled_query, %w[custom staff])++ described_class.new.up++ expect(DiscourseDataExplorer::QueryTag.pluck(:name)).to contain_exactly("staff")+ expect(query.reload.tags.map(&:name)).to eq(["staff"])+ expect(bundled_query.reload.tags.map(&:name)).to eq(["staff"])+ end+enddiff --git a/plugins/discourse-data-explorer/spec/models/query_spec.rb b/plugins/discourse-data-explorer/spec/models/query_spec.rbindex 8316d58a522..b1e4c926c0e 100644--- a/plugins/discourse-data-explorer/spec/models/query_spec.rb+++ b/plugins/discourse-data-explorer/spec/models/query_spec.rb@@ -4,11 +4,11 @@ RSpec.describe DiscourseDataExplorer::Query dobefore { SiteSetting.data_explorer_enabled = true }describe ".find" do- it "returns default queries with the default tag" do+ it "returns default queries with their automatic tags" doquery = DiscourseDataExplorer::Query.find(-1)expect(query).to be_present- expect(query.tag_names).to eq([DiscourseDataExplorer::Query::DEFAULT_TAG])+ expect(query.tag_names).to eq(%w[default users])endit "preserves additional tags while keeping the default tag mandatory" do@@ -16,11 +16,17 @@ RSpec.describe DiscourseDataExplorer::Query doquery.save!DiscourseDataExplorer::QueryTag.sync!(query:, names: ["Staff"])- expect(DiscourseDataExplorer::Query.find(-1).tag_names).to eq(%w[default staff])+ expect(DiscourseDataExplorer::Query.find(-1).tag_names).to eq(%w[default users staff])DiscourseDataExplorer::QueryTag.sync!(query:, names: [])- expect(DiscourseDataExplorer::Query.find(-1).tag_names).to eq(["default"])+ expect(DiscourseDataExplorer::Query.find(-1).tag_names).to eq(%w[default users])+ end+ end++ describe "#tag_names" do+ it "includes automatic tags for bundled queries" do+ expect(DiscourseDataExplorer::Query.find(-42).tag_names).to eq(%w[default traffic])endend@@ -36,7 +42,7 @@ RSpec.describe DiscourseDataExplorer::Query doquery.record_run!- expect(query.tag_names).to eq([DiscourseDataExplorer::Query::DEFAULT_TAG])+ expect(query.tag_names).to eq(%w[default users])expect(query.tags).to be_emptyexpect(DiscourseDataExplorer::QueryTag.exists?(name: DiscourseDataExplorer::Query::DEFAULT_TAG),@@ -49,8 +55,27 @@ RSpec.describe DiscourseDataExplorer::Query dodefaults = DiscourseDataExplorer::Query.unpersisted_defaults(tag: "default")expect(defaults).to be_present- expect(defaults.flat_map(&:tag_names).uniq).to eq(["default"])+ expect(defaults.map(&:tag_names)).to all(include("default"))expect(DiscourseDataExplorer::Query.unpersisted_defaults(tag: "Custom")).to be_emptyend++ it "filters by automatic tags" do+ defaults = DiscourseDataExplorer::Query.unpersisted_defaults(tags: %w[default traffic])++ expect(defaults.map(&:id)).to contain_exactly(-20, -42, -43, -44)+ expect(defaults.map(&:tag_names)).to all(eq(%w[default traffic]))+ end++ it "tags content queries" do+ defaults = DiscourseDataExplorer::Query.unpersisted_defaults(tag: "content")++ expect(defaults.map(&:id)).to contain_exactly(-4, -5, -17, -18, -21, -22, -23, -28, -30)+ end++ it "tags engagement queries" do+ defaults = DiscourseDataExplorer::Query.unpersisted_defaults(tag: "engagement")++ expect(defaults.map(&:id)).to contain_exactly(-2, -8, -11, -24, -25, -26, -29, -36)+ endendenddiff --git a/plugins/discourse-data-explorer/spec/models/query_tag_spec.rb b/plugins/discourse-data-explorer/spec/models/query_tag_spec.rbindex 0c8043636eb..8f20fed2048 100644--- a/plugins/discourse-data-explorer/spec/models/query_tag_spec.rb+++ b/plugins/discourse-data-explorer/spec/models/query_tag_spec.rb@@ -35,12 +35,24 @@ RSpec.describe DiscourseDataExplorer::QueryTag dodescribed_class.sync!(query:, names: 11.times.map { |index| "tag-#{index}" })}.to raise_error(ActiveRecord::RecordInvalid,- "Validation failed: A query can have at most 10 tags.",+ "Validation failed: A query can have at most 10 tags, not counting automatic tags.",)expect(query.tags).to be_emptyend+ it "doesn't count automatic tags toward the limit" do+ names = 10.times.map { |index| "tag-#{index}" }+ bundled_query = DiscourseDataExplorer::Query.find(-1)+ bundled_query.save!++ described_class.sync!(query:, names: ["custom", *names])+ described_class.sync!(query: bundled_query, names: ["default", "users", *names])++ expect(query.tags.size).to eq(10)+ expect(bundled_query.tags.size).to eq(10)+ end+it "reserves the default tag for system queries" doexpect { described_class.sync!(query:, names: ["Default"]) }.to raise_error(ActiveRecord::RecordInvalid,@@ -56,8 +68,37 @@ RSpec.describe DiscourseDataExplorer::QueryTag dodescribed_class.sync!(query: bundled_query, names: %w[Default Staff])- expect(bundled_query.tag_names).to eq(%w[default staff])+ expect(bundled_query.tag_names).to eq(%w[default users staff])+ expect(bundled_query.tags.map(&:name)).to eq(["staff"])+ end++ it "reserves the custom tag for user-created queries" do+ bundled_query = DiscourseDataExplorer::Query.find(-1)+ bundled_query.save!++ expect { described_class.sync!(query: bundled_query, names: ["Custom"]) }.to raise_error(+ ActiveRecord::RecordInvalid,+ "Validation failed: The custom tag is reserved for user-created queries.",+ )+ end++ it "keeps the custom tag virtual for user-created queries" do+ described_class.sync!(query:, names: %w[Custom Ops])++ expect(query.tag_names).to eq(%w[custom ops])+ expect(query.tags.map(&:name)).to eq(["ops"])+ expect(described_class.exists?(name: "custom")).to eq(false)+ end++ it "keeps automatic tags virtual for bundled queries" do+ bundled_query = DiscourseDataExplorer::Query.find(-42)+ bundled_query.save!++ described_class.sync!(query: bundled_query, names: %w[Traffic Staff])++ expect(bundled_query.tag_names).to eq(%w[default traffic staff])expect(bundled_query.tags.map(&:name)).to eq(["staff"])+ expect(described_class.exists?(name: "traffic")).to eq(false)endendenddiff --git a/plugins/discourse-data-explorer/spec/requests/api/queries_spec.rb b/plugins/discourse-data-explorer/spec/requests/api/queries_spec.rbindex 3f03e81ec12..57d37d160a9 100644--- a/plugins/discourse-data-explorer/spec/requests/api/queries_spec.rb+++ b/plugins/discourse-data-explorer/spec/requests/api/queries_spec.rb@@ -84,7 +84,7 @@ RSpec.describe "JSON:API queries", type: :request do"isDefault" => false,"createdAt" => query.created_at.as_json,"lastRunAt" => query.last_run_at.as_json,- "tags" => [],+ "tags" => ["custom"],},"links" => {"self" => "#{base}/queries/#{query.id}",@@ -183,7 +183,7 @@ RSpec.describe "JSON:API queries", type: :request do"isDefault" => false,"createdAt" => middle.created_at.as_json,"lastRunAt" => middle.last_run_at.as_json,- "tags" => [],+ "tags" => ["custom"],},"links" => {"self" => "#{base}/queries/#{middle.id}",diff --git a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rbindex f24bcf26eb3..e99bac22e07 100644--- a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb+++ b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb@@ -144,7 +144,13 @@ describe DiscourseDataExplorer::QueryController doexpect(response_json["queries"].map { |query| query["name"] }).to eq(["Monthly staff report"],)- expect(response_json["extras"]["tags"]).to eq(%w[daily default members staff])+ expect(response_json["extras"]["tags"]).to include(+ "custom",+ "daily",+ "default",+ "members",+ "staff",+ )endit "matches every selected tag" do@@ -178,7 +184,37 @@ describe DiscourseDataExplorer::QueryController doexpect(response.status).to eq(200)expect(response_json["queries"]).to be_present- expect(response_json["queries"].flat_map { |query| query["tags"] }.uniq).to eq(["default"])+ expect(response_json["queries"].map { |query| query["tags"] }).to all(include("default"))+ end++ it "filters user-created queries by the custom tag" do+ DiscourseDataExplorer::Query.destroy_all+ DiscourseDataExplorer::Query.find(-1).save!+ user_query = make_query("SELECT 1")++ get "/admin/plugins/discourse-data-explorer/queries.json", params: { tag: "custom" }++ expect(response.status).to eq(200)+ expect(response_json["queries"].map { |query| query["id"] }).to eq([user_query.id])+ expect(response_json["queries"].first["tags"]).to eq(["custom"])+ end++ it "filters bundled queries by their automatic tags, persisted or not" do+ DiscourseDataExplorer::Query.destroy_all+ DiscourseDataExplorer::Query.find(-20).save!++ get "/admin/plugins/discourse-data-explorer/queries.json", params: { tag: "traffic" }++ expect(response.status).to eq(200)+ expect(response_json["queries"].map { |query| query["id"] }).to contain_exactly(+ -20,+ -42,+ -43,+ -44,+ )+ expect(response_json["queries"].map { |query| query["tags"] }).to all(+ eq(%w[default traffic]),+ )endend@@ -190,7 +226,9 @@ describe DiscourseDataExplorer::QueryController doget "/admin/plugins/discourse-data-explorer/queries/tags.json"expect(response.status).to eq(200)- expect(response_json).to eq(%w[default monthly staff])+ expect(response_json).to include("custom", "default", "monthly", "staff", "traffic")+ expect(response_json).not_to include("hidden")+ expect(response_json).to eq(response_json.sort)endend@@ -211,7 +249,7 @@ describe DiscourseDataExplorer::QueryController doexpect(response.status).to eq(200)expect(response_json["query"]["group_ids"]).to eq([group.id])- expect(response_json["query"]["tags"]).to eq(%w[monthly staff])+ expect(response_json["query"]["tags"]).to eq(%w[custom monthly staff])endit "creates a query without groups when none are given" do@@ -290,7 +328,7 @@ describe DiscourseDataExplorer::QueryController do}expect(response.status).to eq(200)- expect(query.reload.tag_names).to eq(%w[monthly staff])+ expect(query.reload.tag_names).to eq(%w[custom monthly staff])expect(query.groups.pluck(:id)).to eq([group2.id])end@@ -305,8 +343,8 @@ describe DiscourseDataExplorer::QueryController do}expect(response.status).to eq(200)- expect(response_json["query"]["tags"]).to eq([])- expect(query.reload.tag_names).to eq([])+ expect(response_json["query"]["tags"]).to eq(["custom"])+ expect(query.reload.tags).to be_emptyexpect(query.groups.pluck(:id)).to eq([group2.id])end@@ -326,7 +364,7 @@ describe DiscourseDataExplorer::QueryController doendit "updates additional tags on default queries without removing the default tag" do- query = DiscourseDataExplorer::Query.find(-4)+ query = DiscourseDataExplorer::Query.find(-1)query.save!DiscourseDataExplorer::QueryTag.sync!(query:, names: %w[Default Staff Monthly])@@ -338,8 +376,8 @@ describe DiscourseDataExplorer::QueryController do}expect(response.status).to eq(200)- expect(response_json["query"]["tags"]).to eq(%w[default staff])- expect(DiscourseDataExplorer::Query.find(-4).tag_names).to eq(%w[default staff])+ expect(response_json["query"]["tags"]).to eq(%w[default users staff])+ expect(DiscourseDataExplorer::Query.find(-1).tag_names).to eq(%w[default users staff])put "/admin/plugins/discourse-data-explorer/queries/#{query.id}.json",params: {@@ -349,8 +387,8 @@ describe DiscourseDataExplorer::QueryController do}expect(response.status).to eq(200)- expect(response_json["query"]["tags"]).to eq(["default"])- expect(DiscourseDataExplorer::Query.find(-4).tag_names).to eq(["default"])+ expect(response_json["query"]["tags"]).to eq(%w[default users])+ expect(DiscourseDataExplorer::Query.find(-1).tag_names).to eq(%w[default users])endend@@ -379,6 +417,19 @@ describe DiscourseDataExplorer::QueryController doexpect(response.status).to eq(200)expect(response_json["query"]["dashboard_mountable"]).to eq(false)end++ it "returns automatic tags so the editor can lock them" do+ user_query = make_query("SELECT 1", tags: ["Staff"])++ get "/admin/plugins/discourse-data-explorer/queries/-42.json"++ expect(response.status).to eq(200)+ expect(response_json["query"]["automatic_tags"]).to eq(%w[default traffic])++ get "/admin/plugins/discourse-data-explorer/queries/#{user_query.id}.json"++ expect(response_json["query"]["automatic_tags"]).to eq(["custom"])+ endenddescribe "#destroy" dodiff --git a/plugins/discourse-data-explorer/test/javascripts/acceptance/run-query-test.js b/plugins/discourse-data-explorer/test/javascripts/acceptance/run-query-test.jsindex 5bbd640d722..3485988339f 100644--- a/plugins/discourse-data-explorer/test/javascripts/acceptance/run-query-test.js+++ b/plugins/discourse-data-explorer/test/javascripts/acceptance/run-query-test.js@@ -44,7 +44,7 @@ acceptance("Run Query", function (needs) {needs.hooks.beforeEach(() => {sinon.stub(window, "open");updateParams = null;- query2Tags = ["existing"];+ query2Tags = ["custom", "existing"];});needs.hooks.afterEach(() => {@@ -154,7 +154,7 @@ acceptance("Run Query", function (needs) {description: "",username: "system",group_ids: [],- tags: ["existing"],+ tags: ["custom", "existing"],last_run_at: "2023-05-04T22:16:23.858Z",user_id: 1,is_default: false,@@ -183,6 +183,7 @@ acceptance("Run Query", function (needs) {username: "system",group_ids: [],tags: ["default", "existing"],+ automatic_tags: ["default"],last_run_at: "2021-02-11T08:29:59.337Z",hidden: false,user_id: -1,@@ -203,6 +204,7 @@ acceptance("Run Query", function (needs) {username: "system",group_ids: [],tags: query2Tags,+ automatic_tags: ["custom"],last_run_at: "2023-05-04T22:16:23.858Z",hidden: false,user_id: 1,@@ -277,6 +279,7 @@ acceptance("Run Query", function (needs) {param_info: [],group_ids: [],tags: query2Tags,+ automatic_tags: ["custom"],hidden: false,user_id: 1,},@@ -297,6 +300,7 @@ acceptance("Run Query", function (needs) {param_info: [],group_ids: [],tags: ["default", "monthly"],+ automatic_tags: ["default"],hidden: false,user_id: -1,is_default: true,@@ -501,6 +505,9 @@ acceptance("Run Query", function (needs) {const tags = selectKit(".query-edit .query-tag-chooser");await tags.expand();+ assert+ .dom(".query-tag-chooser .tag-choice.disabled")+ .hasText("custom", "the custom tag cannot be removed");assert.false(tags.displayedContent().some((row) => row.name === "default"),"the system-only default tag is not offered on user queries"@@ -523,7 +530,7 @@ acceptance("Run Query", function (needs) {assert.deepEqual(updateParams.getAll("query[tags][]"),- ["existing", "Monthly"],+ ["custom", "existing", "Monthly"],"the edited tags are saved");assert.strictEqual(@@ -553,7 +560,7 @@ acceptance("Run Query", function (needs) {);assert.deepEqual(updateParams.getAll("query[tags][]"),- [],+ ["custom"],"the removed tag is absent from the request");@@ -563,6 +570,11 @@ acceptance("Run Query", function (needs) {assert.dom(".query-edit .query-tag-chooser .selected-choice").doesNotExist("the removed tag stays absent after reloading the query");++ await tags.expand();+ assert+ .dom(".query-edit .query-tag-chooser .tag-choice.disabled")+ .hasText("custom", "the custom tag remains");});test("edits additional tags on a default query", async function (assert) {@@ -573,6 +585,10 @@ acceptance("Run Query", function (needs) {assert.dom(".query-tag-chooser .tag-choice.disabled").hasText("default", "the default tag cannot be removed");+ assert.false(+ tags.displayedContent().some((row) => row.name === "custom"),+ "the custom tag is not offered on default queries"+ );await tags.deselectItemByValue("existing");await tags.fillInFilter("Monthly");