Skip to content

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

Apply review

Jerome4fe7481f4837
diff --git a/e2e/adminAccountManagerFilter.spec.ts b/e2e/adminAccountManagerFilter.spec.ts
index 76045cbd..beaf236d 100644
--- a/e2e/adminAccountManagerFilter.spec.ts
+++ b/e2e/adminAccountManagerFilter.spec.ts
@@ -56,8 +56,7 @@ test.describe("admin filtering by account manager", () => {
if (isMobile) {
await page.getByRole("button", { name: "Add filter" }).click();
}
- await page.getByRole("combobox", { name: "Account manager" }).click();
- await page.getByRole("option", { name: "Marie Curie" }).click();
+ await page.getByRole("button", { name: "Marie Curie" }).click();
if (isMobile) {
await page.getByRole("button", { name: "Confirm" }).click();
}
@@ -68,7 +67,7 @@ test.describe("admin filtering by account manager", () => {
if (isMobile) {
await page.getByRole("button", { name: "Add filter" }).click();
}
- await page.getByRole("button", { name: "Clear value" }).click();
+ await page.getByRole("button", { name: "Marie Curie" }).click();
if (isMobile) {
await page.getByRole("button", { name: "Confirm" }).click();
}
@@ -77,7 +76,7 @@ test.describe("admin filtering by account manager", () => {
await expect(page.getByText("Grace Hopper")).toBeVisible();
});
- test("a non-admin user gets no account manager picker", async ({
+ test("a non-admin user gets no account manager list", async ({
page,
isMobile,
menu,
@@ -93,8 +92,7 @@ test.describe("admin filtering by account manager", () => {
if (isMobile) {
await page.getByRole("button", { name: "Add filter" }).click();
}
- await expect(
- page.getByRole("combobox", { name: "Account manager" }),
- ).toBeHidden();
+ await expect(page.getByRole("button", { name: "Me" })).toBeVisible();
+ await expect(page.getByRole("button", { name: "John Doe" })).toBeHidden();
});
});
diff --git a/registry.json b/registry.json
index bc2f9f28..8c445fff 100644
--- a/registry.json
+++ b/registry.json
@@ -161,10 +161,6 @@
"path": "src/components/atomic-crm/sales/useGetSalesName.ts",
"type": "registry:component"
},
- {
- "path": "src/components/atomic-crm/sales/useCanFilterByAccountManager.ts",
- "type": "registry:component"
- },
{
"path": "src/components/atomic-crm/sales/index.ts",
"type": "registry:component"
diff --git a/src/components/atomic-crm/companies/CompanyListFilter.tsx b/src/components/atomic-crm/companies/CompanyListFilter.tsx
index e0a0c8a6..6a6a05a1 100644
--- a/src/components/atomic-crm/companies/CompanyListFilter.tsx
+++ b/src/components/atomic-crm/companies/CompanyListFilter.tsx
@@ -6,7 +6,6 @@ import { SearchInput } from "@/components/admin/search-input";
import { FilterCategory } from "../filters/FilterCategory";
import { useConfigurationContext } from "../root/ConfigurationContext";
import { AccountManagerFilter } from "../sales/AccountManagerInput";
-import { useCanFilterByAccountManager } from "../sales/useCanFilterByAccountManager";
import { getTranslatedCompanySizeLabel } from "./getTranslatedCompanySizeLabel";
import { sizes } from "./sizes";
@@ -14,8 +13,6 @@ export const CompanyListFilter = () => {
const { identity } = useGetIdentity();
const { companySectors } = useConfigurationContext();
const translate = useTranslate();
- const { canFilter: canFilterByAccountManager } =
- useCanFilterByAccountManager();
const translatedSizes = sizes.map((size) => ({
...size,
name: getTranslatedCompanySizeLabel(size, translate),
@@ -63,7 +60,7 @@ export const CompanyListFilter = () => {
label={translate("crm.common.me")}
value={{ sales_id: identity?.id }}
/>
- {canFilterByAccountManager && <AccountManagerFilter />}
+ <AccountManagerFilter className="w-full justify-between" />
</FilterCategory>
</div>
);
diff --git a/src/components/atomic-crm/contacts/ContactList.test.tsx b/src/components/atomic-crm/contacts/ContactList.test.tsx
index bc7b9eb6..3ad7f8d4 100644
--- a/src/components/atomic-crm/contacts/ContactList.test.tsx
+++ b/src/components/atomic-crm/contacts/ContactList.test.tsx
@@ -143,8 +143,7 @@ describe("ContactList", () => {
await expect.element(screen.getByText("Ada Lovelace")).toBeVisible();
await expect.element(screen.getByText("Grace Hopper")).toBeVisible();
- await screen.getByRole("combobox", { name: "Account manager" }).click();
- await screen.getByRole("option", { name: "Marie Curie" }).click();
+ await screen.getByRole("button", { name: "Marie Curie" }).click();
await expect.element(screen.getByText("Grace Hopper")).toBeVisible();
await expect
@@ -152,12 +151,39 @@ describe("ContactList", () => {
.not.toBeInTheDocument();
});
- it("offers no account manager picker to a user who is not an admin", async () => {
+ it("brings every contact back when the admin untoggles the account manager", async () => {
+ const screen = await render(<AdminAccountManagerFilter />);
+
+ await screen.getByRole("button", { name: "Marie Curie" }).click();
+ await expect
+ .element(screen.getByText("Ada Lovelace"))
+ .not.toBeInTheDocument();
+
+ await screen.getByRole("button", { name: "Marie Curie" }).click();
+
+ await expect.element(screen.getByText("Ada Lovelace")).toBeVisible();
+ await expect.element(screen.getByText("Grace Hopper")).toBeVisible();
+ });
+
+ it("keeps the current user out of the account manager list, offering only Me", async () => {
+ const screen = await render(<AdminAccountManagerFilter />);
+
+ await expect
+ .element(screen.getByRole("button", { name: "Me" }))
+ .toBeVisible();
+ await expect
+ .element(screen.getByRole("button", { name: "Jane Doe" }))
+ .not.toBeInTheDocument();
+ });
+
+ it("offers no account manager list to a user who is not an admin", async () => {
const screen = await render(<NonAdminAccountManagerFilter />);
- await expect.element(screen.getByText("Me")).toBeVisible();
await expect
- .element(screen.getByRole("combobox", { name: "Account manager" }))
+ .element(screen.getByRole("button", { name: "Me" }))
+ .toBeVisible();
+ await expect
+ .element(screen.getByRole("button", { name: "Marie Curie" }))
.not.toBeInTheDocument();
});
});
@@ -173,8 +199,7 @@ describe("ContactList", () => {
await expect.element(screen.getByText("Ada Lovelace")).toBeVisible();
await screen.getByRole("button", { name: "Add filter" }).click();
- await screen.getByRole("combobox", { name: "Account manager" }).click();
- await screen.getByRole("option", { name: "Marie Curie" }).click();
+ await screen.getByRole("button", { name: "Marie Curie" }).click();
await screen.getByRole("button", { name: "Confirm" }).click();
await expect.element(screen.getByText("Grace Hopper")).toBeVisible();
diff --git a/src/components/atomic-crm/contacts/ContactListFilter.tsx b/src/components/atomic-crm/contacts/ContactListFilter.tsx
index f31f4c4a..4e2b53f8 100644
--- a/src/components/atomic-crm/contacts/ContactListFilter.tsx
+++ b/src/components/atomic-crm/contacts/ContactListFilter.tsx
@@ -16,15 +16,12 @@ import { ResponsiveFilters } from "../misc/ResponsiveFilters";
import { useIsMobile } from "@/hooks/use-mobile";
import { ActiveFilterButton } from "../misc/ActiveFilterButton";
import { AccountManagerFilter } from "../sales/AccountManagerInput";
-import { useCanFilterByAccountManager } from "../sales/useCanFilterByAccountManager";
export const ContactListFilter = () => {
const { noteStatuses } = useConfigurationContext();
const isMobile = useIsMobile();
const { identity } = useGetIdentity();
const translate = useTranslate();
- const { canFilter: canFilterByAccountManager } =
- useCanFilterByAccountManager();
const { data } = useGetList("tags", {
pagination: { page: 1, perPage: 10 },
sort: { field: "name", order: "ASC" },
@@ -149,12 +146,15 @@ export const ContactListFilter = () => {
label="resources.contacts.fields.sales_id"
>
<ToggleFilterButton
- className="w-full justify-between h-10 md:h-8"
+ className="w-auto md:w-full max-w-full justify-between h-10 md:h-8"
label="crm.common.me"
value={{ sales_id: identity?.id }}
size={isMobile ? "lg" : undefined}
/>
- {canFilterByAccountManager && <AccountManagerFilter />}
+ <AccountManagerFilter
+ className="w-auto md:w-full max-w-full justify-between h-10 md:h-8"
+ size={isMobile ? "lg" : undefined}
+ />
</FilterCategory>
</ResponsiveFilters>
);
diff --git a/src/components/atomic-crm/deals/DealList.tsx b/src/components/atomic-crm/deals/DealList.tsx
index e2adaefc..61689245 100644
--- a/src/components/atomic-crm/deals/DealList.tsx
+++ b/src/components/atomic-crm/deals/DealList.tsx
@@ -1,6 +1,11 @@
import type { ReactNode } from "react";
import type { InputProps } from "ra-core";
-import { useGetIdentity, useListContext, useTranslate } from "ra-core";
+import {
+ useCanAccess,
+ useGetIdentity,
+ useListContext,
+ useTranslate,
+} from "ra-core";
import { matchPath, useLocation } from "react-router";
import { AutocompleteInput } from "@/components/admin/autocomplete-input";
import { CreateButton } from "@/components/admin/create-button";
@@ -14,7 +19,6 @@ import { SelectInput } from "@/components/admin/select-input";
import { useConfigurationContext } from "../root/ConfigurationContext";
import { TopToolbar } from "../layout/TopToolbar";
import { AccountManagerInput } from "../sales/AccountManagerInput";
-import { useCanFilterByAccountManager } from "../sales/useCanFilterByAccountManager";
import { DealArchivedList } from "./DealArchivedList";
import { DealCreate } from "./DealCreate";
import { DealEdit } from "./DealEdit";
@@ -27,7 +31,10 @@ const DealList = () => {
const { identity } = useGetIdentity();
const { dealCategories } = useConfigurationContext();
const translate = useTranslate();
- const { canFilter, isPending } = useCanFilterByAccountManager();
+ const { canAccess: canAccessSalesList, isPending } = useCanAccess({
+ resource: "sales",
+ action: "list",
+ });
if (!identity) return null;
@@ -52,7 +59,7 @@ const DealList = () => {
...(isPending
? []
: [
- canFilter ? (
+ canAccessSalesList ? (
<AccountManagerInput source="sales_id" alwaysOn />
) : (
<OnlyMineInput source="sales_id" alwaysOn />
diff --git a/src/components/atomic-crm/sales/AccountManagerInput.tsx b/src/components/atomic-crm/sales/AccountManagerInput.tsx
index 23b2125c..ce2e35ac 100644
--- a/src/components/atomic-crm/sales/AccountManagerInput.tsx
+++ b/src/components/atomic-crm/sales/AccountManagerInput.tsx
@@ -1,11 +1,18 @@
-import type { FormHTMLAttributes } from "react";
-import { FilterLiveForm, useTranslate } from "ra-core";
+import {
+ useCanAccess,
+ useGetIdentity,
+ useGetList,
+ useTranslate,
+} from "ra-core";
import { AutocompleteInput } from "@/components/admin/autocomplete-input";
import { ReferenceInput } from "@/components/admin/reference-input";
+import { ToggleFilterButton } from "@/components/admin/toggle-filter-button";
import { useIsMobile } from "@/hooks/use-mobile";
import type { Sale } from "../types";
+const MAX_DISPLAYED_SALES = 10;
+
const saleOptionRenderer = (choice: Sale) =>
`${choice.first_name} ${choice.last_name}`;
@@ -36,12 +43,40 @@ export const AccountManagerInput = ({
);
};
-const FullWidthForm = (props: FormHTMLAttributes<HTMLFormElement>) => (
- <form className="w-full" {...props} />
-);
+export const AccountManagerFilter = ({
+ className,
+ size,
+}: {
+ className?: string;
+ size?: "default" | "sm" | "lg" | "icon" | null;
+}) => {
+ const { identity } = useGetIdentity();
+ const { canAccess } = useCanAccess({ resource: "sales", action: "list" });
+ const { data: sales } = useGetList<Sale>(
+ "sales",
+ {
+ pagination: { page: 1, perPage: MAX_DISPLAYED_SALES },
+ sort: { field: "last_name", order: "ASC" },
+ filter: { "disabled@neq": true, "id@neq": identity?.id },
+ },
+ { enabled: canAccess === true && identity?.id != null },
+ );
+
+ if (!canAccess || !sales?.length) return null;
-export const AccountManagerFilter = () => (
- <FilterLiveForm formComponent={FullWidthForm}>
- <AccountManagerInput />
- </FilterLiveForm>
-);
+ return (
+ <>
+ {sales.map((sale) => (
+ <ToggleFilterButton
+ key={sale.id}
+ className={className}
+ label={
+ <span className="min-w-0 truncate">{saleOptionRenderer(sale)}</span>
+ }
+ size={size}
+ value={{ sales_id: sale.id }}
+ />
+ ))}
+ </>
+ );
+};
diff --git a/src/components/atomic-crm/sales/useCanFilterByAccountManager.ts b/src/components/atomic-crm/sales/useCanFilterByAccountManager.ts
deleted file mode 100644
index 98b085a2..00000000
--- a/src/components/atomic-crm/sales/useCanFilterByAccountManager.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { useCanAccess } from "ra-core";
-
-export const useCanFilterByAccountManager = () => {
- const { canAccess, isPending } = useCanAccess({
- resource: "sales",
- action: "list",
- });
- return { canFilter: canAccess === true, isPending };
-};