Skip to content

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

FIX: Preserve the default leaderboard period when saving settings (#44797)

Gabriel Grubbaba38637a8e0f
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs
index ce760fee966..4ffb3194bba 100644
--- a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs
+++ b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs
@@ -65,7 +65,7 @@ export default class AdminEditLeaderboard extends Component {
included_groups_ids: this.args.leaderboard.includedGroupsIds,
excluded_groups_ids: this.args.leaderboard.excludedGroupsIds,
visible_to_groups_ids: this.args.leaderboard.visibleToGroupsIds,
- default_period: this.args.leaderboard.defaultPeriod,
+ default_period: this.args.leaderboard.defaultPeriodId,
period_filter_disabled: this.args.leaderboard.periodFilterDisabled,
scorable_category_ids: this.args.leaderboard.scorableCategoryIds,
};
diff --git a/plugins/discourse-gamification/assets/javascripts/discourse/models/gamification-leaderboard.js b/plugins/discourse-gamification/assets/javascripts/discourse/models/gamification-leaderboard.js
index f9ceb818ba2..20596cb8f22 100644
--- a/plugins/discourse-gamification/assets/javascripts/discourse/models/gamification-leaderboard.js
+++ b/plugins/discourse-gamification/assets/javascripts/discourse/models/gamification-leaderboard.js
@@ -11,6 +11,7 @@ export default class GamificationLeaderboard {
@tracked createdAt;
@tracked updatedAt;
@tracked createdById;
+ @tracked defaultPeriodId;
@tracked excludedGroupsIds;
@tracked includedGroupsIds;
@tracked visibleToGroupsIds;
@@ -28,6 +29,7 @@ export default class GamificationLeaderboard {
this.createdAt = args.created_at;
this.updatedAt = args.updated_at;
this.createdById = args.created_by_id;
+ this.defaultPeriodId = args.default_period;
this.excludedGroupsIds = args.excluded_groups_ids;
this.includedGroupsIds = args.included_groups_ids;
this.visibleToGroupsIds = args.visible_to_groups_ids;
diff --git a/plugins/discourse-gamification/test/javascripts/integration/components/admin-edit-leaderboard-test.gjs b/plugins/discourse-gamification/test/javascripts/integration/components/admin-edit-leaderboard-test.gjs
index 121b96ec9bc..5a645696301 100644
--- a/plugins/discourse-gamification/test/javascripts/integration/components/admin-edit-leaderboard-test.gjs
+++ b/plugins/discourse-gamification/test/javascripts/integration/components/admin-edit-leaderboard-test.gjs
@@ -3,7 +3,11 @@ import { module, test } from "qunit";
import sinon from "sinon";
import Category from "discourse/models/category";
import { setupRenderingTest } from "discourse/tests/helpers/component-test";
+import pretender, { response } from "discourse/tests/helpers/create-pretender";
+import form from "discourse/tests/helpers/form-kit-helper";
+import selectKit from "discourse/tests/helpers/select-kit-helper";
import AdminEditLeaderboard from "discourse/plugins/discourse-gamification/admin/components/admin-edit-leaderboard";
+import GamificationLeaderboard from "discourse/plugins/discourse-gamification/discourse/models/gamification-leaderboard";
module(
"Discourse Gamification | Integration | Component | AdminEditLeaderboard",
@@ -32,7 +36,7 @@ module(
includedGroupsIds: [],
excludedGroupsIds: [],
visibleToGroupsIds: [],
- defaultPeriod: 0,
+ defaultPeriodId: 0,
periodFilterDisabled: false,
scoreOverrides: null,
scorableCategoryIds: [1001],
@@ -46,5 +50,49 @@ module(
assert.true(asyncFindByIdsStub.calledWith([1001]));
});
+
+ test("preserves the default period when saving another field", async function (assert) {
+ this.leaderboard = GamificationLeaderboard.create({
+ id: 1,
+ name: "Leaderboard",
+ default_period: 4,
+ });
+
+ const router = this.owner.lookup("service:router");
+ sinon.stub(router, "transitionTo").resolves();
+ sinon.stub(router, "refresh");
+
+ let savedData;
+ pretender.put("/admin/plugins/gamification/leaderboard/1", (request) => {
+ savedData = new URLSearchParams(request.requestBody);
+ return response({ success: true });
+ });
+
+ await render(
+ <template>
+ <AdminEditLeaderboard @leaderboard={{this.leaderboard}} />
+ </template>
+ );
+
+ assert.strictEqual(
+ selectKit(".period-input").header().value(),
+ "4",
+ "the saved weekly period is selected"
+ );
+
+ await form().field("name").fillIn("Renamed leaderboard");
+ await form().submit();
+
+ assert.strictEqual(
+ savedData.get("name"),
+ "Renamed leaderboard",
+ "the name changes"
+ );
+ assert.strictEqual(
+ savedData.get("default_period"),
+ "4",
+ "the period remains weekly"
+ );
+ });
}
);