A platform for community discussion. Free, open, simple.
FIX: Stop time tracking for a deleted topic/post (#45425)
small-lovely-cat9ea9ac50bb58
diff --git a/frontend/discourse/app/services/screen-track.js b/frontend/discourse/app/services/screen-track.jsindex 0008335d834..5643428bf82 100644--- a/frontend/discourse/app/services/screen-track.js+++ b/frontend/discourse/app/services/screen-track.js@@ -57,6 +57,14 @@ export default class ScreenTrack extends Service {}start(topicId, topicController) {+ if (+ topicController?.get("model.deleted") ||+ topicController?.get("topic.deleted")+ ) {+ this.stop();+ return;+ }+if (this._topicId && this._topicId !== topicId) {this.tick();this.flush();diff --git a/frontend/discourse/tests/unit/services/screen-track-test.js b/frontend/discourse/tests/unit/services/screen-track-test.jsindex a32c8a689b4..edadc07ba66 100644--- a/frontend/discourse/tests/unit/services/screen-track-test.js+++ b/frontend/discourse/tests/unit/services/screen-track-test.js@@ -65,6 +65,57 @@ module("Unit | Service | screen-track", function (hooks) {);});+ test("does not track a deleted topic", function (assert) {+ const tracker = this.owner.lookup("service:screen-track");++ tracker.start(1, {+ get() {+ return { deleted: true };+ },+ });++ assert.strictEqual(+ tracker._topicId,+ undefined,+ "deleted topic tracking is not started"+ );+ });++ test("does not track a post in a deleted topic", function (assert) {+ const tracker = this.owner.lookup("service:screen-track");++ tracker.start(1, {+ get(property) {+ return property === "topic.deleted" ? true : undefined;+ },+ });++ assert.strictEqual(+ tracker._topicId,+ undefined,+ "post tracking in a deleted topic is not started"+ );+ });++ test("stops tracking when entering a deleted topic", function (assert) {+ const tracker = this.owner.lookup("service:screen-track");+ const liveTopicController = {+ get() {+ return undefined;+ },+ };++ tracker.start(1, liveTopicController);+ tracker.start(2, {+ get(property) {+ return property === "model.deleted";+ },+ });++ assert.strictEqual(tracker._topicId, null, "tracking is stopped");+ assert.strictEqual(tracker._interval, null, "tracking interval is cleared");+ });+test("appEvent topic:timings-sent is triggered after posting consolidated timings", async function (assert) {const tracker = this.owner.lookup("service:screen-track");const appEvents = this.owner.lookup("service:app-events");