fix: resolve issues with search functionality

This commit is contained in:
SaadYousaf
2022-08-22 14:02:01 +05:00
committed by Saad Yousaf
parent 19666b88d2
commit fab9d91a0b
6 changed files with 20 additions and 16 deletions

View File

@@ -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(''));

View File

@@ -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 })

View File

@@ -44,6 +44,7 @@ const learnersSlice = createSlice({
},
setUsernameSearch: (state, { payload }) => {
state.usernameSearch = payload;
state.pages = [];
},
},
});

View File

@@ -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',

View File

@@ -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 (

View File

@@ -32,7 +32,7 @@ const messages = defineMessages({
},
clearSearch: {
id: 'discussions.actionBar.clearSearch',
defaultMessage: 'Clear',
defaultMessage: 'Clear results',
description: 'Button to clear search',
},
addAPost: {