From 4bb198eb4cf87138181db54f46f29ac78b2cb842 Mon Sep 17 00:00:00 2001 From: keefe roedersheimer Date: Tue, 4 Aug 2020 19:37:07 -0400 Subject: [PATCH] change search filter to includes (#10141) --- web-console/src/utils/general.spec.ts | 2 +- web-console/src/utils/general.tsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web-console/src/utils/general.spec.ts b/web-console/src/utils/general.spec.ts index 264554f72ff..b9f478824e2 100644 --- a/web-console/src/utils/general.spec.ts +++ b/web-console/src/utils/general.spec.ts @@ -50,7 +50,7 @@ describe('general', () => { id: 'datasource', value: `hello`, }), - ).toMatchInlineSnapshot(`"LOWER(\\"datasource\\") LIKE LOWER('hello%')"`); + ).toMatchInlineSnapshot(`"LOWER(\\"datasource\\") LIKE LOWER('%hello%')"`); expect( sqlQueryCustomTableFilter({ diff --git a/web-console/src/utils/general.tsx b/web-console/src/utils/general.tsx index 1ff1eaf6fd1..77c44be2f43 100644 --- a/web-console/src/utils/general.tsx +++ b/web-console/src/utils/general.tsx @@ -89,7 +89,7 @@ export function makeBooleanFilter(): FilterRender { interface NeedleAndMode { needle: string; - mode: 'exact' | 'prefix'; + mode: 'exact' | 'includes'; } function getNeedleAndMode(input: string): NeedleAndMode { @@ -101,7 +101,7 @@ function getNeedleAndMode(input: string): NeedleAndMode { } return { needle: input.startsWith(`"`) ? input.substring(1) : input, - mode: 'prefix', + mode: 'includes', }; } @@ -113,7 +113,7 @@ export function booleanCustomTableFilter(filter: Filter, value: any): boolean { if (needleAndMode.mode === 'exact') { return needle === haystack; } - return haystack.startsWith(needle); + return haystack.includes(needle); } export function sqlQueryCustomTableFilter(filter: Filter): string { @@ -123,7 +123,7 @@ export function sqlQueryCustomTableFilter(filter: Filter): string { if (needleAndMode.mode === 'exact') { return `${columnName} = '${needle}'`; } else { - return `LOWER(${columnName}) LIKE LOWER('${needle}%')`; + return `LOWER(${columnName}) LIKE LOWER('%${needle}%')`; } }