From fab9d91a0b953289a0f4a592d6986ffc7b2d6982 Mon Sep 17 00:00:00 2001
From: SaadYousaf <saadyousaf@A006-00314.local>
Date: Mon, 22 Aug 2022 14:02:01 +0500
Subject: [PATCH] fix: resolve issues with search functionality

---
 src/components/Search.jsx                     | 22 ++++++++-----------
 src/components/SearchInfo.jsx                 |  2 +-
 src/discussions/learners/data/slices.js       |  1 +
 src/discussions/messages.js                   |  5 +++++
 src/discussions/posts/NoResults.jsx           |  4 +++-
 .../posts/post-actions-bar/messages.js        |  2 +-
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/Search.jsx b/src/components/Search.jsx
index 628011ef..1911d762 100644
--- a/src/components/Search.jsx
+++ b/src/components/Search.jsx
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useMemo } from 'react';
+import React, { useContext, useEffect } from 'react';
 
 import camelCase from 'lodash/camelCase';
 import { useDispatch, useSelector } from 'react-redux';
@@ -22,18 +22,14 @@ function Search({ intl }) {
   const isPostSearch = ['posts', 'my-posts'].includes(page);
   const isTopicSearch = 'topics'.includes(page);
   let searchValue = '';
-
-  const currentValue = useMemo(() => {
-    let value = '';
-    if (isPostSearch) {
-      value = postSearch;
-    } else if (isTopicSearch) {
-      value = topicSearch;
-    } else {
-      value = learnerSearch;
-    }
-    return value;
-  }, [isPostSearch, isTopicSearch, learnerSearch]);
+  let currentValue = '';
+  if (isPostSearch) {
+    currentValue = postSearch;
+  } else if (isTopicSearch) {
+    currentValue = topicSearch;
+  } else {
+    currentValue = learnerSearch;
+  }
 
   const onClear = () => {
     dispatch(setSearchQuery(''));
diff --git a/src/components/SearchInfo.jsx b/src/components/SearchInfo.jsx
index 6c2e061f..1ac613f3 100644
--- a/src/components/SearchInfo.jsx
+++ b/src/components/SearchInfo.jsx
@@ -18,7 +18,7 @@ function SearchInfo({
   return (
     <div className="d-flex flex-row border-bottom">
       <Icon src={Search} className="justify-content-start ml-3.5 mr-2 mb-2 mt-2.5" />
-      <Button variant="" size="inline">
+      <Button variant="" size="inline" className="text-primary-500">
         {
           loadingStatus === RequestStatus.SUCCESSFUL
             ? intl.formatMessage(messages.searchInfo, { count, text })
diff --git a/src/discussions/learners/data/slices.js b/src/discussions/learners/data/slices.js
index ae7f38fc..9a585ca6 100644
--- a/src/discussions/learners/data/slices.js
+++ b/src/discussions/learners/data/slices.js
@@ -44,6 +44,7 @@ const learnersSlice = createSlice({
     },
     setUsernameSearch: (state, { payload }) => {
       state.usernameSearch = payload;
+      state.pages = [];
     },
   },
 });
diff --git a/src/discussions/messages.js b/src/discussions/messages.js
index 5ab58a84..77ba6918 100644
--- a/src/discussions/messages.js
+++ b/src/discussions/messages.js
@@ -128,6 +128,11 @@ const messages = defineMessages({
     defaultMessage: 'Try searching different keywords or removing some filters',
     description: 'Message shown on discussion sidebar if user searched with keywords.',
   },
+  removeKeywordsOnly: {
+    id: 'discussions.sidebar.removeKeywordsOnly',
+    defaultMessage: 'Try searching different keywords',
+    description: 'Message shown on discussion sidebar if user searched with keywords only.',
+  },
   removeFilters: {
     id: 'discussions.sidebar.removeFilters',
     defaultMessage: 'Try removing some filters',
diff --git a/src/discussions/posts/NoResults.jsx b/src/discussions/posts/NoResults.jsx
index 405bab8b..f5f5ec8b 100644
--- a/src/discussions/posts/NoResults.jsx
+++ b/src/discussions/posts/NoResults.jsx
@@ -15,8 +15,10 @@ function NoResults({ intl }) {
   let helpMessage = messages.removeFilters;
   if (!isFiltered) {
     return null;
-  } if (filters.search || topicsFilter || learnersFilter) {
+  } if (filters.search || learnersFilter) {
     helpMessage = messages.removeKeywords;
+  } if (topicsFilter) {
+    helpMessage = messages.removeKeywordsOnly;
   }
 
   return (
diff --git a/src/discussions/posts/post-actions-bar/messages.js b/src/discussions/posts/post-actions-bar/messages.js
index 1fd2e870..ec17f3b8 100644
--- a/src/discussions/posts/post-actions-bar/messages.js
+++ b/src/discussions/posts/post-actions-bar/messages.js
@@ -32,7 +32,7 @@ const messages = defineMessages({
   },
   clearSearch: {
     id: 'discussions.actionBar.clearSearch',
-    defaultMessage: 'Clear',
+    defaultMessage: 'Clear results',
     description: 'Button to clear search',
   },
   addAPost: {