tyler.durden
/
dashy
mirror of https://github.com/Lissy93/dashy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🔀 Merge pull request #1171 from ssrangisetti/patch-1 

Add support searching multiple words.
This commit is contained in:
Alicia Sykes 2023-05-05 21:07:07 +01:00 committed by GitHub
parent bc9e193a7d 3f3ffac63b
commit 9a416a4653
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/Search.js
View File

@ -11,7 +11,7 @@ import ErrorHandler from '@/utils/ErrorHandler';
const getDomainFromUrl = (url) => { const getDomainFromUrl = (url) => {
if (!url) return ''; if (!url) return '';
const urlPattern = /^(?:https?:\/\/)?(?:w{3}\.)?([a-z\d.-]+)\.(?:[a-z.]{2,10})(?:[/\w.-]*)*/; const urlPattern = /^(?:https?:\/\/)?(?:w{3}\.)?([a-z\d.-]+)\.(?:[a-z.]{2,10})(?:[/\w.-]*)*/;
const domainPattern = url.match(urlPattern); const domainPattern = urlPattern.exec(url);
return domainPattern ? domainPattern[1] : ''; return domainPattern ? domainPattern[1] : '';
}; };
@ -24,8 +24,8 @@ const getDomainFromUrl = (url) => {
*/ */
const filterHelper = (compareStr, searchStr) => { const filterHelper = (compareStr, searchStr) => {
if (!compareStr) return false; if (!compareStr) return false;
const process = (input) => input && input.toString().toLowerCase().replace(/[^\w\s]/gi, ''); const process = (input) => input?.toString().toLowerCase().replace(/[^\w\s]/gi, '');
return process(compareStr).includes(process(searchStr)); return process(searchStr).split(/\s/).every(word => process(compareStr).includes(word));
}; };
/** /**