Skip to content

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

apply review

erwanMarmelabe776655ecd6d
diff --git a/src/components/admin/authentication.tsx b/src/components/admin/authentication.tsx
index b7ca0ab1..79aa51db 100644
--- a/src/components/admin/authentication.tsx
+++ b/src/components/admin/authentication.tsx
@@ -6,7 +6,7 @@ import {
} from "ra-core";
import { CircleAlert, LockIcon } from "lucide-react";
import { cn } from "@/lib/utils";
-import { Button } from "@/components/ui/button";
+import { buttonVariants } from "@/components/ui/button";
import { Loading } from "@/components/admin/loading";
/**
@@ -80,9 +80,9 @@ export const AuthError = (props: AuthErrorProps) => {
<Translate i18nKey={title} />
</h1>
<p className="my-5">{translate(message, { _: message })}</p>
- <Button render={<LinkBase to="/login" />} nativeButton={false}>
+ <LinkBase to="/login" className={buttonVariants()}>
<LockIcon /> {translate("ra.auth.sign_in", { _: "Sign in" })}
- </Button>
+ </LinkBase>
</div>
);
};
diff --git a/src/components/admin/autocomplete-array-input.tsx b/src/components/admin/autocomplete-array-input.tsx
index 02c815be..45f67707 100644
--- a/src/components/admin/autocomplete-array-input.tsx
+++ b/src/components/admin/autocomplete-array-input.tsx
@@ -168,6 +168,11 @@ export const AutocompleteArrayInput = (
setFilters(filterToQuery(""));
}
const value = getChoiceValue(choice);
+ // when onCreate returns nothing, ra-core hands back the create item itself:
+ // storing its sentinel value would add an unrenderable entry to the selection
+ if (value === (createValue ?? "@@ra-create")) {
+ return;
+ }
// a newly created choice may already be selected
if (field.value.includes(value)) {
return;
diff --git a/src/components/atomic-crm/companies/CompanyShow.tsx b/src/components/atomic-crm/companies/CompanyShow.tsx
index 158f072e..630bcf76 100644
--- a/src/components/atomic-crm/companies/CompanyShow.tsx
+++ b/src/components/atomic-crm/companies/CompanyShow.tsx
@@ -1,6 +1,6 @@
import { ReferenceManyField } from "@/components/admin/reference-many-field";
import { SortButton } from "@/components/admin/sort-button";
-import { Button } from "@/components/ui/button";
+import { buttonVariants } from "@/components/ui/button";
import { Card, CardContent } from "@/components/ui/card";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
import { UserPlus } from "lucide-react";
@@ -22,6 +22,7 @@ import {
} from "react-router-dom";
import { useIsMobile } from "@/hooks/use-mobile";
+import { cn } from "@/lib/utils";
import { ActivityLog } from "../activity/ActivityLog";
import { Avatar } from "../contacts/Avatar";
import { TagsList } from "../contacts/TagsList";
@@ -245,22 +246,17 @@ const CreateRelatedContactButton = () => {
const translate = useTranslate();
const company = useRecordContext<Company>();
return (
- <Button
- variant="outline"
- size="sm"
- className="h-9"
- render={
- <RouterLink
- to="/contacts/create"
- state={company ? { record: { company_id: company.id } } : undefined}
- className="flex items-center gap-2"
- />
- }
- nativeButton={false}
+ <RouterLink
+ to="/contacts/create"
+ state={company ? { record: { company_id: company.id } } : undefined}
+ className={cn(
+ buttonVariants({ variant: "outline", size: "sm" }),
+ "h-9 flex items-center gap-2",
+ )}
>
<UserPlus className="h-4 w-4" />
{translate("resources.contacts.action.add")}
- </Button>
+ </RouterLink>
);
};
diff --git a/src/components/atomic-crm/dashboard/HotContacts.tsx b/src/components/atomic-crm/dashboard/HotContacts.tsx
index 520c671c..c0c91d7e 100644
--- a/src/components/atomic-crm/dashboard/HotContacts.tsx
+++ b/src/components/atomic-crm/dashboard/HotContacts.tsx
@@ -1,7 +1,8 @@
import { Plus, Users } from "lucide-react";
import { useGetIdentity, useGetList, useTranslate } from "ra-core";
import { Link } from "react-router";
-import { Button } from "@/components/ui/button";
+import { buttonVariants } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
import { Card } from "@/components/ui/card";
import {
Tooltip,
@@ -44,12 +45,12 @@ export const HotContacts = () => {
<Tooltip>
<TooltipTrigger
render={
- <Button
- variant="ghost"
- size="sm"
- className="ml-auto text-muted-foreground"
- render={<Link to="/contacts/create" />}
- nativeButton={false}
+ <Link
+ to="/contacts/create"
+ className={cn(
+ buttonVariants({ variant: "ghost", size: "sm" }),
+ "ml-auto text-muted-foreground",
+ )}
/>
}
>
diff --git a/src/components/atomic-crm/deals/DealEdit.tsx b/src/components/atomic-crm/deals/DealEdit.tsx
index d22fb677..ad1d6a5f 100644
--- a/src/components/atomic-crm/deals/DealEdit.tsx
+++ b/src/components/atomic-crm/deals/DealEdit.tsx
@@ -10,7 +10,8 @@ import {
import { Link } from "react-router";
import { DeleteButton } from "@/components/admin/delete-button";
import { ReferenceField } from "@/components/admin/reference-field";
-import { Button } from "@/components/ui/button";
+import { buttonVariants } from "@/components/ui/button";
+import { cn } from "@/lib/utils";
import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
import { FormToolbar } from "../layout/FormToolbar";
@@ -75,14 +76,12 @@ function EditHeader() {
</div>
<div className="flex gap-2 pr-12">
<DeleteButton />
- <Button
- variant="outline"
- className="h-9"
- render={<Link to={`/deals/${deal.id}/show`} />}
- nativeButton={false}
+ <Link
+ to={`/deals/${deal.id}/show`}
+ className={cn(buttonVariants({ variant: "outline" }), "h-9")}
>
{translate("resources.deals.action.back_to_deal")}
- </Button>
+ </Link>
</div>
</div>
</DialogTitle>
diff --git a/src/components/atomic-crm/layout/MobileNavigation.tsx b/src/components/atomic-crm/layout/MobileNavigation.tsx
index 8ed75831..744857a2 100644
--- a/src/components/atomic-crm/layout/MobileNavigation.tsx
+++ b/src/components/atomic-crm/layout/MobileNavigation.tsx
@@ -1,4 +1,4 @@
-import { Button } from "@/components/ui/button";
+import { Button, buttonVariants } from "@/components/ui/button";
import {
DropdownMenu,
DropdownMenuContent,
@@ -93,18 +93,17 @@ const NavigationButton = ({
label: string;
isActive: boolean;
}) => (
- <Button
- variant="ghost"
+ <Link
+ to={href}
className={cn(
+ buttonVariants({ variant: "ghost" }),
"flex-col gap-1 h-auto py-2 px-1 rounded-md w-16",
isActive ? null : "text-muted-foreground",
)}
- render={<Link to={href} />}
- nativeButton={false}
>
<Icon className="size-6" />
<span className="text-[0.6rem] font-medium">{label}</span>
- </Button>
+ </Link>
);
const CreateButton = () => {
diff --git a/src/components/ui/pagination.tsx b/src/components/ui/pagination.tsx
index b577096c..7dda611d 100644
--- a/src/components/ui/pagination.tsx
+++ b/src/components/ui/pagination.tsx
@@ -1,7 +1,8 @@
import * as React from "react"
+import { type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils"
-import { Button } from "@/components/ui/button"
+import { buttonVariants } from "@/components/ui/button"
import {
ChevronLeftIcon,
ChevronRightIcon,
@@ -39,7 +40,7 @@ function PaginationItem({ ...props }: React.ComponentProps<"li">) {
type PaginationLinkProps = {
isActive?: boolean
-} & Pick<React.ComponentProps<typeof Button>, "size"> &
+} & Pick<VariantProps<typeof buttonVariants>, "size"> &
React.ComponentProps<"a">
function PaginationLink({
@@ -49,19 +50,15 @@ function PaginationLink({
...props
}: PaginationLinkProps) {
return (
- <Button
- variant={isActive ? "outline" : "ghost"}
- size={size}
- className={cn(className)}
- nativeButton={false}
- render={
- <a
- aria-current={isActive ? "page" : undefined}
- data-slot="pagination-link"
- data-active={isActive}
- {...props}
- />
- }
+ <a
+ aria-current={isActive ? "page" : undefined}
+ data-slot="pagination-link"
+ data-active={isActive}
+ className={cn(
+ buttonVariants({ variant: isActive ? "outline" : "ghost", size }),
+ className
+ )}
+ {...props}
/>
)
}