fix: Remove anchorEnd and handle dates

Author: dawsontoth

src/features/instance/databases/DatabaseTableView.tsx

@@ -69,16 +69,21 @@ export function DatabaseTableView() {
 		resolver: zodResolver(ColumnFiltersSchema),
 	});
 	const columnFiltersValues = columnFiltersForm.watch();
-	const rawSearchConditions: SearchCondition[] | null = useMemo(() => {
+	const debouncedColumnFiltersValues = useDebounce(columnFiltersValues, 500, JSON.stringify);
+	const searchConditions: SearchCondition[] | null = useMemo(() => {
 		const conditions: SearchCondition[] = [];
-		for (const key in columnFiltersValues) {
-			if (columnFiltersValues[key]?.length) {
-				conditions.push(translateColumnFilterToSearchCondition(key, columnFiltersValues[key], attributesMap[key]));
+		for (const key in debouncedColumnFiltersValues) {
+			if (debouncedColumnFiltersValues[key]?.length) {
+				try {
+					conditions.push(translateColumnFilterToSearchCondition(key, debouncedColumnFiltersValues[key], attributesMap[key]));
+				}
+				catch (err) {
+					toast.error(String(err));
+				}
 			}
 		}
 		return conditions.length ? conditions : null;
-	}, [attributesMap, columnFiltersValues])
-	const searchConditions = useDebounce(rawSearchConditions, 500, JSON.stringify);
+	}, [attributesMap, debouncedColumnFiltersValues]);
 
 	const { dataTableColumns, hashAttribute } = formatBrowseDataTableHeader(describeTableData);
 	const [isAddModalOpen, setIsAddModalOpen] = useState(false);

src/features/instance/operations/queries/getSearchByConditions.test.ts

@@ -13,40 +13,26 @@ function attr(type?: InstanceAttribute['type']): InstanceAttribute {
 }
 
 describe('translateStringSearchType', () => {
-	it('returns equals when both anchors are present', () => {
-		expect(translateStringSearchType(true, true, attr('String'))).toBe('equals');
-	});
-
 	it('returns starts_with when only start anchor is present', () => {
-		expect(translateStringSearchType(true, false, attr('String'))).toBe('starts_with');
-	});
-
-	it('returns ends_with when only end anchor is present', () => {
-		expect(translateStringSearchType(false, true, attr('String'))).toBe('ends_with');
+		expect(translateStringSearchType(true, attr('String'))).toBe('starts_with');
 	});
 
 	it('returns equals for ID type when no anchors', () => {
-		expect(translateStringSearchType(false, false, attr('ID'))).toBe('equals');
+		expect(translateStringSearchType(false, attr('ID'))).toBe('equals');
 	});
 
-	it('defaults to starts_with when no anchors and non-ID', () => {
-		expect(translateStringSearchType(false, false, attr('String'))).toBe('starts_with');
-		expect(translateStringSearchType(false, false, attr('Date'))).toBe('starts_with');
+	it('defaults to equals when no anchors and non-ID', () => {
+		expect(translateStringSearchType(false, attr('String'))).toBe('equals');
+		expect(translateStringSearchType(false, attr('Date'))).toBe('equals');
 	});
 });
 
 describe('translateStringSearchValue', () => {
-	it('strips both anchors', () => {
-		expect(translateStringSearchValue(true, true, '^foo$')).toBe('foo');
-	});
-	it('strips start anchor only', () => {
-		expect(translateStringSearchValue(true, false, '^foo')).toBe('foo');
-	});
-	it('strips end anchor only', () => {
-		expect(translateStringSearchValue(false, true, 'foo$')).toBe('foo');
+	it('strips start anchor', () => {
+		expect(translateStringSearchValue(true, 'foo*')).toBe('foo');
 	});
 	it('returns as-is with no anchors', () => {
-		expect(translateStringSearchValue(false, false, 'foo')).toBe('foo');
+		expect(translateStringSearchValue(false, 'foo')).toBe('foo');
 	});
 });
 
@@ -87,26 +73,26 @@ describe('translateBooleanValue', () => {
 describe('translateColumnFilterToSearchCondition', () => {
 	it('handles String attribute with anchors', () => {
 		expect(
-			translateColumnFilterToSearchCondition('name', '^foo$', attr('String')),
+			translateColumnFilterToSearchCondition('name', 'foo', attr('String')),
 		).toEqual({
 			search_attribute: 'name',
 			search_type: 'equals',
 			search_value: 'foo',
 		});
 
 		expect(
-			translateColumnFilterToSearchCondition('name', 'bar$', attr('String')),
+			translateColumnFilterToSearchCondition('name', 'bar*', attr('String')),
 		).toEqual({
 			search_attribute: 'name',
-			search_type: 'ends_with',
+			search_type: 'starts_with',
 			search_value: 'bar',
 		});
 
 		expect(
 			translateColumnFilterToSearchCondition('name', 'baz', attr('String')),
 		).toEqual({
 			search_attribute: 'name',
-			search_type: 'starts_with',
+			search_type: 'equals',
 			search_value: 'baz',
 		});
 	});

src/features/instance/operations/queries/getSearchByConditions.ts

@@ -84,15 +84,12 @@ export function getSearchByConditionsOptions({
 export function translateColumnFilterToSearchCondition(key: string, value: string, attribute: InstanceAttribute | undefined): SearchCondition {
 	switch (attribute?.type) {
 		case 'ID':
-		case 'Date':
 		case 'String': {
-			// TODO: Handle dates.
-			const anchorStart = value[0] === '^';
-			const anchorEnd = value[value.length - 1] === '$';
+			const anchorStart = value[value.length - 1] === '*';
 			return {
 				search_attribute: key,
-				search_type: translateStringSearchType(anchorStart, anchorEnd, attribute),
-				search_value: translateStringSearchValue(anchorStart, anchorEnd, value),
+				search_type: translateStringSearchType(anchorStart, attribute),
+				search_value: translateStringSearchValue(anchorStart, value),
 			};
 		}
 		case 'Int':
@@ -108,6 +105,16 @@ export function translateColumnFilterToSearchCondition(key: string, value: strin
 				search_value: parsed,
 			};
 		}
+		case 'Date': {
+			const comparator = value.match(/^[><=]+/)?.[0];
+			const rawValue = comparator ? value.slice(comparator.length) : value;
+			const parsed = new Date(rawValue).toISOString();
+			return {
+				search_attribute: key,
+				search_type: translateNumberComparator(comparator),
+				search_value: parsed,
+			};
+		}
 		case 'Boolean': {
 			return {
 				search_attribute: key,
@@ -127,30 +134,18 @@ export function translateColumnFilterToSearchCondition(key: string, value: strin
 	}
 }
 
-export function translateStringSearchType(anchorStart: boolean, anchorEnd: boolean, attribute: InstanceAttribute): Comparator {
-	if (anchorStart && anchorEnd) {
-		return 'equals';
-	}
+export function translateStringSearchType(anchorStart: boolean, attribute: InstanceAttribute): Comparator {
 	if (anchorStart) {
 		return 'starts_with';
 	}
-	if (anchorEnd) {
-		return 'ends_with';
-	}
 	if (attribute.type === 'ID') {
 		return 'equals';
 	}
-	return 'starts_with';
+	return 'equals';
 }
 
-export function translateStringSearchValue(anchorStart: boolean, anchorEnd: boolean, value: string) {
-	if (anchorStart && anchorEnd) {
-		return value.slice(1, -1);
-	}
+export function translateStringSearchValue(anchorStart: boolean, value: string) {
 	if (anchorStart) {
-		return value.slice(1);
-	}
-	if (anchorEnd) {
 		return value.slice(0, -1);
 	}
 	return value;