Skip to content

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

feat(deals): filter deals by several categories

erwanMarmelabde24840c2e8c
diff --git a/src/components/atomic-crm/deals/DealList.tsx b/src/components/atomic-crm/deals/DealList.tsx
index 3f6814c9..c85f12c9 100644
--- a/src/components/atomic-crm/deals/DealList.tsx
+++ b/src/components/atomic-crm/deals/DealList.tsx
@@ -7,6 +7,7 @@ import {
useTranslate,
} from "ra-core";
import { matchPath, useLocation } from "react-router";
+import { AutocompleteArrayInput } from "@/components/admin/autocomplete-array-input";
import { AutocompleteInput } from "@/components/admin/autocomplete-input";
import { CreateButton } from "@/components/admin/create-button";
import { ExportButton } from "@/components/admin/export-button";
@@ -14,7 +15,6 @@ import { List } from "@/components/admin/list";
import { ReferenceInput } from "@/components/admin/reference-input";
import { FilterButton } from "@/components/admin/filter-form";
import { SearchInput } from "@/components/admin/search-input";
-import { SelectInput } from "@/components/admin/select-input";
import { DataImportButton } from "../dataImport/DataImportButton";
import { useConfigurationContext } from "../root/ConfigurationContext";
@@ -47,11 +47,21 @@ const DealList = () => {
placeholder={translate("resources.deals.fields.company_id")}
/>
</ReferenceInput>,
- <WrapperField source="category" label="resources.deals.fields.category">
- <SelectInput
- source="category"
+ <WrapperField
+ source="categories@ov"
+ label="resources.deals.fields.categories"
+ >
+ <AutocompleteArrayInput
+ source="categories@ov"
label={false}
- emptyText="resources.deals.fields.category"
+ placeholder={translate("resources.deals.fields.categories")}
+ // deals having any of the selected categories
+ parse={(values: string[]) =>
+ values?.length
+ ? `{${values.map((value) => `"${value}"`).join(",")}}`
+ : undefined
+ }
+ format={(value?: string) => value?.match(/[^{}",]+/g) ?? []}
choices={dealCategories}
optionText="label"
optionValue="value"
diff --git a/src/components/atomic-crm/providers/fakerest/internal/supabaseAdapter.test.ts b/src/components/atomic-crm/providers/fakerest/internal/supabaseAdapter.test.ts
index d0b01242..c56fb185 100644
--- a/src/components/atomic-crm/providers/fakerest/internal/supabaseAdapter.test.ts
+++ b/src/components/atomic-crm/providers/fakerest/internal/supabaseAdapter.test.ts
@@ -242,6 +242,28 @@ describe("getList", () => {
});
});
+ it("should transform '@ov'", async () => {
+ const getList = vi.fn();
+ const mockDataProvider = {
+ getList,
+ } as unknown as DataProvider;
+
+ getList.mockResolvedValueOnce([{ id: 1 }]);
+
+ const { getList: getListAdapter } =
+ withSupabaseFilterAdapter(mockDataProvider);
+
+ await expect(
+ getListAdapter("resource", {
+ filter: { "categories@ov": '{"ui-design","copywriting"}' },
+ }),
+ ).resolves.toEqual([{ id: 1 }]);
+
+ expect(getList).toHaveBeenCalledWith("resource", {
+ filter: { categories_inc_any: ["ui-design", "copywriting"] },
+ });
+ });
+
it("should transform '@or'", async () => {
const getList = vi.fn();
const mockDataProvider = {
diff --git a/src/components/atomic-crm/providers/fakerest/internal/transformFilter.ts b/src/components/atomic-crm/providers/fakerest/internal/transformFilter.ts
index b6b3668f..eb6f4f24 100644
--- a/src/components/atomic-crm/providers/fakerest/internal/transformFilter.ts
+++ b/src/components/atomic-crm/providers/fakerest/internal/transformFilter.ts
@@ -45,6 +45,12 @@ export function transformFilter(filter: Record<string, any>) {
continue;
}
+ if (key.endsWith("@ov")) {
+ transformedFilters[`${key.slice(0, -3)}_inc_any`] =
+ transformContainsFilter(value);
+ continue;
+ }
+
// Search query
if (key.endsWith("@or")) {
transformedFilters["q"] = transformOrFilter(value);