From ccf1cd0ca6670fe30a4aa23641cae21564aef708 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Fri, 30 Jul 2021 11:40:21 +0100
Subject: [PATCH] UX: Improve copy when a group member search returns no
 results (#13899)

Previously it would say "There are no members in this group". Now it says "No members match that search."

https://meta.discourse.org/t/group-username-search-empty-search-message-is-wrong/198609
---
 .../discourse/app/controllers/group-index.js          | 11 +++++++++++
 .../discourse/app/templates/group-index.hbs           |  6 +-----
 .../discourse/app/templates/mobile/group-index.hbs    |  6 +-----
 config/locales/client.en.yml                          |  1 +
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/controllers/group-index.js b/app/assets/javascripts/discourse/app/controllers/group-index.js
index 847fdcece2..a15d1f8feb 100644
--- a/app/assets/javascripts/discourse/app/controllers/group-index.js
+++ b/app/assets/javascripts/discourse/app/controllers/group-index.js
@@ -83,6 +83,17 @@ export default Controller.extend({
     }
   },
 
+  @discourseComputed("filter", "members", "model.can_see_members")
+  emptyMessageKey(filter, members, canSeeMembers) {
+    if (!canSeeMembers) {
+      return "groups.members.forbidden";
+    } else if (filter) {
+      return "groups.members.no_filter_matches";
+    } else {
+      return "groups.empty.members";
+    }
+  },
+
   @action
   loadMore() {
     this.findMembers();
diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs
index dd07e01f7b..89154497f3 100644
--- a/app/assets/javascripts/discourse/app/templates/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs
@@ -111,13 +111,9 @@
     {{/load-more}}
 
     {{conditional-loading-spinner condition=loading}}
-  {{else if model.can_see_members}}
-    <br>
-
-    <div>{{i18n "groups.empty.members"}}</div>
   {{else}}
     <br>
 
-    <div>{{i18n "groups.members.forbidden"}}</div>
+    <div>{{i18n emptyMessageKey}}</div>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
index a0c6c8ce58..1da73125c3 100644
--- a/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
+++ b/app/assets/javascripts/discourse/app/templates/mobile/group-index.hbs
@@ -49,13 +49,9 @@
     {{/load-more}}
 
     {{conditional-loading-spinner condition=loading}}
-  {{else if model.can_see_members}}
-    <br>
-
-    <div>{{i18n "groups.empty.members"}}</div>
   {{else}}
     <br>
 
-    <div>{{i18n "groups.members.forbidden"}}</div>
+    <div>{{i18n emptyMessageKey}}</div>
   {{/if}}
 </section>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index ad3949804f..8a42f7435f 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -850,6 +850,7 @@ en:
         owner: "Owner"
         primary: "Primary"
         forbidden: "You're not allowed to view the members."
+        no_filter_matches: "No members match that search."
       topics: "Topics"
       posts: "Posts"
       mentions: "Mentions"