A platform for community discussion. Free, open, simple.
UX: Show creator in the admin gamification leaderboards list (#44820)
David Battersby7caa8b2703c6
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjsindex b244a88966e..b6cb79d1730 100644--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs@@ -5,6 +5,8 @@ import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";import DButton from "discourse/ui-kit/d-button";import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";import AdminCreateLeaderboard from "discourse/plugins/discourse-gamification/admin/components/admin-create-leaderboard";@@ -49,6 +51,9 @@ export default <template><th class="d-table__header-cell">{{i18n"gamification.admin.name"}}</th>+ <th class="d-table__header-cell">{{i18n+ "gamification.admin.created_by"+ }}</th><th class="d-table__header-cell">{{i18n"gamification.admin.period"}}</th>@@ -73,6 +78,20 @@ export default <template></div></LinkTo></td>+ <td class="d-table__cell --detail leaderboard-admin__creator">+ <div class="d-table__mobile-label">+ {{i18n "gamification.admin.created_by"}}+ </div>+ {{#if leaderboard.createdBy}}+ <DUserLink+ class="leaderboard-admin__creator-link"+ @user={{leaderboard.createdBy}}+ >+ {{dAvatar leaderboard.createdBy imageSize="tiny"}}+ <span>{{leaderboard.createdBy.username}}</span>+ </DUserLink>+ {{/if}}+ </td><td class="d-table__cell --detail"><div class="d-table__mobile-label">{{i18n "gamification.admin.period"}}diff --git a/plugins/discourse-gamification/app/controllers/discourse_gamification/admin_gamification_leaderboard_controller.rb b/plugins/discourse-gamification/app/controllers/discourse_gamification/admin_gamification_leaderboard_controller.rbindex 4e004020f63..ef1bff3db2d 100644--- a/plugins/discourse-gamification/app/controllers/discourse_gamification/admin_gamification_leaderboard_controller.rb+++ b/plugins/discourse-gamification/app/controllers/discourse_gamification/admin_gamification_leaderboard_controller.rb@@ -5,7 +5,12 @@ class DiscourseGamification::AdminGamificationLeaderboardController < Admin::Admdef indexrender_serialized(- { leaderboards: DiscourseGamification::GamificationLeaderboard.order(updated_at: :desc) },+ {+ leaderboards:+ DiscourseGamification::GamificationLeaderboard.includes(:created_by).order(+ updated_at: :desc,+ ),+ },AdminGamificationIndexSerializer,root: false,)diff --git a/plugins/discourse-gamification/app/models/discourse_gamification/gamification_leaderboard.rb b/plugins/discourse-gamification/app/models/discourse_gamification/gamification_leaderboard.rbindex 0cbbf6d5758..a6fc95e4bb3 100644--- a/plugins/discourse-gamification/app/models/discourse_gamification/gamification_leaderboard.rb+++ b/plugins/discourse-gamification/app/models/discourse_gamification/gamification_leaderboard.rb@@ -6,6 +6,7 @@ module DiscourseGamificationself.table_name = "gamification_leaderboards"+ belongs_to :created_by, class_name: "User", foreign_key: :created_by_id, optional: truehas_many :leaderboard_scores,class_name: "DiscourseGamification::GamificationLeaderboardScore",foreign_key: :leaderboard_id,diff --git a/plugins/discourse-gamification/app/serializers/admin_leaderboard_serializer.rb b/plugins/discourse-gamification/app/serializers/admin_leaderboard_serializer.rbindex 6c444e2cf3b..bbabed8b64f 100644--- a/plugins/discourse-gamification/app/serializers/admin_leaderboard_serializer.rb+++ b/plugins/discourse-gamification/app/serializers/admin_leaderboard_serializer.rb@@ -1,5 +1,10 @@# frozen_string_literal: trueclass AdminLeaderboardSerializer < LeaderboardSerializer- attributes :score_overrides, :scorable_category_ids+ attributes :score_overrides, :scorable_category_ids, :created_by++ def created_by+ return if object.created_by.blank?+ BasicUserSerializer.new(object.created_by, root: false).as_json+ endenddiff --git a/plugins/discourse-gamification/assets/javascripts/discourse/models/gamification-leaderboard.js b/plugins/discourse-gamification/assets/javascripts/discourse/models/gamification-leaderboard.jsindex 20596cb8f22..17d87e08883 100644--- a/plugins/discourse-gamification/assets/javascripts/discourse/models/gamification-leaderboard.js+++ b/plugins/discourse-gamification/assets/javascripts/discourse/models/gamification-leaderboard.js@@ -10,6 +10,7 @@ export default class GamificationLeaderboard {@tracked id;@tracked createdAt;@tracked updatedAt;+ @tracked createdBy;@tracked createdById;@tracked defaultPeriodId;@tracked excludedGroupsIds;@@ -28,6 +29,7 @@ export default class GamificationLeaderboard {this.id = args.id;this.createdAt = args.created_at;this.updatedAt = args.updated_at;+ this.createdBy = args.created_by;this.createdById = args.created_by_id;this.defaultPeriodId = args.default_period;this.excludedGroupsIds = args.excluded_groups_ids;diff --git a/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss b/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scssindex 10349502eeb..0345733655d 100644--- a/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss+++ b/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss@@ -21,6 +21,13 @@margin-bottom: 1rem;padding-left: 0;}++ &__creator-link {+ display: flex;+ width: fit-content;+ align-items: center;+ gap: var(--space-2);+ }}.leaderboard-edit {diff --git a/plugins/discourse-gamification/config/locales/client.en.yml b/plugins/discourse-gamification/config/locales/client.en.ymlindex 2b50daef809..70f89cd8f09 100644--- a/plugins/discourse-gamification/config/locales/client.en.yml+++ b/plugins/discourse-gamification/config/locales/client.en.yml@@ -102,6 +102,7 @@ en:admin:title: "Gamification"name: "Name"+ created_by: "Created by"period: "Period"discourse_workflows:node_unavailable:diff --git a/plugins/discourse-gamification/plugin.rb b/plugins/discourse-gamification/plugin.rbindex a42fe3e0277..03a384ff25f 100644--- a/plugins/discourse-gamification/plugin.rb+++ b/plugins/discourse-gamification/plugin.rb@@ -96,6 +96,7 @@ after_initialize do.map { |group| BasicGroupSerializer.new(group, root: false, scope: scope).as_json },gamification_leaderboards:DiscourseGamification::GamificationLeaderboard+ .includes(:created_by).order(updated_at: :desc).map { |leaderboard| AdminLeaderboardSerializer.new(leaderboard, root: false).as_json },}diff --git a/plugins/discourse-gamification/spec/requests/admin_gamification_leaderboard_controller_spec.rb b/plugins/discourse-gamification/spec/requests/admin_gamification_leaderboard_controller_spec.rbindex 2c5434a1ba0..fbdf21591b8 100644--- a/plugins/discourse-gamification/spec/requests/admin_gamification_leaderboard_controller_spec.rb+++ b/plugins/discourse-gamification/spec/requests/admin_gamification_leaderboard_controller_spec.rb@@ -8,6 +8,31 @@ RSpec.describe DiscourseGamification::AdminGamificationLeaderboardController dosign_in(admin)end+ describe "#index" do+ it "includes the creator of each leaderboard" do+ leaderboard = Fabricate(:gamification_leaderboard, created_by_id: admin.id)++ get "/admin/plugins/discourse-gamification/leaderboards.json"++ expect(response.status).to eq(200)+ serialized =+ response.parsed_body["gamification_leaderboards"].find { _1["id"] == leaderboard.id }+ expect(serialized["created_by"]).to include("id" => admin.id, "username" => admin.username)+ end++ it "omits the creator when the user no longer exists" do+ leaderboard = Fabricate(:gamification_leaderboard, created_by_id: admin.id)+ leaderboard.update_columns(created_by_id: -999_999)++ get "/admin/plugins/discourse-gamification/leaderboards.json"++ expect(response.status).to eq(200)+ serialized =+ response.parsed_body["gamification_leaderboards"].find { _1["id"] == leaderboard.id }+ expect(serialized["created_by"]).to be_nil+ end+ end+describe "#create" doit "creates leaderboard and enqueues score recalculation" doexpect(Jobs::RecalculateLeaderboardScores.jobs.size).to eq(0)diff --git a/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb b/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rbindex 7e3a0a8ba0a..10e4cd0ced8 100644--- a/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb+++ b/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb@@ -58,6 +58,21 @@ describe "Admin leaderboards" doexpect(leaderboard.reload.name).to eq("Coolest dudettes")end+ it "shows the creator and opens their user card" do+ creator = User.find(leaderboard.created_by_id)+ user_card = PageObjects::Components::UserCard.new++ visit("/admin/plugins/discourse-gamification")++ expect(page).to have_css(+ "#leaderboard-admin__row-#{leaderboard.id} .leaderboard-admin__creator-link",+ text: creator.username,+ )++ admin_leaderboard_page.click_creator(leaderboard)+ expect(user_card).to be_showing_user(creator.username)+ end+it "can delete a leaderboard" dovisit("/admin/plugins/discourse-gamification")diff --git a/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb b/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rbindex bbe08488e44..fe518f4af3d 100644--- a/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb+++ b/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb@@ -27,6 +27,11 @@ module PageObjectsexcluded_groups_sk.collapseend+ def click_creator(leaderboard)+ find("#leaderboard-admin__row-#{leaderboard.id} .leaderboard-admin__creator-link").click+ self+ end+def edit_leaderboard(leaderboard)find("#leaderboard-admin__row-#{leaderboard.id} .leaderboard-admin__edit").clickend