Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

Feat(fakerest):Add support for full text search

Jonathan ARNAULT6600309cc596
diff --git a/src/providers/fakerest/internal/transformFilter.ts b/src/providers/fakerest/internal/transformFilter.ts
index 91d1f489..3159c293 100644
--- a/src/providers/fakerest/internal/transformFilter.ts
+++ b/src/providers/fakerest/internal/transformFilter.ts
@@ -1,5 +1,6 @@
import { transformContainsFilter } from './transformContainsFilter';
import { transformInFilter } from './transformInFilter';
+import { transformOrFilter } from './transformOrFilter';
export function transformFilter(filter: Record<string, any>) {
const transformedFilters: Record<string, any> = {};
@@ -31,6 +32,12 @@ export function transformFilter(filter: Record<string, any>) {
continue;
}
+ // Search query
+ if (key.endsWith('@or')) {
+ transformedFilters['q'] = transformOrFilter(value);
+ continue;
+ }
+
transformedFilters[key] = value;
}
return transformedFilters;
diff --git a/src/providers/fakerest/internal/transformOrFilter.spec.ts b/src/providers/fakerest/internal/transformOrFilter.spec.ts
new file mode 100644
index 00000000..7af5c88d
--- /dev/null
+++ b/src/providers/fakerest/internal/transformOrFilter.spec.ts
@@ -0,0 +1,24 @@
+// sum.test.js
+import { transformOrFilter } from './transformOrFilter';
+
+it('should throw an error if the value is not an object', () => {
+ expect(() => transformOrFilter([])).toThrow(
+ "Invalid '@or' filter, expected an object"
+ );
+});
+
+it('should throw an error if the object is empty', () => {
+ expect(() => transformOrFilter({})).toThrow(
+ "Invalid '@or' filter, object is empty"
+ );
+});
+
+it('should return the query value', () => {
+ expect(transformOrFilter({ 'last_name@ilike': 'one' })).toEqual('one');
+ expect(
+ transformOrFilter({
+ 'last_name@ilike': 'one',
+ 'first_name@ilike': 'one',
+ })
+ ).toEqual('one');
+});
diff --git a/src/providers/fakerest/internal/transformOrFilter.ts b/src/providers/fakerest/internal/transformOrFilter.ts
new file mode 100644
index 00000000..45e950bf
--- /dev/null
+++ b/src/providers/fakerest/internal/transformOrFilter.ts
@@ -0,0 +1,17 @@
+import { isObject } from 'lodash';
+
+// @or filter is an equivaluent of fakerest `q=`
+export function transformOrFilter(values: any) {
+ if (!isObject(values) || Array.isArray(values)) {
+ throw new Error(
+ "Invalid '@or' filter, expected an object as first element"
+ );
+ }
+
+ const queries = Object.values(values);
+ if (queries.length === 0) {
+ throw new Error("Invalid '@or' filter, object is empty");
+ }
+
+ return queries[0];
+}
diff --git a/src/providers/fakerest/supabaseAdapter.spec.ts b/src/providers/fakerest/supabaseAdapter.spec.ts
index af439748..4fb955fc 100644
--- a/src/providers/fakerest/supabaseAdapter.spec.ts
+++ b/src/providers/fakerest/supabaseAdapter.spec.ts
@@ -162,6 +162,28 @@ describe('getList', () => {
});
});
+ it("should transform '@or'", () => {
+ const getList = jest.fn();
+ const mockDataProvider = {
+ getList,
+ } as unknown as DataProvider;
+
+ getList.mockResolvedValueOnce([{ id: 1 }]);
+
+ const { getList: getListAdapter } =
+ withSupabaseFilterAdapter(mockDataProvider);
+
+ expect(
+ getListAdapter('resource', {
+ filter: { '@or': { last_name: 'one' } },
+ })
+ ).resolves.toEqual([{ id: 1 }]);
+
+ expect(getList).toHaveBeenCalledWith('resource', {
+ filter: { q: 'one' },
+ });
+ });
+
it('should not transform a filter without operator', () => {
const getList = jest.fn();
const mockDataProvider = {
@@ -424,6 +446,36 @@ describe('getManyReference', () => {
});
});
+ it("should transform '@or'", () => {
+ const getManyReference = jest.fn();
+ const mockDataProvider = {
+ getManyReference,
+ } as unknown as DataProvider;
+
+ getManyReference.mockResolvedValueOnce([{ id: 1 }]);
+
+ const { getManyReference: getManyReferenceAdapter } =
+ withSupabaseFilterAdapter(mockDataProvider);
+
+ expect(
+ getManyReferenceAdapter('resource', {
+ id: 1,
+ target: 'target',
+ pagination: { page: 1, perPage: 10 },
+ sort: { field: 'id', order: 'ASC' },
+ filter: { '@or': { last_name: 'one' } },
+ })
+ ).resolves.toEqual([{ id: 1 }]);
+
+ expect(getManyReference).toHaveBeenCalledWith('resource', {
+ id: 1,
+ target: 'target',
+ pagination: { page: 1, perPage: 10 },
+ sort: { field: 'id', order: 'ASC' },
+ filter: { q: 'one' },
+ });
+ });
+
it('should not transform a filter without operator', () => {
const getManyReference = jest.fn();
const mockDataProvider = {