Skip to content

A platform for community discussion. Free, open, simple.

UX: Show creator avatar and user card in data explorer queries list (#44809)

David Battersby5370a6c4fed9
diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
index cb1cc4f87b6..52897ddf68a 100644
--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs
@@ -9,7 +9,9 @@ import DMultiSelect from "discourse/ui-kit/d-multi-select";
import DPageSubheader from "discourse/ui-kit/d-page-subheader";
import DPickFilesButton from "discourse/ui-kit/d-pick-files-button";
import DTableHeaderToggle from "discourse/ui-kit/d-table-header-toggle";
+import DUserLink from "discourse/ui-kit/d-user-link";
import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";
+import dAvatar from "discourse/ui-kit/helpers/d-avatar";
import dIcon from "discourse/ui-kit/helpers/d-icon";
import { i18n } from "discourse-i18n";
import ShareReport from "discourse/plugins/discourse-data-explorer/discourse/components/share-report";
@@ -171,15 +173,14 @@ export default <template>
<div class="d-table__mobile-label">
{{i18n "explorer.query_user"}}
</div>
- {{#if query.username}}
- <div>
- <LinkTo
- @model={{query.username}}
- @route="user.summary"
- >
- {{query.username}}
- </LinkTo>
- </div>
+ {{#if query.user}}
+ <DUserLink
+ class="query-created-by__link"
+ @user={{query.user}}
+ >
+ {{dAvatar query.user imageSize="tiny"}}
+ <span>{{query.user.username}}</span>
+ </DUserLink>
{{/if}}
</td>
<td class="d-table__cell --detail query-group-names">
diff --git a/plugins/discourse-data-explorer/app/controllers/discourse_data_explorer/query_controller.rb b/plugins/discourse-data-explorer/app/controllers/discourse_data_explorer/query_controller.rb
index 79a2d5ca44a..58e98b6184e 100644
--- a/plugins/discourse-data-explorer/app/controllers/discourse_data_explorer/query_controller.rb
+++ b/plugins/discourse-data-explorer/app/controllers/discourse_data_explorer/query_controller.rb
@@ -25,7 +25,7 @@ module DiscourseDataExplorer
order_column = SORTABLE_COLUMNS.include?(params[:order]) ? params[:order] : "last_run_at"
order_direction = params[:ascending] == "true" ? :asc : :desc
- base_scope = DiscourseDataExplorer::Query.where(hidden: false).includes(:groups, :tags)
+ base_scope = DiscourseDataExplorer::Query.where(hidden: false).includes(:groups, :tags, :user)
if order_column == "username"
base_scope =
diff --git a/plugins/discourse-data-explorer/app/serializers/discourse_data_explorer/query_serializer.rb b/plugins/discourse-data-explorer/app/serializers/discourse_data_explorer/query_serializer.rb
index cf5cf8b72b8..fc4ebf8dd5e 100644
--- a/plugins/discourse-data-explorer/app/serializers/discourse_data_explorer/query_serializer.rb
+++ b/plugins/discourse-data-explorer/app/serializers/discourse_data_explorer/query_serializer.rb
@@ -6,6 +6,7 @@ module DiscourseDataExplorer
:name,
:description,
:username,
+ :user,
:group_ids,
:last_run_at,
:user_id,
@@ -16,6 +17,11 @@ module DiscourseDataExplorer
object&.user&.username
end
+ def user
+ return if object&.user.blank?
+ BasicUserSerializer.new(object.user, root: false).as_json
+ end
+
def group_ids
object.groups.map(&:id)
end
diff --git a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
index 1b6df890d44..39bdacfc971 100644
--- a/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
+++ b/plugins/discourse-data-explorer/assets/stylesheets/explorer.scss
@@ -1004,6 +1004,13 @@ table.group-reports {
.query-created-by {
color: var(--primary-high);
+
+ &__link {
+ display: flex;
+ width: fit-content;
+ align-items: center;
+ gap: var(--space-2);
+ }
}
.query-group-names {
diff --git a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
index 56d30445e93..cbf4fbc0dfd 100644
--- a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
+++ b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb
@@ -86,6 +86,22 @@ describe DiscourseDataExplorer::QueryController do
expect(response_json["queries"][1]["name"]).to eq("B")
end
+ it "includes the query creator" do
+ DiscourseDataExplorer::Query.destroy_all
+ query = make_query("SELECT 1 as value")
+ query.update!(user: admin)
+
+ get "/admin/plugins/discourse-data-explorer/queries.json"
+
+ expect(response.status).to eq(200)
+ serialized = response_json["queries"].find { |q| q["id"] == query.id }
+ expect(serialized["user"]).to include(
+ "id" => admin.id,
+ "username" => admin.username,
+ "avatar_template" => admin.avatar_template,
+ )
+ end
+
it "doesn't show hidden/deleted queries" do
DiscourseDataExplorer::Query.destroy_all
make_query("SELECT 1 as value", name: "A", hidden: false)