From 4122affc0fb7dbd86b37562c2cf3462120550412 Mon Sep 17 00:00:00 2001
From: Arpit Jalan <arpit@techapj.com>
Date: Wed, 4 Aug 2021 13:42:17 +0530
Subject: [PATCH] FIX: use search message context on group message page
 (#13936)

---
 .../app/routes/build-group-messages-route.js          | 11 +++++++++++
 .../discourse/tests/acceptance/group-test.js          |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js b/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
index 4de94e625b..cf4266910d 100644
--- a/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
+++ b/app/assets/javascripts/discourse/app/routes/build-group-messages-route.js
@@ -31,10 +31,21 @@ export default (type) => {
         hideCategory: true,
         showPosters: true,
       });
+
+      const currentUser = this.currentUser;
+      this.searchService.set("searchContext", {
+        type: "private_messages",
+        id: currentUser.get("username_lower"),
+        user: currentUser,
+      });
     },
 
     _isArchive() {
       return type === "archive";
     },
+
+    deactivate() {
+      this.searchService.set("searchContext", null);
+    },
   });
 };
diff --git a/app/assets/javascripts/discourse/tests/acceptance/group-test.js b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
index 7f1dbd5ea1..96432613ef 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/group-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/group-test.js
@@ -241,6 +241,12 @@ acceptance("Group - Authenticated", function (needs) {
       "This is a private message 1",
       "it should display the list of group topics"
     );
+
+    await click("#search-button");
+    assert.ok(
+      exists(".search-context input:checked"),
+      "scope to message checkbox is checked"
+    );
   });
 
   test("Admin Viewing Group", async function (assert) {