Skip to content

Trim the query string in all pages with search #1703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Trim the query string in all pages with search #1703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe588f7
Trim the query string in all pages with search
peoray Oct 17, 2023
62d5987
Fix lint issues
peoray Oct 17, 2023
0e37403
Merge branch 'main' into search-query-trim
peoray Oct 19, 2023
825b5f9
trim search query string in conversation
peoray Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions frontend/src/modules/activity/config/filters/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
import { trimAndReduceSpaces } from '@/utils/string';
import activityType from './activityType/config';
import channel from './channel/config';
import date from './date/config';
Expand All @@ -20,11 +21,13 @@ export const activityFilters: Record<string, FilterConfig> = {
export const activitySearchFilter: SearchFilterConfig = {
placeholder: 'Search activities',
apiFilterRenderer(value: string): any[] {
const trimmedValue = trimAndReduceSpaces(value);

return [
{
or: [
{ title: { textContains: value } },
{ body: { textContains: value } },
{ title: { textContains: trimmedValue } },
{ body: { textContains: trimmedValue } },
],
},
];
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/modules/conversation/config/filters/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
import { trimAndReduceSpaces } from '@/utils/string';
import noOfActivities from './noOfActivities/config';
import channel from './channel/config';
import dateStarted from './dateStarted/config';
Expand All @@ -19,7 +20,7 @@ export const conversationSearchFilter: SearchFilterConfig = {
return [
{
or: [
{ title: { textContains: value } },
{ title: { textContains: trimAndReduceSpaces(value) } },
],
},
];
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/modules/member/config/filters/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
import { trimAndReduceSpaces } from '@/utils/string';
import noOfActivities from './noOfActivities/config';
import noOfOSSContributions from './noOfOSSContributions/config';
import activeOn from './activeOn/config';
Expand Down Expand Up @@ -37,11 +38,12 @@ export const memberFilters: Record<string, FilterConfig> = {
export const memberSearchFilter: SearchFilterConfig = {
placeholder: 'Search contacts',
apiFilterRenderer(value: string): any[] {
const trimmedValue = trimAndReduceSpaces(value);
return [
{
or: [
{ displayName: { textContains: value } },
{ emails: { textContains: value } },
{ displayName: { textContains: trimmedValue } },
{ emails: { textContains: trimmedValue } },
],
},
];
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/modules/organization/config/filters/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { FilterConfig } from '@/shared/modules/filters/types/FilterConfig';
import { SearchFilterConfig } from '@/shared/modules/filters/types/filterTypes/SearchFilterConfig';
import { trimAndReduceSpaces } from '@/utils/string';
import noOfMembers from './noOfMembers/config';
import noOfActivities from './noOfActivities/config';
import activeOn from './activeOn/config';
Expand Down Expand Up @@ -46,7 +47,7 @@ export const organizationSearchFilter: SearchFilterConfig = {
return [
{
or: [
{ displayName: { textContains: value } },
{ displayName: { textContains: trimAndReduceSpaces(value) } },
],
},
];
Expand Down
6 changes: 6 additions & 0 deletions frontend/src/utils/string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,9 @@ export const truncateText = (text, characters = 200, suffix = '') => {
}
return text;
};

/** trim and replace multiple/double spaces with a single space
* ' Emma Ray ' ==> 'Emma Ray
* 'Emma Ray' ==> 'Emman Ray
*/
export const trimAndReduceSpaces = (str) => str.trim().replace(/\s+/g, ' ');