hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Case-insensitive search

Browse Source 
Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
This commit is contained in:
Alex Andreev 2020-10-22 12:53:26 +03:00
parent a6eb28335d
commit e3a3fb42eb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/renderer/components/dock/pod-logs.tsx
View File

@ -164,14 +164,18 @@ export class PodLogs extends React.Component<Props> {
const { searchQuery, isActiveOverlay } = searchStore; const { searchQuery, isActiveOverlay } = searchStore;
const item = this.logs[rowIndex]; const item = this.logs[rowIndex];
const contents: React.ReactElement[] = []; const contents: React.ReactElement[] = [];
if (searchQuery) { if (searchQuery) { // If search is enabled, replace keyword with backgrounded <span>
// If search is enabled, replace keyword with backgrounded <span> to "highlight" searchable text // Case-insensitive search (lowercasing query and keywords in line)
const pieces = item.split(searchQuery); const regex = new RegExp(searchStore.escapeRegex(searchQuery), "gi");
const matches = item.matchAll(regex);
const modified = item.replace(regex, match => match.toLowerCase());
// Splitting text line by keyword
const pieces = modified.split(searchQuery.toLowerCase());
pieces.forEach((piece, index) => { pieces.forEach((piece, index) => {
const active = isActiveOverlay(rowIndex, index); const active = isActiveOverlay(rowIndex, index);
const lastItem = index === pieces.length - 1; const lastItem = index === pieces.length - 1;
const overlay = !lastItem ? const overlay = !lastItem ?
<span className={cssNames({ active })}>{searchQuery}</span> : <span className={cssNames({ active })}>{matches.next().value}</span> :
null null
contents.push( contents.push(
<React.Fragment key={piece + index}> <React.Fragment key={piece + index}>

2
src/renderer/components/dock/search.store.ts
View File

@ -36,7 +36,7 @@ export class SearchStore {
findOccurencies(text: string[], query: string) { findOccurencies(text: string[], query: string) {
const occurences: number[] = []; const occurences: number[] = [];
text.forEach((line, index) => { text.forEach((line, index) => {
const regex = new RegExp(this.escapeRegex(query), "g"); const regex = new RegExp(this.escapeRegex(query), "gi");
const matches = [...line.matchAll(regex)]; const matches = [...line.matchAll(regex)];
matches.forEach(() => occurences.push(index)); matches.forEach(() => occurences.push(index));
}); });