A full-featured CRM built with React, shadcn/ui, and Supabase.
Feat(dataprovider): Add @cs operator support
Jonathan ARNAULTe48d9f8a6743
diff --git a/src/providers/fakerest/internal/transformContainsFilter.spec.ts b/src/providers/fakerest/internal/transformContainsFilter.spec.tsnew file mode 100644index 00000000..e065bb7f--- /dev/null+++ b/src/providers/fakerest/internal/transformContainsFilter.spec.ts@@ -0,0 +1,24 @@+// sum.test.js+import { transformContainsFilter } from './transformContainsFilter';++it('should throw an error if the filter is not a string', () => {+ expect(() => transformContainsFilter(1)).toThrow(+ "Invalid '@cs' filter value, expected a string matching '\\{[a-z0-9-]+(,[a-z0-9-]+)*\\}', got: 1"+ );+});++it('should throw an error if the filter does not match pattern', () => {+ expect(() => transformContainsFilter('1,2')).toThrow(+ "Invalid '@cs' filter value, expected a string matching '\\{[a-z0-9-]+(,[a-z0-9-]+)*\\}', got: 1,2"+ );+});++it('should return an array of numbers', () => {+ expect(transformContainsFilter('{1}')).toEqual([1]);+ expect(transformContainsFilter('{1,2,3}')).toEqual([1, 2, 3]);+});++it('should return an array of strings', () => {+ expect(transformContainsFilter('{a}')).toEqual(['a']);+ expect(transformContainsFilter('{a,B,c-d}')).toEqual(['a', 'B', 'c-d']);+});diff --git a/src/providers/fakerest/internal/transformContainsFilter.ts b/src/providers/fakerest/internal/transformContainsFilter.tsnew file mode 100644index 00000000..645283e2--- /dev/null+++ b/src/providers/fakerest/internal/transformContainsFilter.ts@@ -0,0 +1,20 @@+const CONTAINS_FILTER_REGEX = /^\{[a-z0-9-]+(,[a-z0-9-]+)*\}$/i;++export function transformContainsFilter(value: any) {+ if (typeof value !== 'string' || !value.match(CONTAINS_FILTER_REGEX)) {+ throw new Error(+ `Invalid '@cs' filter value, expected a string matching '\\{[a-z0-9-]+(,[a-z0-9-]+)*\\}', got: ${value}`+ );+ }++ return value+ .slice(1, -1)+ .split(',')+ .map((v: string) => {+ const parsedFloat = Number.parseFloat(v);+ if (!Number.isNaN(parsedFloat)) {+ return parsedFloat;+ }+ return v;+ });+}diff --git a/src/providers/fakerest/internal/transformInFilter.spec.ts b/src/providers/fakerest/internal/transformInFilter.spec.tsindex 0c78a8ae..4a4b4ce6 100644--- a/src/providers/fakerest/internal/transformInFilter.spec.ts+++ b/src/providers/fakerest/internal/transformInFilter.spec.ts@@ -3,13 +3,13 @@ import { transformInFilter } from './transformInFilter';it('should throw an error if the filter is not a string', () => {expect(() => transformInFilter(1)).toThrow(- "Invalid '@in' filter value, expected a string matching '(\\d+(,\\d)*)', got: 1"+ "Invalid '@in' filter value, expected a string matching '\\([a-z0-9-]+(,[a-z0-9-]+)*\\)', got: 1");});it('should throw an error if the filter does not match pattern', () => {expect(() => transformInFilter('1,2')).toThrow(- "Invalid '@in' filter value, expected a string matching '(\\d+(,\\d)*)', got: 1,2"+ "Invalid '@in' filter value, expected a string matching '\\([a-z0-9-]+(,[a-z0-9-]+)*\\)', got: 1,2");});diff --git a/src/providers/fakerest/internal/transformInFilter.ts b/src/providers/fakerest/internal/transformInFilter.tsindex e0be1b6f..118c510c 100644--- a/src/providers/fakerest/internal/transformInFilter.ts+++ b/src/providers/fakerest/internal/transformInFilter.ts@@ -3,7 +3,7 @@ const IN_FILTER_REGEX = /^\([a-z0-9-]+(,[a-z0-9-]+)*\)$/i;export function transformInFilter(value: any) {if (typeof value !== 'string' || !value.match(IN_FILTER_REGEX)) {throw new Error(- `Invalid '@in' filter value, expected a string matching '(\\d+(,\\d)*)', got: ${value}`+ `Invalid '@in' filter value, expected a string matching '\\([a-z0-9-]+(,[a-z0-9-]+)*\\)', got: ${value}`);}diff --git a/src/providers/fakerest/supabaseAdapter.spec.ts b/src/providers/fakerest/supabaseAdapter.spec.tsindex 1fa9e49e..571b8a31 100644--- a/src/providers/fakerest/supabaseAdapter.spec.ts+++ b/src/providers/fakerest/supabaseAdapter.spec.ts@@ -22,6 +22,26 @@ describe('getList', () => {});});+ it("should transform '@cs'", () => {+ const getList = jest.fn();+ const mockDataProvider = {+ getList,+ } as unknown as DataProvider;++ getList.mockResolvedValueOnce([{ id: 1 }]);++ const { getList: getListAdapter } =+ withSupabaseFilterAdapter(mockDataProvider);++ expect(+ getListAdapter('resource', { filter: { 'tags@cs': '{1,2,a}' } })+ ).resolves.toEqual([{ id: 1 }]);++ expect(getList).toHaveBeenCalledWith('resource', {+ filter: { tags: [1, 2, 'a'] },+ });+ });+it('should not transform a filter without operator', () => {const getList = jest.fn();const mockDataProvider = {@@ -74,6 +94,36 @@ describe('getManyReference', () => {});});+ it("should transform '@cs'", () => {+ 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: { 'tags@cs': '{1,2,a}' },+ })+ ).resolves.toEqual([{ id: 1 }]);++ expect(getManyReference).toHaveBeenCalledWith('resource', {+ id: 1,+ target: 'target',+ pagination: { page: 1, perPage: 10 },+ sort: { field: 'id', order: 'ASC' },+ filter: { tags: [1, 2, 'a'] },+ });+ });+it('should not transform a filter without operator', () => {const getManyReference = jest.fn();const mockDataProvider = {diff --git a/src/providers/fakerest/supabaseAdapter.ts b/src/providers/fakerest/supabaseAdapter.tsindex 3872b13b..541f1a9e 100644--- a/src/providers/fakerest/supabaseAdapter.ts+++ b/src/providers/fakerest/supabaseAdapter.ts@@ -1,4 +1,5 @@import { DataProvider } from 'react-admin';+import { transformContainsFilter } from './internal/transformContainsFilter';import { transformInFilter } from './internal/transformInFilter';function transformFilter(filter: Record<string, any>) {@@ -10,6 +11,12 @@ function transformFilter(filter: Record<string, any>) {continue;}+ if (key.endsWith('@cs')) {+ transformedFilters[`${key.slice(0, -3)}`] =+ transformContainsFilter(value);+ continue;+ }+transformedFilters[key] = value;}return transformedFilters;