Skip to content

Commit 3997d10

Browse files
authored
Trim the query string in all pages with search (#1703)
1 parent a86b124 commit 3997d10

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

frontend/src/modules/activity/config/filters/main.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
22
import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
3+
import { trimAndReduceSpaces } from '@/utils/string';
34
import activityType from './activityType/config';
45
import channel from './channel/config';
56
import date from './date/config';
@@ -20,11 +21,13 @@ export const activityFilters: Record<string, FilterConfig> = {
2021
export const activitySearchFilter: SearchFilterConfig = {
2122
placeholder: 'Search activities',
2223
apiFilterRenderer(value: string): any[] {
24+
const trimmedValue = trimAndReduceSpaces(value);
25+
2326
return [
2427
{
2528
or: [
26-
{ title: { textContains: value } },
27-
{ body: { textContains: value } },
29+
{ title: { textContains: trimmedValue } },
30+
{ body: { textContains: trimmedValue } },
2831
],
2932
},
3033
];

frontend/src/modules/conversation/config/filters/main.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
22
import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
3+
import { trimAndReduceSpaces } from '@/utils/string';
34
import noOfActivities from './noOfActivities/config';
45
import channel from './channel/config';
56
import dateStarted from './dateStarted/config';
@@ -19,7 +20,7 @@ export const conversationSearchFilter: SearchFilterConfig = {
1920
return [
2021
{
2122
or: [
22-
{ title: { textContains: value } },
23+
{ title: { textContains: trimAndReduceSpaces(value) } },
2324
],
2425
},
2526
];

frontend/src/modules/member/config/filters/main.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
22
import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
3+
import { trimAndReduceSpaces } from '@/utils/string';
34
import noOfActivities from './noOfActivities/config';
45
import noOfOSSContributions from './noOfOSSContributions/config';
56
import activeOn from './activeOn/config';
@@ -37,11 +38,12 @@ export const memberFilters: Record<string, FilterConfig> = {
3738
export const memberSearchFilter: SearchFilterConfig = {
3839
placeholder: 'Search contacts',
3940
apiFilterRenderer(value: string): any[] {
41+
const trimmedValue = trimAndReduceSpaces(value);
4042
return [
4143
{
4244
or: [
43-
{ displayName: { textContains: value } },
44-
{ emails: { textContains: value } },
45+
{ displayName: { textContains: trimmedValue } },
46+
{ emails: { textContains: trimmedValue } },
4547
],
4648
},
4749
];

frontend/src/modules/organization/config/filters/main.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
22
import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
3+
import { trimAndReduceSpaces } from '@/utils/string';
34
import noOfMembers from './noOfMembers/config';
45
import noOfActivities from './noOfActivities/config';
56
import activeOn from './activeOn/config';
@@ -46,7 +47,7 @@ export const organizationSearchFilter: SearchFilterConfig = {
4647
return [
4748
{
4849
or: [
49-
{ displayName: { textContains: value } },
50+
{ displayName: { textContains: trimAndReduceSpaces(value) } },
5051
],
5152
},
5253
];

frontend/src/utils/string.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,9 @@ export const truncateText = (text, characters = 200, suffix = '') => {
2020
}
2121
return text;
2222
};
23+
24+
/** trim and replace multiple/double spaces with a single space
25+
* ' Emma Ray ' ==> 'Emma Ray
26+
* 'Emma Ray' ==> 'Emman Ray
27+
*/
28+
export const trimAndReduceSpaces = (str) => str.trim().replace(/\s+/g, ' ');

0 commit comments

Comments
 (0)