Skip to content

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

Drop the hidden name search from the mobile contact list

François Zaninotto7aa8ee1354ea
diff --git a/src/components/atomic-crm/contacts/ContactList.mobile.stories.tsx b/src/components/atomic-crm/contacts/ContactList.mobile.stories.tsx
index 08fa4b2b..7cfdd73d 100644
--- a/src/components/atomic-crm/contacts/ContactList.mobile.stories.tsx
+++ b/src/components/atomic-crm/contacts/ContactList.mobile.stories.tsx
@@ -50,6 +50,19 @@ export const MobileSuccess = () => (
</StoryWrapper>
);
+export const MobileWithNameSearch = () => (
+ <StoryWrapper
+ data={{ contacts: successContacts }}
+ initialEntries={[
+ `/?filter=${encodeURIComponent(JSON.stringify({ q: "Lovelace" }))}`,
+ ]}
+ >
+ <ResourceContextProvider value="contacts">
+ <ContactListMobile />
+ </ResourceContextProvider>
+ </StoryWrapper>
+);
+
export const MobileLoading = () => (
<StoryWrapper
dataProvider={{
diff --git a/src/components/atomic-crm/contacts/ContactList.test.tsx b/src/components/atomic-crm/contacts/ContactList.test.tsx
index f3a92536..8733b8bf 100644
--- a/src/components/atomic-crm/contacts/ContactList.test.tsx
+++ b/src/components/atomic-crm/contacts/ContactList.test.tsx
@@ -10,7 +10,10 @@ import {
BulkTagButton,
NonAdminAccountManagerFilter,
} from "./ContactList.stories";
-import { MobileSuccess } from "./ContactList.mobile.stories";
+import {
+ MobileSuccess,
+ MobileWithNameSearch,
+} from "./ContactList.mobile.stories";
afterEach(() => {
vi.restoreAllMocks();
@@ -222,6 +225,13 @@ describe("ContactList", () => {
.toBeVisible();
await expect.element(screen.getByRole("textbox")).not.toBeInTheDocument();
});
+
+ it("drops a name search it has no search box to show", async () => {
+ const screen = await render(<MobileWithNameSearch />);
+
+ await expect.element(screen.getByText("Ada Lovelace")).toBeVisible();
+ await expect.element(screen.getByText("Grace Hopper")).toBeVisible();
+ });
});
describe("account manager filter on mobile", () => {
diff --git a/src/components/atomic-crm/contacts/ContactList.tsx b/src/components/atomic-crm/contacts/ContactList.tsx
index b938e31b..aa2db3b2 100644
--- a/src/components/atomic-crm/contacts/ContactList.tsx
+++ b/src/components/atomic-crm/contacts/ContactList.tsx
@@ -1,4 +1,5 @@
import jsonExport from "jsonexport/dist";
+import { useEffect } from "react";
import {
downloadCSV,
InfiniteListBase,
@@ -116,7 +117,16 @@ export const ContactListMobile = () => {
const ContactListLayoutMobile = () => {
const translate = useTranslate();
- const { isPending, data, error, filterValues } = useListContext();
+ const { isPending, data, error, filterValues, displayedFilters, setFilters } =
+ useListContext();
+
+ // No search box here to show or clear a name search set on desktop or in a URL
+ const { q, ...filtersWithoutSearch } = filterValues ?? {};
+ useEffect(() => {
+ if (q != null) {
+ setFilters(filtersWithoutSearch, displayedFilters);
+ }
+ });
const hasFilters = filterValues && Object.keys(filterValues).length > 0;