Skip to content

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

Feat(dataprovider): Add support for is and not.is operators

Jonathan ARNAULT4c2dca182ef1
diff --git a/src/providers/fakerest/internal/transformFilter.ts b/src/providers/fakerest/internal/transformFilter.ts
index 3159c293..1979cf9d 100644
--- a/src/providers/fakerest/internal/transformFilter.ts
+++ b/src/providers/fakerest/internal/transformFilter.ts
@@ -20,6 +20,16 @@ export function transformFilter(filter: Record<string, any>) {
continue;
}
+ if (key.endsWith('@is')) {
+ transformedFilters[`${key.slice(0, -3)}_eq`] = value;
+ continue;
+ }
+
+ if (key.endsWith('@not.is')) {
+ transformedFilters[`${key.slice(0, -7)}_neq`] = value;
+ continue;
+ }
+
if (key.endsWith('@in')) {
transformedFilters[`${key.slice(0, -3)}_eq_any`] =
transformInFilter(value);
diff --git a/src/providers/fakerest/supabaseAdapter.spec.ts b/src/providers/fakerest/supabaseAdapter.spec.ts
index 4fb955fc..a72e1c85 100644
--- a/src/providers/fakerest/supabaseAdapter.spec.ts
+++ b/src/providers/fakerest/supabaseAdapter.spec.ts
@@ -42,6 +42,86 @@ describe('getList', () => {
});
});
+ it("should transform '@eq'", () => {
+ const getList = jest.fn();
+ const mockDataProvider = {
+ getList,
+ } as unknown as DataProvider;
+
+ getList.mockResolvedValueOnce([{ id: 1 }]);
+
+ const { getList: getListAdapter } =
+ withSupabaseFilterAdapter(mockDataProvider);
+
+ expect(
+ getListAdapter('resource', { filter: { 'a@id@eq': '1' } })
+ ).resolves.toEqual([{ id: 1 }]);
+
+ expect(getList).toHaveBeenCalledWith('resource', {
+ filter: { 'a@id_eq': '1' },
+ });
+ });
+
+ it("should transform '@neq'", () => {
+ const getList = jest.fn();
+ const mockDataProvider = {
+ getList,
+ } as unknown as DataProvider;
+
+ getList.mockResolvedValueOnce([{ id: 1 }]);
+
+ const { getList: getListAdapter } =
+ withSupabaseFilterAdapter(mockDataProvider);
+
+ expect(
+ getListAdapter('resource', { filter: { 'a@id@neq': '1' } })
+ ).resolves.toEqual([{ id: 1 }]);
+
+ expect(getList).toHaveBeenCalledWith('resource', {
+ filter: { 'a@id_neq': '1' },
+ });
+ });
+
+ it("should transform '@is'", () => {
+ const getList = jest.fn();
+ const mockDataProvider = {
+ getList,
+ } as unknown as DataProvider;
+
+ getList.mockResolvedValueOnce([{ id: 1 }]);
+
+ const { getList: getListAdapter } =
+ withSupabaseFilterAdapter(mockDataProvider);
+
+ expect(
+ getListAdapter('resource', { filter: { 'id@is': null } })
+ ).resolves.toEqual([{ id: 1 }]);
+
+ expect(getList).toHaveBeenCalledWith('resource', {
+ filter: { id_eq: null },
+ });
+ });
+
+ it("should transform '@not.is'", () => {
+ const getList = jest.fn();
+ const mockDataProvider = {
+ getList,
+ } as unknown as DataProvider;
+
+ getList.mockResolvedValueOnce([{ id: 1 }]);
+
+ const { getList: getListAdapter } =
+ withSupabaseFilterAdapter(mockDataProvider);
+
+ expect(
+ getListAdapter('resource', { filter: { '[email protected]': null } })
+ ).resolves.toEqual([{ id: 1 }]);
+
+ expect(getList).toHaveBeenCalledWith('resource', {
+ filter: { id_neq: null },
+ });
+ });
+
it("should transform '@lt'", () => {
const getList = jest.fn();
const mockDataProvider = {
@@ -266,6 +346,66 @@ describe('getManyReference', () => {
});
});
+ it('should transform @is', () => {
+ 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: { 'id@is': null },
+ })
+ ).resolves.toEqual([{ id: 1 }]);
+
+ expect(getManyReference).toHaveBeenCalledWith('resource', {
+ id: 1,
+ target: 'target',
+ pagination: { page: 1, perPage: 10 },
+ sort: { field: 'id', order: 'ASC' },
+ filter: { id_eq: null },
+ });
+ });
+
+ it('should transform @not.is', () => {
+ 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: { '[email protected]': null },
+ })
+ ).resolves.toEqual([{ id: 1 }]);
+
+ expect(getManyReference).toHaveBeenCalledWith('resource', {
+ id: 1,
+ target: 'target',
+ pagination: { page: 1, perPage: 10 },
+ sort: { field: 'id', order: 'ASC' },
+ filter: { id_neq: null },
+ });
+ });
+
it('should transform @lt', () => {
const getManyReference = jest.fn();
const mockDataProvider = {