A full-featured CRM built with React, shadcn/ui, and Supabase.
Fix code style with prettier.
Matthieu Hochlander01ddc114655f
diff --git a/components.json b/components.jsonindex 73afbdbc..13e1db0b 100644--- a/components.json+++ b/components.json@@ -18,4 +18,4 @@"hooks": "@/hooks"},"iconLibrary": "lucide"-}\ No newline at end of file+}diff --git a/eslint.config.js b/eslint.config.jsindex 4cca04ba..9fb10539 100644--- a/eslint.config.js+++ b/eslint.config.js@@ -36,5 +36,5 @@ export default tseslint.config("@typescript-eslint/no-explicit-any": "off",},},- storybook.configs["flat/recommended"]+ storybook.configs["flat/recommended"],);diff --git a/index.html b/index.htmlindex c7940e22..f47b37b9 100644--- a/index.html+++ b/index.html@@ -1,116 +1,116 @@<!doctype html><html lang="en">-<head>- <meta charset="utf-8"/>+ <head>+ <meta charset="utf-8" /><meta- name="viewport"- content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no"+ name="viewport"+ content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no"/>- <meta name="theme-color" content="#000000"/>- <link rel="manifest" href="./manifest.json"/>- <link rel="shortcut icon" href="./favicon.ico"/>+ <meta name="theme-color" content="#000000" />+ <link rel="manifest" href="./manifest.json" />+ <link rel="shortcut icon" href="./favicon.ico" /><title>Atomic CRM</title><style>- body {- margin: 0;- padding: 0;- font-family: sans-serif;- }+ body {+ margin: 0;+ padding: 0;+ font-family: sans-serif;+ }- .loader-container {- display: flex;- align-items: center;- justify-content: center;- flex-direction: column;- position: absolute;- top: 0;- bottom: 0;- left: 0;- right: 0;- background-color: #fafafa;- }+ .loader-container {+ display: flex;+ align-items: center;+ justify-content: center;+ flex-direction: column;+ position: absolute;+ top: 0;+ bottom: 0;+ left: 0;+ right: 0;+ background-color: #fafafa;+ }- /* CSS Spinner from https://projects.lukehaas.me/css-loaders/ */+ /* CSS Spinner from https://projects.lukehaas.me/css-loaders/ */- .loader,- .loader:before,- .loader:after {- border-radius: 50%;- }+ .loader,+ .loader:before,+ .loader:after {+ border-radius: 50%;+ }- .loader {- color: #283593;- font-size: 11px;- text-indent: -99999em;- margin: 55px auto;- position: relative;- width: 10em;- height: 10em;- box-shadow: inset 0 0 0 1em;- -webkit-transform: translateZ(0);- -ms-transform: translateZ(0);- transform: translateZ(0);- }+ .loader {+ color: #283593;+ font-size: 11px;+ text-indent: -99999em;+ margin: 55px auto;+ position: relative;+ width: 10em;+ height: 10em;+ box-shadow: inset 0 0 0 1em;+ -webkit-transform: translateZ(0);+ -ms-transform: translateZ(0);+ transform: translateZ(0);+ }- .loader:before,- .loader:after {- position: absolute;- content: "";- }+ .loader:before,+ .loader:after {+ position: absolute;+ content: "";+ }- .loader:before {- width: 5.2em;- height: 10.2em;- background: #fafafa;- border-radius: 10.2em 0 0 10.2em;- top: -0.1em;- left: -0.1em;- -webkit-transform-origin: 5.2em 5.1em;- transform-origin: 5.2em 5.1em;- -webkit-animation: load2 2s infinite ease 1.5s;- animation: load2 2s infinite ease 1.5s;- }+ .loader:before {+ width: 5.2em;+ height: 10.2em;+ background: #fafafa;+ border-radius: 10.2em 0 0 10.2em;+ top: -0.1em;+ left: -0.1em;+ -webkit-transform-origin: 5.2em 5.1em;+ transform-origin: 5.2em 5.1em;+ -webkit-animation: load2 2s infinite ease 1.5s;+ animation: load2 2s infinite ease 1.5s;+ }- .loader:after {- width: 5.2em;- height: 10.2em;- background: #fafafa;- border-radius: 0 10.2em 10.2em 0;- top: -0.1em;- left: 5.1em;- -webkit-transform-origin: 0px 5.1em;- transform-origin: 0px 5.1em;- -webkit-animation: load2 2s infinite ease;- animation: load2 2s infinite ease;- }+ .loader:after {+ width: 5.2em;+ height: 10.2em;+ background: #fafafa;+ border-radius: 0 10.2em 10.2em 0;+ top: -0.1em;+ left: 5.1em;+ -webkit-transform-origin: 0px 5.1em;+ transform-origin: 0px 5.1em;+ -webkit-animation: load2 2s infinite ease;+ animation: load2 2s infinite ease;+ }- @-webkit-keyframes load2 {- 0% {- -webkit-transform: rotate(0deg);- transform: rotate(0deg);- }- 100% {- -webkit-transform: rotate(360deg);- transform: rotate(360deg);- }+ @-webkit-keyframes load2 {+ 0% {+ -webkit-transform: rotate(0deg);+ transform: rotate(0deg);}+ 100% {+ -webkit-transform: rotate(360deg);+ transform: rotate(360deg);+ }+ }- @keyframes load2 {- 0% {- -webkit-transform: rotate(0deg);- transform: rotate(0deg);- }- 100% {- -webkit-transform: rotate(360deg);- transform: rotate(360deg);- }+ @keyframes load2 {+ 0% {+ -webkit-transform: rotate(0deg);+ transform: rotate(0deg);+ }+ 100% {+ -webkit-transform: rotate(360deg);+ transform: rotate(360deg);}+ }</style>-</head>-<body>-<div id="root"></div>-<noscript>You need to enable JavaScript to run this app.</noscript>-<script type="module" src="<%- mainScript %>"></script>-</body>+ </head>+ <body>+ <div id="root"></div>+ <noscript>You need to enable JavaScript to run this app.</noscript>+ <script type="module" src="<%- mainScript %>"></script>+ </body></html>diff --git a/src/atomic-crm/activity/ActivityLogContext.tsx b/src/atomic-crm/activity/ActivityLogContext.tsxindex e43f5561..366326cd 100644--- a/src/atomic-crm/activity/ActivityLogContext.tsx+++ b/src/atomic-crm/activity/ActivityLogContext.tsx@@ -1,11 +1,11 @@-import { createContext, useContext } from 'react';+import { createContext, useContext } from "react";-export type activityLogContextValue = 'company' | 'contact' | 'deal' | 'all';+export type activityLogContextValue = "company" | "contact" | "deal" | "all";-export const ActivityLogContext = createContext<activityLogContextValue>('all');+export const ActivityLogContext = createContext<activityLogContextValue>("all");export const useActivityLogContext = () => {- const context = useContext(ActivityLogContext);+ const context = useContext(ActivityLogContext);- return context;+ return context;};diff --git a/src/atomic-crm/activity/ActivityLogIterator.tsx b/src/atomic-crm/activity/ActivityLogIterator.tsxindex eb7c1878..fd733a64 100644--- a/src/atomic-crm/activity/ActivityLogIterator.tsx+++ b/src/atomic-crm/activity/ActivityLogIterator.tsx@@ -42,7 +42,7 @@ export function ActivityLogIterator({onClick={(e) => {e.preventDefault();setActivityDisplayed(- (activitiesDisplayed) => activitiesDisplayed + pageSize+ (activitiesDisplayed) => activitiesDisplayed + pageSize,);}}className="flex w-full justify-center text-sm underline hover:no-underline"diff --git a/src/atomic-crm/companies/sizes.ts b/src/atomic-crm/companies/sizes.tsindex e617f1c8..a4495de3 100644--- a/src/atomic-crm/companies/sizes.ts+++ b/src/atomic-crm/companies/sizes.ts@@ -1,7 +1,7 @@export const sizes = [- { id: 1, name: '1 employee' },- { id: 10, name: '2-9 employees' },- { id: 50, name: '10-49 employees' },- { id: 250, name: '50-249 employees' },- { id: 500, name: '250 or more employees' },+ { id: 1, name: "1 employee" },+ { id: 10, name: "2-9 employees" },+ { id: 50, name: "10-49 employees" },+ { id: 250, name: "50-249 employees" },+ { id: 500, name: "250 or more employees" },];diff --git a/src/atomic-crm/consts.ts b/src/atomic-crm/consts.tsindex 5e53dd94..69ffcb6b 100644--- a/src/atomic-crm/consts.ts+++ b/src/atomic-crm/consts.ts@@ -1,5 +1,5 @@-export const COMPANY_CREATED = 'company.created' as const;-export const CONTACT_CREATED = 'contact.created' as const;-export const CONTACT_NOTE_CREATED = 'contactNote.created' as const;-export const DEAL_CREATED = 'deal.created' as const;-export const DEAL_NOTE_CREATED = 'dealNote.created' as const;+export const COMPANY_CREATED = "company.created" as const;+export const CONTACT_CREATED = "contact.created" as const;+export const CONTACT_NOTE_CREATED = "contactNote.created" as const;+export const DEAL_CREATED = "deal.created" as const;+export const DEAL_NOTE_CREATED = "dealNote.created" as const;diff --git a/src/atomic-crm/contacts/ContactListContent.tsx b/src/atomic-crm/contacts/ContactListContent.tsxindex 74fb8411..01b7f56b 100644--- a/src/atomic-crm/contacts/ContactListContent.tsx+++ b/src/atomic-crm/contacts/ContactListContent.tsx@@ -24,7 +24,7 @@ export const ContactListContent = () => {// StopPropagation does not work for some reason on Checkbox, this handler is a workaroundconst handleLinkClick = useCallback(function handleLinkClick(- e: MouseEvent<HTMLAnchorElement>+ e: MouseEvent<HTMLAnchorElement>,) {if (e.target instanceof HTMLButtonElement) {e.preventDefault();diff --git a/src/atomic-crm/contacts/TagsListEdit.tsx b/src/atomic-crm/contacts/TagsListEdit.tsxindex d1c37770..5ab75055 100644--- a/src/atomic-crm/contacts/TagsListEdit.tsx+++ b/src/atomic-crm/contacts/TagsListEdit.tsx@@ -30,12 +30,12 @@ export const TagsListEdit = () => {{pagination: { page: 1, perPage: 10 },sort: { field: "name", order: "ASC" },- }+ },);const { data: tags, isPending: isPendingRecordTags } = useGetMany<Tag>("tags",{ ids: record?.tags },- { enabled: record && record.tags && record.tags.length > 0 }+ { enabled: record && record.tags && record.tags.length > 0 },);const [update] = useUpdate<Contact>();@@ -91,10 +91,10 @@ export const TagsListEdit = () => {onSuccess: () => {setOpen(false);},- }+ },);},- [update, record]+ [update, record],);if (isPendingRecordTags || isPendingAllTags) return null;diff --git a/src/atomic-crm/contacts/useContactImport.tsx b/src/atomic-crm/contacts/useContactImport.tsxindex fee35a0a..679fa860 100644--- a/src/atomic-crm/contacts/useContactImport.tsx+++ b/src/atomic-crm/contacts/useContactImport.tsx@@ -35,7 +35,7 @@ export function useContactImport() {const companiesCache = useMemo(() => new Map<string, Company>(),// eslint-disable-next-line react-hooks/exhaustive-deps- [dataProvider]+ [dataProvider],);const getCompanies = useCallback(async (names: string[]) =>@@ -48,9 +48,9 @@ export function useContactImport() {created_at: new Date().toISOString(),sales_id: user?.identity?.id,}),- dataProvider+ dataProvider,),- [companiesCache, user?.identity?.id, dataProvider]+ [companiesCache, user?.identity?.id, dataProvider],);// Tags cache to avoid creating the same tag multiple times and costly roundtrips@@ -67,16 +67,18 @@ export function useContactImport() {name,color: "#f9f9f9",}),- dataProvider+ dataProvider,),- [tagsCache, dataProvider]+ [tagsCache, dataProvider],);const processBatch = useCallback(async (batch: ContactImportSchema[]) => {const [companies, tags] = await Promise.all([getCompanies(- batch.map((contact) => contact.company?.trim()).filter((name) => name)+ batch+ .map((contact) => contact.company?.trim())+ .filter((name) => name),),getTags(batch.flatMap((batch) => parseTags(batch.tags))),]);@@ -143,11 +145,11 @@ export function useContactImport() {linkedin_url,},});- }- )+ },+ ),);},- [dataProvider, getCompanies, getTags, user?.identity?.id, today]+ [dataProvider, getCompanies, getTags, user?.identity?.id, today],);return processBatch;@@ -158,7 +160,7 @@ const fetchRecordsWithCache = async function <T>(cache: Map<string, T>,names: string[],getCreateData: (name: string) => Partial<T>,- dataProvider: DataProvider+ dataProvider: DataProvider,) {const trimmedNames = [...new Set(names.map((name) => name.trim()))];const uncachedRecordNames = trimmedNames.filter((name) => !cache.has(name));@@ -187,7 +189,7 @@ const fetchRecordsWithCache = async function <T>(data: getCreateData(name),});cache.set(name, response.data);- })+ }),);// now all records are in cache, return a map of all recordsdiff --git a/src/atomic-crm/dashboard/Dashboard.tsx b/src/atomic-crm/dashboard/Dashboard.tsxindex 1547814d..03a168f6 100644--- a/src/atomic-crm/dashboard/Dashboard.tsx+++ b/src/atomic-crm/dashboard/Dashboard.tsx@@ -25,7 +25,7 @@ export const Dashboard = () => {"deals",{pagination: { page: 1, perPage: 1 },- }+ },);const isPending = isPendingContact || isPendingContactNotes || isPendingDeal;diff --git a/src/atomic-crm/dashboard/DealsChart.tsx b/src/atomic-crm/dashboard/DealsChart.tsxindex f44e83af..bb33da1f 100644--- a/src/atomic-crm/dashboard/DealsChart.tsx+++ b/src/atomic-crm/dashboard/DealsChart.tsx@@ -14,7 +14,7 @@ const multiplier = {};const threeMonthsAgo = new Date(- new Date().setMonth(new Date().getMonth() - 6)+ new Date().setMonth(new Date().getMonth() - 6),).toISOString();const DEFAULT_LOCALE = "en-US";@@ -81,7 +81,7 @@ export const DealsChart = memo(() => {acc.max = Math.max(acc.max, month.won + month.pending);return acc;},- { min: 0, max: 0 }+ { min: 0, max: 0 },);return (<div className="flex flex-col">diff --git a/src/atomic-crm/dashboard/LatestNotes.tsx b/src/atomic-crm/dashboard/LatestNotes.tsxindex 11836fd6..da921af6 100644--- a/src/atomic-crm/dashboard/LatestNotes.tsx+++ b/src/atomic-crm/dashboard/LatestNotes.tsx@@ -15,7 +15,7 @@ export const LatestNotes = () => {sort: { field: "date", order: "DESC" },filter: { sales_id: identity?.id },},- { enabled: Number.isInteger(identity?.id) }+ { enabled: Number.isInteger(identity?.id) },);const { data: dealNotesData, isPending: dealNotesLoading } = useGetList("dealNotes",@@ -24,7 +24,7 @@ export const LatestNotes = () => {sort: { field: "date", order: "DESC" },filter: { sales_id: identity?.id },},- { enabled: Number.isInteger(identity?.id) }+ { enabled: Number.isInteger(identity?.id) },);if (contactNotesLoading || dealNotesLoading) {return null;@@ -40,7 +40,7 @@ export const LatestNotes = () => {...note,type: "contactNote",})),- dealNotesData.map((note) => ({ ...note, type: "dealNote" }))+ dealNotesData.map((note) => ({ ...note, type: "dealNote" })),).sort((a, b) => new Date(b.date).valueOf() - new Date(a.date).valueOf()).slice(0, 5);diff --git a/src/atomic-crm/dashboard/TasksListEmpty.tsx b/src/atomic-crm/dashboard/TasksListEmpty.tsxindex ccd41fa8..7b555b34 100644--- a/src/atomic-crm/dashboard/TasksListEmpty.tsx+++ b/src/atomic-crm/dashboard/TasksListEmpty.tsx@@ -11,7 +11,7 @@ export const TasksListEmpty = () => {sales_id: identity?.id,},},- { enabled: !!identity }+ { enabled: !!identity },);if (total) return null;diff --git a/src/atomic-crm/dashboard/TasksListFilter.tsx b/src/atomic-crm/dashboard/TasksListFilter.tsxindex aee1a953..3098f526 100644--- a/src/atomic-crm/dashboard/TasksListFilter.tsx+++ b/src/atomic-crm/dashboard/TasksListFilter.tsx@@ -31,7 +31,7 @@ export const TasksListFilter = ({sales_id: identity?.id,},},- { enabled: !!identity }+ { enabled: !!identity },);const listContext = useList({diff --git a/src/atomic-crm/deals/DealArchivedList.tsx b/src/atomic-crm/deals/DealArchivedList.tsxindex 3aa7b5bd..5433f862 100644--- a/src/atomic-crm/deals/DealArchivedList.tsx+++ b/src/atomic-crm/deals/DealArchivedList.tsx@@ -41,7 +41,7 @@ export const DealArchivedList = () => {acc[date].push(deal);return acc;},- {} as { [date: string]: Deal[] }+ {} as { [date: string]: Deal[] },);return (diff --git a/src/atomic-crm/deals/DealEmpty.tsx b/src/atomic-crm/deals/DealEmpty.tsxindex d9427437..78aa14ad 100644--- a/src/atomic-crm/deals/DealEmpty.tsx+++ b/src/atomic-crm/deals/DealEmpty.tsx@@ -17,7 +17,7 @@ export const DealEmpty = ({ children }: { children?: React.ReactNode }) => {"contacts",{pagination: { page: 1, perPage: 1 },- }+ },);if (contactsLoading) return <Progress value={50} />;diff --git a/src/atomic-crm/deals/DealListContent.tsx b/src/atomic-crm/deals/DealListContent.tsxindex 91014c1c..cd16a415 100644--- a/src/atomic-crm/deals/DealListContent.tsx+++ b/src/atomic-crm/deals/DealListContent.tsx@@ -14,7 +14,7 @@ export const DealListContent = () => {const dataProvider = useDataProvider();const [dealsByStage, setDealsByStage] = useState<DealsByStage>(- getDealsByStage([], dealStages)+ getDealsByStage([], dealStages),);useEffect(() => {@@ -59,8 +59,8 @@ export const DealListContent = () => {sourceDeal,{ stage: sourceStage, index: source.index },{ stage: destinationStage, index: destination.index },- dealsByStage- )+ dealsByStage,+ ),);// persist the changes@@ -91,7 +91,7 @@ const updateDealStageLocal = (stage: string;index?: number; // undefined if dropped after the last item},- dealsByStage: DealsByStage+ dealsByStage: DealsByStage,) => {if (source.stage === destination.stage) {// moving deal inside the same column@@ -110,7 +110,7 @@ const updateDealStageLocal = (destinationColumn.splice(destination.index ?? destinationColumn.length + 1,0,- sourceDeal+ sourceDeal,);return {...dealsByStage,@@ -126,7 +126,7 @@ const updateDealStage = async (stage: string;index?: number; // undefined if dropped after the last item},- dataProvider: DataProvider+ dataProvider: DataProvider,) => {if (source.stage === destination.stage) {// moving deal inside the same column@@ -148,14 +148,14 @@ const updateDealStage = async (...columnDeals.filter((deal) =>- deal.index >= destinationIndex && deal.index < source.index+ deal.index >= destinationIndex && deal.index < source.index,).map((deal) =>dataProvider.update("deals", {id: deal.id,data: { index: deal.index + 1 },previousData: deal,- })+ }),),// for the deal that was moved, update its indexdataProvider.update("deals", {@@ -174,14 +174,14 @@ const updateDealStage = async (...columnDeals.filter((deal) =>- deal.index <= destinationIndex && deal.index > source.index+ deal.index <= destinationIndex && deal.index > source.index,).map((deal) =>dataProvider.update("deals", {id: deal.id,data: { index: deal.index - 1 },previousData: deal,- })+ }),),// for the deal that was moved, update its indexdataProvider.update("deals", {@@ -218,7 +218,7 @@ const updateDealStage = async (id: deal.id,data: { index: deal.index - 1 },previousData: deal,- })+ }),),// increase index on the deals after the destination index in the destination columns...destinationDeals@@ -228,7 +228,7 @@ const updateDealStage = async (id: deal.id,data: { index: deal.index + 1 },previousData: deal,- })+ }),),// change the dragged deal to take the destination index and columndataProvider.update("deals", {diff --git a/src/atomic-crm/deals/deal.ts b/src/atomic-crm/deals/deal.tsindex 85bfebf8..64d69814 100644--- a/src/atomic-crm/deals/deal.ts+++ b/src/atomic-crm/deals/deal.ts@@ -1,5 +1,5 @@-import { DealStage } from '../types';+import { DealStage } from "../types";export const findDealLabel = (dealStages: DealStage[], dealValue: string) => {- return dealStages.find(dealStage => dealStage.value === dealValue)?.label;+ return dealStages.find((dealStage) => dealStage.value === dealValue)?.label;};diff --git a/src/atomic-crm/deals/stages.ts b/src/atomic-crm/deals/stages.tsindex ebc06f91..7ab7c5da 100644--- a/src/atomic-crm/deals/stages.ts+++ b/src/atomic-crm/deals/stages.ts@@ -1,28 +1,28 @@-import { ConfigurationContextValue } from '../root/ConfigurationContext';-import { Deal } from '../types';+import { ConfigurationContextValue } from "../root/ConfigurationContext";+import { Deal } from "../types";-export type DealsByStage = Record<Deal['stage'], Deal[]>;+export type DealsByStage = Record<Deal["stage"], Deal[]>;export const getDealsByStage = (- unorderedDeals: Deal[],- dealStages: ConfigurationContextValue['dealStages']+ unorderedDeals: Deal[],+ dealStages: ConfigurationContextValue["dealStages"],) => {- if (!dealStages) return {};- const dealsByStage: Record<Deal['stage'], Deal[]> = unorderedDeals.reduce(- (acc, deal) => {- acc[deal.stage].push(deal);- return acc;- },- dealStages.reduce(- (obj, stage) => ({ ...obj, [stage.value]: [] }),- {} as Record<Deal['stage'], Deal[]>- )+ if (!dealStages) return {};+ const dealsByStage: Record<Deal["stage"], Deal[]> = unorderedDeals.reduce(+ (acc, deal) => {+ acc[deal.stage].push(deal);+ return acc;+ },+ dealStages.reduce(+ (obj, stage) => ({ ...obj, [stage.value]: [] }),+ {} as Record<Deal["stage"], Deal[]>,+ ),+ );+ // order each column by index+ dealStages.forEach((stage) => {+ dealsByStage[stage.value] = dealsByStage[stage.value].sort(+ (recordA: Deal, recordB: Deal) => recordA.index - recordB.index,);- // order each column by index- dealStages.forEach(stage => {- dealsByStage[stage.value] = dealsByStage[stage.value].sort(- (recordA: Deal, recordB: Deal) => recordA.index - recordB.index- );- });- return dealsByStage;+ });+ return dealsByStage;};diff --git a/src/atomic-crm/misc/ImageEditorField.tsx b/src/atomic-crm/misc/ImageEditorField.tsxindex c43c5a45..e93b6d47 100644--- a/src/atomic-crm/misc/ImageEditorField.tsx+++ b/src/atomic-crm/misc/ImageEditorField.tsx@@ -86,7 +86,7 @@ const ImageEditorDialog = (props: ImageEditorDialogProps) => {const initialValue = useFieldValue({ source: props.source });const [file, setFile] = useState<File | undefined>();const [imageSrc, setImageSrc] = useState<string | undefined>(- initialValue?.src+ initialValue?.src,);const onDrop = useCallback((files: File[]) => {const preview = URL.createObjectURL(files[0]);@@ -108,7 +108,7 @@ const ImageEditorDialog = (props: ImageEditorDialogProps) => {title: newFile.name,rawFile: newFile,},- { shouldDirty: true }+ { shouldDirty: true },);props.onClose();diff --git a/src/atomic-crm/misc/RelativeDate.tsx b/src/atomic-crm/misc/RelativeDate.tsxindex db4f537c..7ef5452e 100644--- a/src/atomic-crm/misc/RelativeDate.tsx+++ b/src/atomic-crm/misc/RelativeDate.tsx@@ -1,5 +1,5 @@-import { formatRelative } from 'date-fns';+import { formatRelative } from "date-fns";export function RelativeDate({ date }: { date: string }) {- return formatRelative(new Date(date), new Date());+ return formatRelative(new Date(date), new Date());}diff --git a/src/atomic-crm/misc/fetchWithTimeout.ts b/src/atomic-crm/misc/fetchWithTimeout.tsindex 79e6bea1..ee80ffff 100644--- a/src/atomic-crm/misc/fetchWithTimeout.ts+++ b/src/atomic-crm/misc/fetchWithTimeout.ts@@ -1,19 +1,19 @@type FetchParams = Parameters<typeof fetch>;export async function fetchWithTimeout(- resource: string,- options: FetchParams[1] & { timeout?: number } = {}+ resource: string,+ options: FetchParams[1] & { timeout?: number } = {},) {- const { timeout = 2000 } = options;+ const { timeout = 2000 } = options;- const controller = new AbortController();- const id = setTimeout(() => controller.abort(), timeout);+ const controller = new AbortController();+ const id = setTimeout(() => controller.abort(), timeout);- const response = await fetch(resource, {- ...options,- signal: controller.signal,- });- clearTimeout(id);+ const response = await fetch(resource, {+ ...options,+ signal: controller.signal,+ });+ clearTimeout(id);- return response;+ return response;}diff --git a/src/atomic-crm/misc/unsupportedDomains.const.ts b/src/atomic-crm/misc/unsupportedDomains.const.tsindex 3bf3eb3c..f3ef44c6 100644--- a/src/atomic-crm/misc/unsupportedDomains.const.ts+++ b/src/atomic-crm/misc/unsupportedDomains.const.ts@@ -1,105 +1,105 @@// If you want to add more domains to the list, you can do so by adding them to the DOMAINS_NOT_SUPPORTING_FAVICON array.export const DOMAINS_NOT_SUPPORTING_FAVICON = [- 'gmail.com',- 'yahoo.com',- 'hotmail.com',- 'aol.com',- 'hotmail.co.uk',- 'hotmail.fr',- 'msn.com',- 'yahoo.fr',- 'wanadoo.fr',- 'orange.fr',- 'comcast.net',- 'yahoo.co.uk',- 'yahoo.com.br',- 'yahoo.co.in',- 'live.com',- 'rediffmail.com',- 'free.fr',- 'gmx.de',- 'web.de',- 'yandex.ru',- 'ymail.com',- 'libero.it',- 'outlook.com',- 'uol.com.br',- 'bol.com.br',- 'mail.ru',- 'cox.net',- 'hotmail.it',- 'sbcglobal.net',- 'sfr.fr',- 'live.fr',- 'verizon.net',- 'live.co.uk',- 'googlemail.com',- 'yahoo.es',- 'ig.com.br',- 'live.nl',- 'bigpond.com',- 'terra.com.br',- 'yahoo.it',- 'neuf.fr',- 'yahoo.de',- 'alice.it',- 'rocketmail.com',- 'att.net',- 'laposte.net',- 'facebook.com',- 'bellsouth.net',- 'yahoo.in',- 'hotmail.es',- 'charter.net',- 'yahoo.ca',- 'yahoo.com.au',- 'rambler.ru',- 'hotmail.de',- 'tiscali.it',- 'shaw.ca',- 'yahoo.co.jp',- 'sky.com',- 'earthlink.net',- 'optonline.net',- 'freenet.de',- 't-online.de',- 'aliceadsl.fr',- 'virgilio.it',- 'home.nl',- 'qq.com',- 'telenet.be',- 'me.com',- 'yahoo.com.ar',- 'tiscali.co.uk',- 'yahoo.com.mx',- 'voila.fr',- 'gmx.net',- 'mail.com',- 'planet.nl',- 'tin.it',- 'live.it',- 'ntlworld.com',- 'arcor.de',- 'yahoo.co.id',- 'frontiernet.net',- 'hetnet.nl',- 'live.com.au',- 'yahoo.com.sg',- 'zonnet.nl',- 'club-internet.fr',- 'juno.com',- 'optusnet.com.au',- 'blueyonder.co.uk',- 'bluewin.ch',- 'skynet.be',- 'sympatico.ca',- 'windstream.net',- 'mac.com',- 'centurytel.net',- 'chello.nl',- 'live.ca',- 'aim.com',- 'bigpond.net.au',- 'online.de',- 'apple.com',+ "gmail.com",+ "yahoo.com",+ "hotmail.com",+ "aol.com",+ "hotmail.co.uk",+ "hotmail.fr",+ "msn.com",+ "yahoo.fr",+ "wanadoo.fr",+ "orange.fr",+ "comcast.net",+ "yahoo.co.uk",+ "yahoo.com.br",+ "yahoo.co.in",+ "live.com",+ "rediffmail.com",+ "free.fr",+ "gmx.de",+ "web.de",+ "yandex.ru",+ "ymail.com",+ "libero.it",+ "outlook.com",+ "uol.com.br",+ "bol.com.br",+ "mail.ru",+ "cox.net",+ "hotmail.it",+ "sbcglobal.net",+ "sfr.fr",+ "live.fr",+ "verizon.net",+ "live.co.uk",+ "googlemail.com",+ "yahoo.es",+ "ig.com.br",+ "live.nl",+ "bigpond.com",+ "terra.com.br",+ "yahoo.it",+ "neuf.fr",+ "yahoo.de",+ "alice.it",+ "rocketmail.com",+ "att.net",+ "laposte.net",+ "facebook.com",+ "bellsouth.net",+ "yahoo.in",+ "hotmail.es",+ "charter.net",+ "yahoo.ca",+ "yahoo.com.au",+ "rambler.ru",+ "hotmail.de",+ "tiscali.it",+ "shaw.ca",+ "yahoo.co.jp",+ "sky.com",+ "earthlink.net",+ "optonline.net",+ "freenet.de",+ "t-online.de",+ "aliceadsl.fr",+ "virgilio.it",+ "home.nl",+ "qq.com",+ "telenet.be",+ "me.com",+ "yahoo.com.ar",+ "tiscali.co.uk",+ "yahoo.com.mx",+ "voila.fr",+ "gmx.net",+ "mail.com",+ "planet.nl",+ "tin.it",+ "live.it",+ "ntlworld.com",+ "arcor.de",+ "yahoo.co.id",+ "frontiernet.net",+ "hetnet.nl",+ "live.com.au",+ "yahoo.com.sg",+ "zonnet.nl",+ "club-internet.fr",+ "juno.com",+ "optusnet.com.au",+ "blueyonder.co.uk",+ "bluewin.ch",+ "skynet.be",+ "sympatico.ca",+ "windstream.net",+ "mac.com",+ "centurytel.net",+ "chello.nl",+ "live.ca",+ "aim.com",+ "bigpond.net.au",+ "online.de",+ "apple.com",];diff --git a/src/atomic-crm/misc/usePapaParse.tsx b/src/atomic-crm/misc/usePapaParse.tsxindex 6f5ee6d7..c8bc8c26 100644--- a/src/atomic-crm/misc/usePapaParse.tsx+++ b/src/atomic-crm/misc/usePapaParse.tsx@@ -1,148 +1,144 @@-import * as Papa from 'papaparse';-import { useCallback, useMemo, useRef, useState } from 'react';+import * as Papa from "papaparse";+import { useCallback, useMemo, useRef, useState } from "react";type Import =- | {- state: 'idle';- }- | {- state: 'parsing';- }- | {- state: 'running' | 'complete';-- rowCount: number;- importCount: number;- errorCount: number;-- // The remaining time in milliseconds- remainingTime: number | null;- }- | {- state: 'error';-- error: Error;- };+ | {+ state: "idle";+ }+ | {+ state: "parsing";+ }+ | {+ state: "running" | "complete";++ rowCount: number;+ importCount: number;+ errorCount: number;++ // The remaining time in milliseconds+ remainingTime: number | null;+ }+ | {+ state: "error";++ error: Error;+ };type usePapaParseProps<T> = {- // The import batch size- batchSize?: number;+ // The import batch size+ batchSize?: number;- // processBatch returns the number of imported items- processBatch(batch: T[]): Promise<void>;+ // processBatch returns the number of imported items+ processBatch(batch: T[]): Promise<void>;};export function usePapaParse<T>({- batchSize = 10,- processBatch,+ batchSize = 10,+ processBatch,}: usePapaParseProps<T>) {- const importIdRef = useRef<number>(0);+ const importIdRef = useRef<number>(0);- const [importer, setImporter] = useState<Import>({- state: 'idle',- });-- const reset = useCallback(() => {- setImporter({- state: 'idle',- });- importIdRef.current += 1;- }, []);-- const parseCsv = useCallback(- (file: File) => {- setImporter({- state: 'parsing',- });-- const importId = importIdRef.current;- Papa.parse<T>(file, {- header: true,- skipEmptyLines: true,- async complete(results) {- if (importIdRef.current !== importId) {- return;- }+ const [importer, setImporter] = useState<Import>({+ state: "idle",+ });- setImporter({- state: 'running',- rowCount: results.data.length,- errorCount: results.errors.length,- importCount: 0,- remainingTime: null,- });-- let totalTime = 0;- for (let i = 0; i < results.data.length; i += batchSize) {- if (importIdRef.current !== importId) {- return;- }-- const batch = results.data.slice(i, i + batchSize);- try {- const start = Date.now();- await processBatch(batch);- totalTime += Date.now() - start;-- const meanTime = totalTime / (i + batch.length);- setImporter(previous => {- if (previous.state === 'running') {- const importCount =- previous.importCount + batch.length;- return {- ...previous,- importCount,- remainingTime:- meanTime *- (results.data.length - importCount),- };- }- return previous;- });- } catch (error) {- console.error('Failed to import batch', error);- setImporter(previous =>- previous.state === 'running'- ? {- ...previous,- errorCount:- previous.errorCount +- batch.length,- }- : previous- );- }+ const reset = useCallback(() => {+ setImporter({+ state: "idle",+ });+ importIdRef.current += 1;+ }, []);++ const parseCsv = useCallback(+ (file: File) => {+ setImporter({+ state: "parsing",+ });++ const importId = importIdRef.current;+ Papa.parse<T>(file, {+ header: true,+ skipEmptyLines: true,+ async complete(results) {+ if (importIdRef.current !== importId) {+ return;+ }++ setImporter({+ state: "running",+ rowCount: results.data.length,+ errorCount: results.errors.length,+ importCount: 0,+ remainingTime: null,+ });++ let totalTime = 0;+ for (let i = 0; i < results.data.length; i += batchSize) {+ if (importIdRef.current !== importId) {+ return;+ }++ const batch = results.data.slice(i, i + batchSize);+ try {+ const start = Date.now();+ await processBatch(batch);+ totalTime += Date.now() - start;++ const meanTime = totalTime / (i + batch.length);+ setImporter((previous) => {+ if (previous.state === "running") {+ const importCount = previous.importCount + batch.length;+ return {+ ...previous,+ importCount,+ remainingTime:+ meanTime * (results.data.length - importCount),+ };+ }+ return previous;+ });+ } catch (error) {+ console.error("Failed to import batch", error);+ setImporter((previous) =>+ previous.state === "running"+ ? {+ ...previous,+ errorCount: previous.errorCount + batch.length,}-- setImporter(previous =>- previous.state === 'running'- ? {- ...previous,- state: 'complete',- remainingTime: null,- }- : previous- );- },- error(error) {- console.error(error);- setImporter({- state: 'error',- error,- });- },- dynamicTyping: true,- });+ : previous,+ );+ }+ }++ setImporter((previous) =>+ previous.state === "running"+ ? {+ ...previous,+ state: "complete",+ remainingTime: null,+ }+ : previous,+ );+ },+ error(error) {+ console.error(error);+ setImporter({+ state: "error",+ error,+ });},- [batchSize, processBatch]- );-- return useMemo(- () => ({- importer,- parseCsv,- reset,- }),- [importer, parseCsv, reset]- );+ dynamicTyping: true,+ });+ },+ [batchSize, processBatch],+ );++ return useMemo(+ () => ({+ importer,+ parseCsv,+ reset,+ }),+ [importer, parseCsv, reset],+ );}diff --git a/src/atomic-crm/notes/Note.tsx b/src/atomic-crm/notes/Note.tsxindex 1832a624..6865a7f2 100644--- a/src/atomic-crm/notes/Note.tsx+++ b/src/atomic-crm/notes/Note.tsx@@ -50,7 +50,7 @@ export const Note = ({onSuccess: () => {notify("Note deleted", { type: "info", undoable: true });},- }+ },);const handleDelete = () => {@@ -75,7 +75,7 @@ export const Note = ({setEditing(false);setHover(false);},- }+ },);};diff --git a/src/atomic-crm/notes/NoteAttachments.tsx b/src/atomic-crm/notes/NoteAttachments.tsxindex 67c0ac6f..6e321179 100644--- a/src/atomic-crm/notes/NoteAttachments.tsx+++ b/src/atomic-crm/notes/NoteAttachments.tsx@@ -7,10 +7,10 @@ export const NoteAttachments = ({ note }: { note: ContactNote | DealNote }) => {}const imageAttachments = note.attachments.filter(- (attachment: AttachmentNote) => isImageMimeType(attachment.type)+ (attachment: AttachmentNote) => isImageMimeType(attachment.type),);const otherAttachments = note.attachments.filter(- (attachment: AttachmentNote) => !isImageMimeType(attachment.type)+ (attachment: AttachmentNote) => !isImageMimeType(attachment.type),);return (diff --git a/src/atomic-crm/notes/index.ts b/src/atomic-crm/notes/index.tsindex 68c82812..8746e3db 100644--- a/src/atomic-crm/notes/index.ts+++ b/src/atomic-crm/notes/index.ts@@ -1,3 +1,3 @@-export * from './NoteCreate';-export * from './NotesIterator';-export * from './StatusSelector';+export * from "./NoteCreate";+export * from "./NotesIterator";+export * from "./StatusSelector";diff --git a/src/atomic-crm/notes/utils.ts b/src/atomic-crm/notes/utils.tsindex 834d3eb3..39116e41 100644--- a/src/atomic-crm/notes/utils.ts+++ b/src/atomic-crm/notes/utils.ts@@ -1,13 +1,13 @@export const getCurrentDate = () => {- const now = new Date();- now.setSeconds(0);- now.setMilliseconds(0);- return now.toISOString();+ const now = new Date();+ now.setSeconds(0);+ now.setMilliseconds(0);+ return now.toISOString();};export const formatNoteDate = (dateString: string) => {- const date = new Date(dateString);- date.setSeconds(0);- date.setMilliseconds(0);- return date.toISOString();+ const date = new Date(dateString);+ date.setSeconds(0);+ date.setMilliseconds(0);+ return date.toISOString();};diff --git a/src/atomic-crm/providers/commons/activity.ts b/src/atomic-crm/providers/commons/activity.tsindex 8ef6a7d6..8626d1e7 100644--- a/src/atomic-crm/providers/commons/activity.ts+++ b/src/atomic-crm/providers/commons/activity.ts@@ -20,7 +20,7 @@ import {export async function getActivityLog(dataProvider: DataProvider,companyId?: Identifier,- salesId?: Identifier+ salesId?: Identifier,) {const companyFilter = {} as any;if (companyId) {@@ -46,7 +46,7 @@ export async function getActivityLog([...newCompanies, ...newContactsAndNotes, ...newDealsAndNotes]// sort by date desc.sort((a, b) =>- a.date && b.date ? a.date.localeCompare(b.date) * -1 : 0+ a.date && b.date ? a.date.localeCompare(b.date) * -1 : 0,)// limit to 250 activities.slice(0, 250)@@ -55,7 +55,7 @@ export async function getActivityLog(const getNewCompanies = async (dataProvider: DataProvider,- filter: any+ filter: any,): Promise<Activity[]> => {const { data: companies } = await dataProvider.getList<Company>("companies", {filter,@@ -74,7 +74,7 @@ const getNewCompanies = async (async function getNewContactsAndNotes(dataProvider: DataProvider,- filter: any+ filter: any,): Promise<Activity[]> {const { data: contacts } = await dataProvider.getList<Contact>("contacts", {filter,@@ -99,7 +99,7 @@ async function getNewContactsAndNotes(filter: recentContactNotesFilter,pagination: { page: 1, perPage: 250 },sort: { field: "date", order: "DESC" },- }+ },);const newContacts = contacts.map((contact) => ({@@ -124,7 +124,7 @@ async function getNewContactsAndNotes(async function getNewDealsAndNotes(dataProvider: DataProvider,- filter: any+ filter: any,): Promise<Activity[]> {const { data: deals } = await dataProvider.getList<Deal>("deals", {filter,@@ -149,7 +149,7 @@ async function getNewDealsAndNotes(filter: recentDealNotesFilter,pagination: { page: 1, perPage: 250 },sort: { field: "date", order: "DESC" },- }+ },);const newDeals = deals.map((deal) => ({diff --git a/src/atomic-crm/providers/commons/canAccess.ts b/src/atomic-crm/providers/commons/canAccess.tsindex 70685843..152e1fe2 100644--- a/src/atomic-crm/providers/commons/canAccess.ts+++ b/src/atomic-crm/providers/commons/canAccess.ts@@ -1,26 +1,26 @@// FIXME: This should be exported from the ra-core packagetype CanAccessParams<- RecordType extends Record<string, any> = Record<string, any>,+ RecordType extends Record<string, any> = Record<string, any>,> = {- action: string;- resource: string;- record?: RecordType;+ action: string;+ resource: string;+ record?: RecordType;};export const canAccess = <- RecordType extends Record<string, any> = Record<string, any>,+ RecordType extends Record<string, any> = Record<string, any>,>(- role: string,- params: CanAccessParams<RecordType>+ role: string,+ params: CanAccessParams<RecordType>,) => {- if (role === 'admin') {- return true;- }+ if (role === "admin") {+ return true;+ }- // Non admins can't access the sales resource- if (params.resource === 'sales') {- return false;- }+ // Non admins can't access the sales resource+ if (params.resource === "sales") {+ return false;+ }- return true;+ return true;};diff --git a/src/atomic-crm/providers/commons/getContactAvatar.spec.ts b/src/atomic-crm/providers/commons/getContactAvatar.spec.tsindex 5a6e7851..5f9a4584 100644--- a/src/atomic-crm/providers/commons/getContactAvatar.spec.ts+++ b/src/atomic-crm/providers/commons/getContactAvatar.spec.ts@@ -23,7 +23,7 @@ it("should return gravatar URL for [email protected]", async () => {const avatarUrl = await getContactAvatar(record);const hashedEmail = await hash(email[0].email);expect(avatarUrl).toBe(- `https://www.gravatar.com/avatar/${hashedEmail}?d=404`+ `https://www.gravatar.com/avatar/${hashedEmail}?d=404`,);});@@ -82,6 +82,6 @@ it("should return gravatar URL for 2nd email if 1st email has no gravatar nor vaconst avatarUrl = await getContactAvatar(record);const hashedEmail = await hash(email[1].email);expect(avatarUrl).toBe(- `https://www.gravatar.com/avatar/${hashedEmail}?d=404`+ `https://www.gravatar.com/avatar/${hashedEmail}?d=404`,);});diff --git a/src/atomic-crm/providers/commons/getContactAvatar.ts b/src/atomic-crm/providers/commons/getContactAvatar.tsindex fa57cf07..f7d49c98 100644--- a/src/atomic-crm/providers/commons/getContactAvatar.ts+++ b/src/atomic-crm/providers/commons/getContactAvatar.ts@@ -38,7 +38,7 @@ async function getFaviconUrl(domain: string): Promise<string | null> {// Main function to get the avatar URLexport async function getContactAvatar(- record: Partial<Contact>+ record: Partial<Contact>,): Promise<string | null> {if (!record.email_jsonb || !record.email_jsonb.length) {return null;diff --git a/src/atomic-crm/providers/fakerest/dataGenerator/dealNotes.ts b/src/atomic-crm/providers/fakerest/dataGenerator/dealNotes.tsindex 9c4092a7..03b2dd3d 100644--- a/src/atomic-crm/providers/fakerest/dataGenerator/dealNotes.ts+++ b/src/atomic-crm/providers/fakerest/dataGenerator/dealNotes.ts@@ -11,7 +11,7 @@ export const generateDealNotes = (db: Db) => {deal_id: deal.id,text: lorem.paragraphs(datatype.number({ min: 1, max: 4 })),date: randomDate(- new Date(db.deals[deal.id as number].created_at)+ new Date(db.deals[deal.id as number].created_at),).toISOString(),sales_id: deal.sales_id,};diff --git a/src/atomic-crm/providers/fakerest/dataGenerator/deals.ts b/src/atomic-crm/providers/fakerest/dataGenerator/deals.tsindex c51cde9d..993d46dd 100644--- a/src/atomic-crm/providers/fakerest/dataGenerator/deals.ts+++ b/src/atomic-crm/providers/fakerest/dataGenerator/deals.ts@@ -15,14 +15,14 @@ export const generateDeals = (db: Db): Deal[] => {company.nb_deals++;const contacts = random.arrayElements(db.contacts.filter((contact) => contact.company_id === company.id),- datatype.number({ min: 1, max: 3 })+ datatype.number({ min: 1, max: 3 }),);const lowercaseName = lorem.words();const created_at = randomDate(new Date(company.created_at)).toISOString();const expected_closing_date = randomDate(new Date(created_at),- add(new Date(created_at), { months: 6 })+ add(new Date(created_at), { months: 6 }),).toISOString();return {diff --git a/src/atomic-crm/providers/fakerest/dataGenerator/finalize.ts b/src/atomic-crm/providers/fakerest/dataGenerator/finalize.tsindex 011b81ca..724547de 100644--- a/src/atomic-crm/providers/fakerest/dataGenerator/finalize.ts+++ b/src/atomic-crm/providers/fakerest/dataGenerator/finalize.ts@@ -1,10 +1,10 @@-import { Db } from './types';+import { Db } from "./types";export const finalize = (db: Db) => {- // set contact status according to the latest note- db.contactNotes- .sort((a, b) => new Date(a.date).valueOf() - new Date(b.date).valueOf())- .forEach(note => {- db.contacts[note.contact_id as number].status = note.status;- });+ // set contact status according to the latest note+ db.contactNotes+ .sort((a, b) => new Date(a.date).valueOf() - new Date(b.date).valueOf())+ .forEach((note) => {+ db.contacts[note.contact_id as number].status = note.status;+ });};diff --git a/src/atomic-crm/providers/fakerest/dataGenerator/tasks.ts b/src/atomic-crm/providers/fakerest/dataGenerator/tasks.tsindex 2eab7adc..f05853f3 100644--- a/src/atomic-crm/providers/fakerest/dataGenerator/tasks.ts+++ b/src/atomic-crm/providers/fakerest/dataGenerator/tasks.ts@@ -46,7 +46,7 @@ export const generateTasks = (db: Db) => {text: lorem.sentence(),due_date: randomDate(datatype.boolean() ? new Date() : new Date(contact.first_seen),- new Date(Date.now() + 100 * 24 * 60 * 60 * 1000)+ new Date(Date.now() + 100 * 24 * 60 * 60 * 1000),).toISOString(),done_date: undefined,sales_id: 0,diff --git a/src/atomic-crm/providers/fakerest/dataGenerator/utils.ts b/src/atomic-crm/providers/fakerest/dataGenerator/utils.tsindex 34e7301e..00d3b8f8 100644--- a/src/atomic-crm/providers/fakerest/dataGenerator/utils.ts+++ b/src/atomic-crm/providers/fakerest/dataGenerator/utils.ts@@ -4,8 +4,8 @@ export const weightedArrayElement = (values: any[], weights: any) =>faker.random.arrayElement(values.reduce((acc, value, index) => acc.concat(new Array(weights[index]).fill(value)),- []- )+ [],+ ),);export const weightedBoolean = (likelyhood: number) =>diff --git a/src/atomic-crm/providers/fakerest/dataProvider.ts b/src/atomic-crm/providers/fakerest/dataProvider.tsindex 52abecce..23ea4d8d 100644--- a/src/atomic-crm/providers/fakerest/dataProvider.ts+++ b/src/atomic-crm/providers/fakerest/dataProvider.ts@@ -51,15 +51,15 @@ const processCompanyLogo = async (params: any) => {};async function processContactAvatar(- params: UpdateParams<Contact>+ params: UpdateParams<Contact>,): Promise<UpdateParams<Contact>>;async function processContactAvatar(- params: CreateParams<Contact>+ params: CreateParams<Contact>,): Promise<CreateParams<Contact>>;async function processContactAvatar(- params: CreateParams<Contact> | UpdateParams<Contact>+ params: CreateParams<Contact> | UpdateParams<Contact>,): Promise<CreateParams<Contact> | UpdateParams<Contact>> {const { data } = params;if (data.avatar?.src || !data.email_jsonb || !data.email_jsonb.length) {@@ -75,17 +75,17 @@ async function processContactAvatar(async function fetchAndUpdateCompanyData(params: UpdateParams<Contact>,- dataProvider: DataProvider+ dataProvider: DataProvider,): Promise<UpdateParams<Contact>>;async function fetchAndUpdateCompanyData(params: CreateParams<Contact>,- dataProvider: DataProvider+ dataProvider: DataProvider,): Promise<CreateParams<Contact>>;async function fetchAndUpdateCompanyData(params: CreateParams<Contact> | UpdateParams<Contact>,- dataProvider: DataProvider+ dataProvider: DataProvider,): Promise<CreateParams<Contact> | UpdateParams<Contact>> {const { data } = params;const newData = { ...data };@@ -129,8 +129,8 @@ const dataProviderWithCustomMethod: CrmDataProvider = {id: updatedDeal.id,data: updatedDeal,previousData: deals.find((d) => d.id === updatedDeal.id),- })- )+ }),+ ),);},// We simulate a remote endpoint that is in charge of returning activity log@@ -170,7 +170,7 @@ const dataProviderWithCustomMethod: CrmDataProvider = {},async salesUpdate(id: Identifier,- data: Partial<Omit<SalesFormData, "password">>+ data: Partial<Omit<SalesFormData, "password">>,): Promise<Partial<Omit<SalesFormData, "password">>> {const { data: previousData } = await dataProvider.getOne<Sale>("sales", {id,@@ -225,7 +225,7 @@ const dataProviderWithCustomMethod: CrmDataProvider = {async function updateCompany(companyId: Identifier,- updateFn: (company: Company) => Partial<Company>+ updateFn: (company: Company) => Partial<Company>,) {const { data: company } = await dataProvider.getOne<Company>("companies", {id: companyId,@@ -496,7 +496,7 @@ export const dataProvider = withLifecycleCallbacks(return result;},} satisfies ResourceCallbacks<Deal>,- ]+ ],);/**diff --git a/src/atomic-crm/providers/fakerest/index.ts b/src/atomic-crm/providers/fakerest/index.tsindex ebd8d539..75a08a19 100644--- a/src/atomic-crm/providers/fakerest/index.ts+++ b/src/atomic-crm/providers/fakerest/index.ts@@ -1,2 +1,2 @@-export { authProvider } from './authProvider';-export { dataProvider } from './dataProvider';+export { authProvider } from "./authProvider";+export { dataProvider } from "./dataProvider";diff --git a/src/atomic-crm/providers/fakerest/internal/listParser.ts b/src/atomic-crm/providers/fakerest/internal/listParser.tsindex 50520b8c..c2c3ca99 100644--- a/src/atomic-crm/providers/fakerest/internal/listParser.ts+++ b/src/atomic-crm/providers/fakerest/internal/listParser.ts@@ -1,5 +1,5 @@-export const UNQUOTED_ALLOWED_CHARS = '[A-Za-zÀ-ÖØ-öø-ÿ0-9-]+';-export const QUOTED_ALLOWED_CHARS = '[A-Za-zÀ-ÖØ-öø-ÿ0-9, -]+';+export const UNQUOTED_ALLOWED_CHARS = "[A-Za-zÀ-ÖØ-öø-ÿ0-9-]+";+export const QUOTED_ALLOWED_CHARS = "[A-Za-zÀ-ÖØ-öø-ÿ0-9, -]+";export const LIST_REGEX_BASE = `(${UNQUOTED_ALLOWED_CHARS}|"${QUOTED_ALLOWED_CHARS}")(,(${UNQUOTED_ALLOWED_CHARS}|"${QUOTED_ALLOWED_CHARS}"))*`;/**@@ -11,38 +11,38 @@ export const LIST_REGEX_BASE = `(${UNQUOTED_ALLOWED_CHARS}|"${QUOTED_ALLOWED_CHA* e.g "a",b*/export function parseList(list: string) {- const parsedItems = [];-- let currentItem = '';- let currentQuoted = false;- for (const char of list) {- if (char === ',') {- if (currentQuoted) {- currentItem += char;- continue;- }-- parsedItems.push(currentItem);- currentItem = '';- continue;- }-- if (char === '"') {- currentQuoted = !currentQuoted;- continue;- }+ const parsedItems = [];+ let currentItem = "";+ let currentQuoted = false;+ for (const char of list) {+ if (char === ",") {+ if (currentQuoted) {currentItem += char;+ continue;+ }++ parsedItems.push(currentItem);+ currentItem = "";+ continue;}- if (currentItem) {- parsedItems.push(currentItem);++ if (char === '"') {+ currentQuoted = !currentQuoted;+ continue;}- return parsedItems.map((v: string) => {- const parsedFloat = Number.parseFloat(v);- if (!Number.isNaN(parsedFloat)) {- return parsedFloat;- }- return v;- });+ currentItem += char;+ }+ if (currentItem) {+ parsedItems.push(currentItem);+ }++ return parsedItems.map((v: string) => {+ const parsedFloat = Number.parseFloat(v);+ if (!Number.isNaN(parsedFloat)) {+ return parsedFloat;+ }+ return v;+ });}diff --git a/src/atomic-crm/providers/fakerest/internal/supabaseAdapter.spec.ts b/src/atomic-crm/providers/fakerest/internal/supabaseAdapter.spec.tsindex b86f697b..65b06ed9 100644--- a/src/atomic-crm/providers/fakerest/internal/supabaseAdapter.spec.ts+++ b/src/atomic-crm/providers/fakerest/internal/supabaseAdapter.spec.ts@@ -14,7 +14,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "a@id@eq": "1" } })+ getListAdapter("resource", { filter: { "a@id@eq": "1" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -34,7 +34,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "a@id@neq": "1" } })+ getListAdapter("resource", { filter: { "a@id@neq": "1" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -54,7 +54,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "a@id@eq": "1" } })+ getListAdapter("resource", { filter: { "a@id@eq": "1" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -74,7 +74,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "a@id@neq": "1" } })+ getListAdapter("resource", { filter: { "a@id@neq": "1" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -94,7 +94,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "id@is": null } })+ getListAdapter("resource", { filter: { "id@is": null } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -114,7 +114,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "[email protected]": null } })+ getListAdapter("resource", { filter: { "[email protected]": null } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -134,7 +134,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "a@id@lt": "1" } })+ getListAdapter("resource", { filter: { "a@id@lt": "1" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -154,7 +154,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "a@id@lte": "1" } })+ getListAdapter("resource", { filter: { "a@id@lte": "1" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -174,7 +174,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "a@id@gt": "1" } })+ getListAdapter("resource", { filter: { "a@id@gt": "1" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -194,7 +194,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "a@id@gte": "1" } })+ getListAdapter("resource", { filter: { "a@id@gte": "1" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -214,7 +214,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "id@in": "(1,2,a)" } })+ getListAdapter("resource", { filter: { "id@in": "(1,2,a)" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -234,7 +234,7 @@ describe("getList", () => {withSupabaseFilterAdapter(mockDataProvider);expect(- getListAdapter("resource", { filter: { "tags@cs": "{1,2,a}" } })+ getListAdapter("resource", { filter: { "tags@cs": "{1,2,a}" } }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -256,7 +256,7 @@ describe("getList", () => {expect(getListAdapter("resource", {filter: { "@or": { last_name: "one" } },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getList).toHaveBeenCalledWith("resource", {@@ -304,7 +304,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "a@id@eq": "2" },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -334,7 +334,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "a@id@neq": "2" },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -364,7 +364,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "id@is": null },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -394,7 +394,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "[email protected]": null },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -424,7 +424,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "a@id@lt": "2" },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -454,7 +454,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "a@id@lte": "2" },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -484,7 +484,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "a@id@gt": "2" },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -514,7 +514,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "a@id@gte": "2" },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -544,7 +544,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "id@in": "(1,2,a)" },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -574,7 +574,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "tags@cs": "{1,2,a}" },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -604,7 +604,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { "@or": { last_name: "one" } },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -634,7 +634,7 @@ describe("getManyReference", () => {pagination: { page: 1, perPage: 10 },sort: { field: "id", order: "ASC" },filter: { id: 2 },- })+ }),).resolves.toEqual([{ id: 1 }]);expect(getManyReference).toHaveBeenCalledWith("resource", {@@ -693,7 +693,7 @@ it("should remove summary suffix", () => {previousData: {},}),dataProvider.updateMany("resource_summary", { ids: [1], data: {} }),- ])+ ]),).resolves.toHaveLength(9);expect(getOne).toHaveBeenCalledWith("resource", { id: 1 });diff --git a/src/atomic-crm/providers/fakerest/internal/supabaseAdapter.ts b/src/atomic-crm/providers/fakerest/internal/supabaseAdapter.tsindex 0666dfce..221fa81e 100644--- a/src/atomic-crm/providers/fakerest/internal/supabaseAdapter.ts+++ b/src/atomic-crm/providers/fakerest/internal/supabaseAdapter.ts@@ -8,7 +8,7 @@ function removeSummarySuffix(resource: string) {}export function withSupabaseFilterAdapter<T extends DataProvider>(- dataProvider: T+ dataProvider: T,): T {return {...dataProvider,diff --git a/src/atomic-crm/providers/fakerest/internal/transformContainsFilter.spec.ts b/src/atomic-crm/providers/fakerest/internal/transformContainsFilter.spec.tsindex 426297a6..3b763d04 100644--- a/src/atomic-crm/providers/fakerest/internal/transformContainsFilter.spec.ts+++ b/src/atomic-crm/providers/fakerest/internal/transformContainsFilter.spec.ts@@ -1,36 +1,36 @@// sum.test.jsimport {- CONTAINS_FILTER_REGEX,- transformContainsFilter,-} from './transformContainsFilter';+ CONTAINS_FILTER_REGEX,+ transformContainsFilter,+} from "./transformContainsFilter";-it('should throw an error if the filter is not a string', () => {- expect(() => transformContainsFilter(1)).toThrow(- `Invalid '@cs' filter value, expected a string matching '${CONTAINS_FILTER_REGEX.source}', got: 1`- );+it("should throw an error if the filter is not a string", () => {+ expect(() => transformContainsFilter(1)).toThrow(+ `Invalid '@cs' filter value, expected a string matching '${CONTAINS_FILTER_REGEX.source}', got: 1`,+ );});-it('should throw an error if the filter does not match pattern', () => {- expect(() => transformContainsFilter('1,2')).toThrow(- `Invalid '@cs' filter value, expected a string matching '${CONTAINS_FILTER_REGEX.source}', got: 1,2`- );+it("should throw an error if the filter does not match pattern", () => {+ expect(() => transformContainsFilter("1,2")).toThrow(+ `Invalid '@cs' filter value, expected a string matching '${CONTAINS_FILTER_REGEX.source}', got: 1,2`,+ );});-it('should support empty arrays', () => {- expect(transformContainsFilter('{}')).toEqual([]);+it("should support empty arrays", () => {+ expect(transformContainsFilter("{}")).toEqual([]);});-it('should return an array of numbers', () => {- expect(transformContainsFilter('{1}')).toEqual([1]);- expect(transformContainsFilter('{1,2,3}')).toEqual([1, 2, 3]);+it("should return an array of numbers", () => {+ expect(transformContainsFilter("{1}")).toEqual([1]);+ expect(transformContainsFilter("{1,2,3}")).toEqual([1, 2, 3]);});-it('should return an array of strings', () => {- expect(transformContainsFilter('{a}')).toEqual(['a']);- expect(transformContainsFilter('{a,B,c-d}')).toEqual(['a', 'B', 'c-d']);+it("should return an array of strings", () => {+ expect(transformContainsFilter("{a}")).toEqual(["a"]);+ expect(transformContainsFilter("{a,B,c-d}")).toEqual(["a", "B", "c-d"]);});-it('should return an array of quoted strings', () => {- expect(transformContainsFilter('{"a"}')).toEqual(['a']);- expect(transformContainsFilter('{"a","B, c"}')).toEqual(['a', 'B, c']);+it("should return an array of quoted strings", () => {+ expect(transformContainsFilter('{"a"}')).toEqual(["a"]);+ expect(transformContainsFilter('{"a","B, c"}')).toEqual(["a", "B, c"]);});diff --git a/src/atomic-crm/providers/fakerest/internal/transformContainsFilter.ts b/src/atomic-crm/providers/fakerest/internal/transformContainsFilter.tsindex 159f2a16..40706445 100644--- a/src/atomic-crm/providers/fakerest/internal/transformContainsFilter.ts+++ b/src/atomic-crm/providers/fakerest/internal/transformContainsFilter.ts@@ -1,17 +1,17 @@-import { LIST_REGEX_BASE, parseList } from './listParser';+import { LIST_REGEX_BASE, parseList } from "./listParser";export const CONTAINS_FILTER_REGEX = new RegExp(`^\\{${LIST_REGEX_BASE}\\}$`);export function transformContainsFilter(value: any) {- if (value === '{}') {- return [];- }+ if (value === "{}") {+ return [];+ }- if (typeof value !== 'string' || !value.match(CONTAINS_FILTER_REGEX)) {- throw new Error(- `Invalid '@cs' filter value, expected a string matching '${CONTAINS_FILTER_REGEX.source}', got: ${value}`- );- }+ if (typeof value !== "string" || !value.match(CONTAINS_FILTER_REGEX)) {+ throw new Error(+ `Invalid '@cs' filter value, expected a string matching '${CONTAINS_FILTER_REGEX.source}', got: ${value}`,+ );+ }- return parseList(value.slice(1, -1));+ return parseList(value.slice(1, -1));}diff --git a/src/atomic-crm/providers/fakerest/internal/transformFilter.ts b/src/atomic-crm/providers/fakerest/internal/transformFilter.tsindex b1edd47f..b6b3668f 100644--- a/src/atomic-crm/providers/fakerest/internal/transformFilter.ts+++ b/src/atomic-crm/providers/fakerest/internal/transformFilter.ts@@ -1,57 +1,57 @@-import { transformContainsFilter } from './transformContainsFilter';-import { transformInFilter } from './transformInFilter';-import { transformOrFilter } from './transformOrFilter';+import { transformContainsFilter } from "./transformContainsFilter";+import { transformInFilter } from "./transformInFilter";+import { transformOrFilter } from "./transformOrFilter";export function transformFilter(filter: Record<string, any>) {- if (!filter) {- return undefined;+ if (!filter) {+ return undefined;+ }+ const transformedFilters: Record<string, any> = {};+ for (const [key, value] of Object.entries(filter)) {+ if (+ key.endsWith("@eq") ||+ key.endsWith("@neq") ||+ key.endsWith("@lt") ||+ key.endsWith("@lte") ||+ key.endsWith("@gt") ||+ key.endsWith("@gte")+ ) {+ const lastIndexOfAt = key.lastIndexOf("@");+ transformedFilters[+ `${key.substring(0, lastIndexOfAt)}_${key.substring(lastIndexOfAt + 1)}`+ ] = value;+ continue;}- const transformedFilters: Record<string, any> = {};- for (const [key, value] of Object.entries(filter)) {- if (- key.endsWith('@eq') ||- key.endsWith('@neq') ||- key.endsWith('@lt') ||- key.endsWith('@lte') ||- key.endsWith('@gt') ||- key.endsWith('@gte')- ) {- const lastIndexOfAt = key.lastIndexOf('@');- transformedFilters[- `${key.substring(0, lastIndexOfAt)}_${key.substring(lastIndexOfAt + 1)}`- ] = value;- 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("@is")) {+ transformedFilters[`${key.slice(0, -3)}_eq`] = value;+ continue;+ }- if (key.endsWith('@in')) {- transformedFilters[`${key.slice(0, -3)}_eq_any`] =- transformInFilter(value);- continue;- }+ if (key.endsWith("@not.is")) {+ transformedFilters[`${key.slice(0, -7)}_neq`] = value;+ continue;+ }- if (key.endsWith('@cs')) {- transformedFilters[`${key.slice(0, -3)}`] =- transformContainsFilter(value);- continue;- }+ if (key.endsWith("@in")) {+ transformedFilters[`${key.slice(0, -3)}_eq_any`] =+ transformInFilter(value);+ continue;+ }- // Search query- if (key.endsWith('@or')) {- transformedFilters['q'] = transformOrFilter(value);- continue;- }+ if (key.endsWith("@cs")) {+ transformedFilters[`${key.slice(0, -3)}`] =+ transformContainsFilter(value);+ continue;+ }- transformedFilters[key] = value;+ // Search query+ if (key.endsWith("@or")) {+ transformedFilters["q"] = transformOrFilter(value);+ continue;}- return transformedFilters;++ transformedFilters[key] = value;+ }+ return transformedFilters;}diff --git a/src/atomic-crm/providers/fakerest/internal/transformInFilter.spec.ts b/src/atomic-crm/providers/fakerest/internal/transformInFilter.spec.tsindex 82cef2d8..9fe4bde2 100644--- a/src/atomic-crm/providers/fakerest/internal/transformInFilter.spec.ts+++ b/src/atomic-crm/providers/fakerest/internal/transformInFilter.spec.ts@@ -1,33 +1,33 @@// sum.test.js-import { IN_FILTER_REGEX, transformInFilter } from './transformInFilter';+import { IN_FILTER_REGEX, transformInFilter } from "./transformInFilter";-it('should throw an error if the filter is not a string', () => {- expect(() => transformInFilter(1)).toThrow(- `Invalid '@in' filter value, expected a string matching '${IN_FILTER_REGEX.source}', got: 1`- );+it("should throw an error if the filter is not a string", () => {+ expect(() => transformInFilter(1)).toThrow(+ `Invalid '@in' filter value, expected a string matching '${IN_FILTER_REGEX.source}', got: 1`,+ );});-it('should throw an error if the filter does not match pattern', () => {- expect(() => transformInFilter('1,2')).toThrow(- `Invalid '@in' filter value, expected a string matching '${IN_FILTER_REGEX.source}', got: 1,2`- );+it("should throw an error if the filter does not match pattern", () => {+ expect(() => transformInFilter("1,2")).toThrow(+ `Invalid '@in' filter value, expected a string matching '${IN_FILTER_REGEX.source}', got: 1,2`,+ );});-it('should support empty arrays', () => {- expect(transformInFilter('()')).toEqual([]);+it("should support empty arrays", () => {+ expect(transformInFilter("()")).toEqual([]);});-it('should return an array of numbers', () => {- expect(transformInFilter('(1)')).toEqual([1]);- expect(transformInFilter('(1,2,3)')).toEqual([1, 2, 3]);+it("should return an array of numbers", () => {+ expect(transformInFilter("(1)")).toEqual([1]);+ expect(transformInFilter("(1,2,3)")).toEqual([1, 2, 3]);});-it('should return an array of strings', () => {- expect(transformInFilter('(a)')).toEqual(['a']);- expect(transformInFilter('(a,B,c-d)')).toEqual(['a', 'B', 'c-d']);+it("should return an array of strings", () => {+ expect(transformInFilter("(a)")).toEqual(["a"]);+ expect(transformInFilter("(a,B,c-d)")).toEqual(["a", "B", "c-d"]);});-it('should return an array of quoted strings', () => {- expect(transformInFilter('("a")')).toEqual(['a']);- expect(transformInFilter('("a","B, c")')).toEqual(['a', 'B, c']);+it("should return an array of quoted strings", () => {+ expect(transformInFilter('("a")')).toEqual(["a"]);+ expect(transformInFilter('("a","B, c")')).toEqual(["a", "B, c"]);});diff --git a/src/atomic-crm/providers/fakerest/internal/transformInFilter.ts b/src/atomic-crm/providers/fakerest/internal/transformInFilter.tsindex 68f6775f..e1e70972 100644--- a/src/atomic-crm/providers/fakerest/internal/transformInFilter.ts+++ b/src/atomic-crm/providers/fakerest/internal/transformInFilter.ts@@ -1,17 +1,17 @@-import { LIST_REGEX_BASE, parseList } from './listParser';+import { LIST_REGEX_BASE, parseList } from "./listParser";export const IN_FILTER_REGEX = new RegExp(`^\\(${LIST_REGEX_BASE}\\)$`);export function transformInFilter(value: any) {- if (value === '()') {- return [];- }+ if (value === "()") {+ return [];+ }- if (typeof value !== 'string' || !value.match(IN_FILTER_REGEX)) {- throw new Error(- `Invalid '@in' filter value, expected a string matching '${IN_FILTER_REGEX.source}', got: ${value}`- );- }+ if (typeof value !== "string" || !value.match(IN_FILTER_REGEX)) {+ throw new Error(+ `Invalid '@in' filter value, expected a string matching '${IN_FILTER_REGEX.source}', got: ${value}`,+ );+ }- return parseList(value.slice(1, -1));+ return parseList(value.slice(1, -1));}diff --git a/src/atomic-crm/providers/fakerest/internal/transformOrFilter.spec.ts b/src/atomic-crm/providers/fakerest/internal/transformOrFilter.spec.tsindex 7af5c88d..bc5196b3 100644--- a/src/atomic-crm/providers/fakerest/internal/transformOrFilter.spec.ts+++ b/src/atomic-crm/providers/fakerest/internal/transformOrFilter.spec.ts@@ -1,24 +1,24 @@// sum.test.js-import { transformOrFilter } from './transformOrFilter';+import { transformOrFilter } from "./transformOrFilter";-it('should throw an error if the value is not an object', () => {- expect(() => transformOrFilter([])).toThrow(- "Invalid '@or' filter, expected an object"- );+it("should throw an error if the value is not an object", () => {+ expect(() => transformOrFilter([])).toThrow(+ "Invalid '@or' filter, expected an object",+ );});-it('should throw an error if the object is empty', () => {- expect(() => transformOrFilter({})).toThrow(- "Invalid '@or' filter, object is empty"- );+it("should throw an error if the object is empty", () => {+ expect(() => transformOrFilter({})).toThrow(+ "Invalid '@or' filter, object is empty",+ );});-it('should return the query value', () => {- expect(transformOrFilter({ 'last_name@ilike': 'one' })).toEqual('one');- expect(- transformOrFilter({- 'last_name@ilike': 'one',- 'first_name@ilike': 'one',- })- ).toEqual('one');+it("should return the query value", () => {+ expect(transformOrFilter({ "last_name@ilike": "one" })).toEqual("one");+ expect(+ transformOrFilter({+ "last_name@ilike": "one",+ "first_name@ilike": "one",+ }),+ ).toEqual("one");});diff --git a/src/atomic-crm/providers/fakerest/internal/transformOrFilter.ts b/src/atomic-crm/providers/fakerest/internal/transformOrFilter.tsindex f79bffd5..45ea1eab 100644--- a/src/atomic-crm/providers/fakerest/internal/transformOrFilter.ts+++ b/src/atomic-crm/providers/fakerest/internal/transformOrFilter.ts@@ -1,17 +1,17 @@-import isObject from 'lodash/isObject';+import isObject from "lodash/isObject";// @or filter is an equivaluent of fakerest `q=`export function transformOrFilter(values: any) {- if (!isObject(values) || Array.isArray(values)) {- throw new Error(- "Invalid '@or' filter, expected an object as first element"- );- }+ if (!isObject(values) || Array.isArray(values)) {+ throw new Error(+ "Invalid '@or' filter, expected an object as first element",+ );+ }- const queries = Object.values(values);- if (queries.length === 0) {- throw new Error("Invalid '@or' filter, object is empty");- }+ const queries = Object.values(values);+ if (queries.length === 0) {+ throw new Error("Invalid '@or' filter, object is empty");+ }- return queries[0];+ return queries[0];}diff --git a/src/atomic-crm/providers/supabase/dataProvider.ts b/src/atomic-crm/providers/supabase/dataProvider.tsindex cd5c1622..347670ac 100644--- a/src/atomic-crm/providers/supabase/dataProvider.ts+++ b/src/atomic-crm/providers/supabase/dataProvider.ts@@ -57,15 +57,15 @@ const processCompanyLogo = async (params: any) => {};async function processContactAvatar(- params: UpdateParams<Contact>+ params: UpdateParams<Contact>,): Promise<UpdateParams<Contact>>;async function processContactAvatar(- params: CreateParams<Contact>+ params: CreateParams<Contact>,): Promise<CreateParams<Contact>>;async function processContactAvatar(- params: CreateParams<Contact> | UpdateParams<Contact>+ params: CreateParams<Contact> | UpdateParams<Contact>,): Promise<CreateParams<Contact> | UpdateParams<Contact>> {const { data } = params;if (data.avatar?.src || !data.email_jsonb || !data.email_jsonb.length) {@@ -143,7 +143,7 @@ const dataProviderWithCustomMethods = {},async salesUpdate(id: Identifier,- data: Partial<Omit<SalesFormData, "password">>+ data: Partial<Omit<SalesFormData, "password">>,) {const { email, first_name, last_name, administrator, avatar, disabled } =data;@@ -161,7 +161,7 @@ const dataProviderWithCustomMethods = {disabled,avatar,},- }+ },);if (!sale || error) {@@ -208,8 +208,8 @@ const dataProviderWithCustomMethods = {id: updatedDeal.id,data: updatedDeal,previousData: deals.find((d) => d.id === updatedDeal.id),- })- )+ }),+ ),);},async getActivityLog(companyId?: Identifier) {@@ -315,7 +315,7 @@ export const dataProvider = withLifecycleCallbacks(return applyFullTextSearch(["name", "type", "description"])(params);},},- ]+ ],);const applyFullTextSearch = (columns: string[]) => (params: GetListParams) => {diff --git a/src/atomic-crm/providers/supabase/index.ts b/src/atomic-crm/providers/supabase/index.tsindex ebd8d539..75a08a19 100644--- a/src/atomic-crm/providers/supabase/index.ts+++ b/src/atomic-crm/providers/supabase/index.ts@@ -1,2 +1,2 @@-export { authProvider } from './authProvider';-export { dataProvider } from './dataProvider';+export { authProvider } from "./authProvider";+export { dataProvider } from "./dataProvider";diff --git a/src/atomic-crm/providers/supabase/supabase.ts b/src/atomic-crm/providers/supabase/supabase.tsindex 35bd8998..a958c0c3 100644--- a/src/atomic-crm/providers/supabase/supabase.ts+++ b/src/atomic-crm/providers/supabase/supabase.ts@@ -1,6 +1,6 @@-import { createClient } from '@supabase/supabase-js';+import { createClient } from "@supabase/supabase-js";export const supabase = createClient(- import.meta.env.VITE_SUPABASE_URL,- import.meta.env.VITE_SUPABASE_ANON_KEY+ import.meta.env.VITE_SUPABASE_URL,+ import.meta.env.VITE_SUPABASE_ANON_KEY,);diff --git a/src/atomic-crm/providers/types.ts b/src/atomic-crm/providers/types.tsindex fd1fa5cf..401dba9c 100644--- a/src/atomic-crm/providers/types.ts+++ b/src/atomic-crm/providers/types.ts@@ -1 +1 @@-export type { CrmDataProvider } from './supabase/dataProvider';+export type { CrmDataProvider } from "./supabase/dataProvider";diff --git a/src/atomic-crm/root/i18nProvider.tsx b/src/atomic-crm/root/i18nProvider.tsxindex 6d6372de..7e1fe3c1 100644--- a/src/atomic-crm/root/i18nProvider.tsx+++ b/src/atomic-crm/root/i18nProvider.tsx@@ -16,10 +16,10 @@ export const i18nProvider = polyglotI18nProvider(return mergeTranslations(englishMessages,raSupabaseEnglishMessages,- raSupabaseEnglishMessagesOverride+ raSupabaseEnglishMessagesOverride,);},"en",[{ locale: "en", name: "English" }],- { allowMissing: true }+ { allowMissing: true },);diff --git a/src/atomic-crm/sales/SalesCreate.tsx b/src/atomic-crm/sales/SalesCreate.tsxindex faefddf5..dc467d96 100644--- a/src/atomic-crm/sales/SalesCreate.tsx+++ b/src/atomic-crm/sales/SalesCreate.tsx@@ -19,7 +19,7 @@ export function SalesCreate() {},onSuccess: () => {notify(- "User created. They will soon receive an email to set their password."+ "User created. They will soon receive an email to set their password.",);redirect("/sales");},diff --git a/src/atomic-crm/tags/TagCreateModal.tsx b/src/atomic-crm/tags/TagCreateModal.tsxindex 58e304f1..0819c02d 100644--- a/src/atomic-crm/tags/TagCreateModal.tsx+++ b/src/atomic-crm/tags/TagCreateModal.tsx@@ -23,7 +23,7 @@ export function TagCreateModal({onSuccess: async (tag) => {await onSuccess?.(tag);},- }+ },);};diff --git a/src/atomic-crm/tags/TagDialog.tsx b/src/atomic-crm/tags/TagDialog.tsxindex 108252a8..97008de2 100644--- a/src/atomic-crm/tags/TagDialog.tsx+++ b/src/atomic-crm/tags/TagDialog.tsx@@ -34,7 +34,7 @@ export function TagDialog({const [disabled, setDisabled] = useState(false);const handleNewTagNameChange = (- event: React.ChangeEvent<HTMLInputElement>+ event: React.ChangeEvent<HTMLInputElement>,) => {setNewTagName(event.target.value);};@@ -105,7 +105,7 @@ export function TagDialog({className={cn(buttonVariants({ variant: "outline" }),"text-primary",- disabled ? "opacity-50 cursor-not-allowed" : "cursor-pointer"+ disabled ? "opacity-50 cursor-not-allowed" : "cursor-pointer",)}><SaveIcon />diff --git a/src/atomic-crm/tags/TagEditModal.tsx b/src/atomic-crm/tags/TagEditModal.tsxindex d13d0690..e4ad3bb8 100644--- a/src/atomic-crm/tags/TagEditModal.tsx+++ b/src/atomic-crm/tags/TagEditModal.tsx@@ -25,7 +25,7 @@ export function TagEditModal({onSuccess: async (tag) => {await onSuccess?.(tag);},- }+ },);};diff --git a/src/atomic-crm/tasks/TasksIterator.tsx b/src/atomic-crm/tasks/TasksIterator.tsxindex 792a1df5..3164a9c1 100644--- a/src/atomic-crm/tasks/TasksIterator.tsx+++ b/src/atomic-crm/tasks/TasksIterator.tsx@@ -17,7 +17,7 @@ export const TasksIterator = ({const tasks = data.filter((task) =>!task.done_date ||- isAfter(new Date(task.done_date), new Date(Date.now() - 5 * 60 * 1000))+ isAfter(new Date(task.done_date), new Date(Date.now() - 5 * 60 * 1000)),);return (diff --git a/src/components/admin/array-field.tsx b/src/components/admin/array-field.tsxindex d0bd6229..380c6af2 100644--- a/src/components/admin/array-field.tsx+++ b/src/components/admin/array-field.tsx@@ -27,5 +27,4 @@ export type ArrayFieldProps<children?: ReactNode;};-const emptyArray: any[] = [];diff --git a/src/components/admin/autocomplete-array-input.tsx b/src/components/admin/autocomplete-array-input.tsxindex d7de1e63..ef1b7bfe 100644--- a/src/components/admin/autocomplete-array-input.tsx+++ b/src/components/admin/autocomplete-array-input.tsx@@ -1,4 +1,3 @@-import * as React from "react";import { X } from "lucide-react";import { Badge } from "@/components/ui/badge";diff --git a/src/components/admin/boolean-input.tsx b/src/components/admin/boolean-input.tsxindex 3bea9155..22f21fd3 100644--- a/src/components/admin/boolean-input.tsx+++ b/src/components/admin/boolean-input.tsx@@ -1,4 +1,3 @@-import React, { useCallback } from "react";import { Switch } from "@/components/ui/switch";import { FormError, FormField, FormLabel } from "@/components/admin/form";diff --git a/src/components/admin/breadcrumb.tsx b/src/components/admin/breadcrumb.tsxindex 49426762..0bc5e505 100644--- a/src/components/admin/breadcrumb.tsx+++ b/src/components/admin/breadcrumb.tsx@@ -88,7 +88,7 @@ export const Breadcrumb = ({ children, ref }: BreadcrumbProps) => {</BreadcrumbList></BaseBreadcrumb></>,- breadcrumbPortal+ breadcrumbPortal,);};diff --git a/src/components/admin/count.tsx b/src/components/admin/count.tsxindex 62519383..deb95dd5 100644--- a/src/components/admin/count.tsx+++ b/src/components/admin/count.tsx@@ -41,7 +41,7 @@ export const Count = (props: CountProps) => {const resource = useResourceContext(props);if (!resource) {throw new Error(- "The Count component must be used inside a ResourceContext or must be passed a resource prop."+ "The Count component must be used inside a ResourceContext or must be passed a resource prop.",);}const oneSecondHasPassed = useTimeout(timeout);@@ -82,7 +82,6 @@ export const Count = (props: CountProps) => {};export interface CountProps {-filter?: any;sort?: SortPayload;link?: boolean;diff --git a/src/components/admin/data-table.tsx b/src/components/admin/data-table.tsxindex 822153e5..5ec928ec 100644--- a/src/components/admin/data-table.tsx+++ b/src/components/admin/data-table.tsx@@ -64,7 +64,7 @@ import {const defaultBulkActionButtons = <BulkActionsToolbarChildren />;export function DataTable<RecordType extends RaRecord = RaRecord>(- props: DataTableProps<RecordType>+ props: DataTableProps<RecordType>,) {const {children,@@ -129,9 +129,9 @@ const DataTableHead = ({ children }: { children: ReactNode }) => {? selectedIds.concat(data.filter((record) => !selectedIds.includes(record.id))- .map((record) => record.id)+ .map((record) => record.id),)- : []+ : [],);};const selectableIds = Array.isArray(data)@@ -214,7 +214,7 @@ const DataTableRow = ({if (!handleToggleItem) return;handleToggleItem(record.id, event);},- [handleToggleItem, record.id]+ [handleToggleItem, record.id],);const handleClick = useCallback(async () => {@@ -257,7 +257,6 @@ const DataTableRow = ({);};-const isPromise = (value: any): value is Promise<any> =>value && typeof value.then === "function";@@ -279,7 +278,7 @@ export interface DataTableProps<RecordType extends RaRecord = RaRecord>}export function DataTableColumn<- RecordType extends RaRecord<Identifier> = RaRecord<Identifier>+ RecordType extends RaRecord<Identifier> = RaRecord<Identifier>,>(props: DataTableColumnProps<RecordType>) {const renderContext = useDataTableRenderContext();switch (renderContext) {@@ -311,7 +310,7 @@ const reorderChildren = (children: ReactNode, columnRanks: number[]) =>}, []);function DataTableHeadCell<- RecordType extends RaRecord<Identifier> = RaRecord<Identifier>+ RecordType extends RaRecord<Identifier> = RaRecord<Identifier>,>(props: DataTableColumnProps<RecordType>) {const {disableSort,@@ -335,7 +334,7 @@ function DataTableHeadCell<const nextSortOrder =sort && sort.field === source? oppositeOrder[sort.order]- : sortByOrder ?? "ASC";+ : (sortByOrder ?? "ASC");const fieldLabel = translateLabel({label: typeof label === "string" ? label : undefined,resource,@@ -405,7 +404,7 @@ const oppositeOrder: Record<SortPayload["order"], SortPayload["order"]> = {};function DataTableCell<- RecordType extends RaRecord<Identifier> = RaRecord<Identifier>+ RecordType extends RaRecord<Identifier> = RaRecord<Identifier>,>(props: DataTableColumnProps<RecordType>) {const {children,@@ -424,7 +423,7 @@ function DataTableCell<if (isColumnHidden) return null;if (!render && !field && !children && !source) {throw new Error(- "DataTableColumn: Missing at least one of the following props: render, field, children, or source"+ "DataTableColumn: Missing at least one of the following props: render, field, children, or source",);}@@ -434,21 +433,21 @@ function DataTableCell<"py-1",className,cellClassName,- record && conditionalClassName?.(record)+ record && conditionalClassName?.(record),)}>{children ??(render? record && render(record): field- ? createElement(field, { source })- : get(record, source!))}+ ? createElement(field, { source })+ : get(record, source!))}</TableCell>);}export interface DataTableColumnProps<- RecordType extends RaRecord<Identifier> = RaRecord<Identifier>+ RecordType extends RaRecord<Identifier> = RaRecord<Identifier>,> {className?: string;cellClassName?: string;@@ -464,7 +463,7 @@ export interface DataTableColumnProps<}export function DataTableNumberColumn<- RecordType extends RaRecord<Identifier> = RaRecord<Identifier>+ RecordType extends RaRecord<Identifier> = RaRecord<Identifier>,>(props: DataTableNumberColumnProps<RecordType>) {const {source,@@ -489,7 +488,7 @@ export function DataTableNumberColumn<}export interface DataTableNumberColumnProps<- RecordType extends RaRecord<Identifier> = RaRecord<Identifier>+ RecordType extends RaRecord<Identifier> = RaRecord<Identifier>,> extends DataTableColumnProps<RecordType> {source: NoInfer<HintedString<ExtractRecordPaths<RecordType>>>;locales?: string | string[];diff --git a/src/components/admin/date-field.tsx b/src/components/admin/date-field.tsxindex 900ef739..bb6b0256 100644--- a/src/components/admin/date-field.tsx+++ b/src/components/admin/date-field.tsx@@ -29,7 +29,6 @@ import { FieldProps } from "@/lib/field.type";* <span>mercredi 7 novembre 2012</span>*/const DateFieldImpl = <-RecordType extends Record<string, any> = Record<string, any>,>(inProps: DateFieldProps<RecordType>,@@ -101,7 +100,6 @@ DateFieldImpl.displayName = "DateFieldImpl";export const DateField = genericMemo(DateFieldImpl);export interface DateFieldProps<-RecordType extends Record<string, any> = Record<string, any>,> extends FieldProps<RecordType>,HTMLAttributes<HTMLSpanElement> {diff --git a/src/components/admin/edit-guesser.tsx b/src/components/admin/edit-guesser.tsxindex 79a5d756..26513644 100644--- a/src/components/admin/edit-guesser.tsx+++ b/src/components/admin/edit-guesser.tsx@@ -65,7 +65,6 @@ const EditViewGuesser = (props: { enableLog?: boolean }) => {).sort();-console.log(`Guessed Edit:diff --git a/src/components/admin/email-field.tsx b/src/components/admin/email-field.tsxindex 6cd62433..505e0941 100644--- a/src/components/admin/email-field.tsx+++ b/src/components/admin/email-field.tsx@@ -6,7 +6,6 @@ import { genericMemo } from "@/lib/genericMemo";import { FieldProps } from "@/lib/field.type";const EmailFieldImpl = <-RecordType extends Record<string, any> = Record<string, any>,>(inProps: EmailFieldProps<RecordType>,@@ -43,7 +42,6 @@ EmailFieldImpl.displayName = "EmailFieldImpl";export const EmailField = genericMemo(EmailFieldImpl);export interface EmailFieldProps<-RecordType extends Record<string, any> = Record<string, any>,> extends FieldProps<RecordType>,AnchorHTMLAttributes<HTMLAnchorElement> {}diff --git a/src/components/admin/export-button.tsx b/src/components/admin/export-button.tsxindex bfdf6eb1..5c817c41 100644--- a/src/components/admin/export-button.tsx+++ b/src/components/admin/export-button.tsx@@ -96,6 +96,6 @@ export interface ExportButtonProps {maxResults?: number;onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;resource?: string;-+meta?: any;}diff --git a/src/components/admin/field-toggle.tsx b/src/components/admin/field-toggle.tsxindex 216791cd..eb7d7549 100644--- a/src/components/admin/field-toggle.tsx+++ b/src/components/admin/field-toggle.tsx@@ -22,7 +22,7 @@ export const FieldToggle = (props: FieldToggleProps) => {const handleDragStart = () => {document.addEventListener("dragover",- handleDocumentDragOver as EventListener+ handleDocumentDragOver as EventListener,);};@@ -36,7 +36,7 @@ export const FieldToggle = (props: FieldToggleProps) => {}const elementAtDragCoordinates = document.elementFromPoint(x.current,- y.current+ y.current,);let dropItem =elementAtDragCoordinates === null@@ -104,7 +104,7 @@ export const FieldToggle = (props: FieldToggleProps) => {selectedItem.dataset.dragActive = "false";document.removeEventListener("dragover",- handleDocumentDragOver as EventListener+ handleDocumentDragOver as EventListener,);};@@ -125,7 +125,7 @@ export const FieldToggle = (props: FieldToggleProps) => {data-index={index}className={cn("flex justify-between items-center py-1",- "data-[drag-active=true]:bg-transparent data-[drag-active=true]:text-transparent data-[drag-active=true]:outline data-[drag-active=true]:outline-1 data-[drag-active=true]:outline-border"+ "data-[drag-active=true]:bg-transparent data-[drag-active=true]:text-transparent data-[drag-active=true]:outline data-[drag-active=true]:outline-1 data-[drag-active=true]:outline-border",)}><label@@ -155,7 +155,7 @@ export interface FieldToggleProps {onToggle?: (event: boolean) => void;onMove?: (dragIndex: string | number,- dropIndex: string | number | null+ dropIndex: string | number | null,) => void;source: string;index: number | string;diff --git a/src/components/admin/file-field.tsx b/src/components/admin/file-field.tsxindex 17334fe3..65aeb2bc 100644--- a/src/components/admin/file-field.tsx+++ b/src/components/admin/file-field.tsx@@ -23,7 +23,6 @@ import type { FieldProps } from "@/lib/field.type";* </div>*/export const FileField = <-RecordType extends Record<string, any> = Record<string, any>,>(props: FileFieldProps<RecordType>,@@ -107,7 +106,6 @@ export const FileField = <};export interface FileFieldProps<-RecordType extends Record<string, any> = Record<string, any>,> extends FieldProps<RecordType>,HTMLAttributes<HTMLElement> {diff --git a/src/components/admin/file-input.tsx b/src/components/admin/file-input.tsxindex 172562ef..16358ec8 100644--- a/src/components/admin/file-input.tsx+++ b/src/components/admin/file-input.tsx@@ -120,7 +120,6 @@ export const FileInput = (props: FileInputProps) => {const files = value ? (Array.isArray(value) ? value : [value]) : [];const onDrop = (-newFiles: any[],rejectedFiles: FileRejection[],event: DropEvent,@@ -140,7 +139,6 @@ export const FileInput = (props: FileInputProps) => {}};-const onRemove = (file: any) => async () => {if (validateFileRemoval) {try {@@ -233,21 +231,18 @@ export const FileInput = (props: FileInputProps) => {{children && (<div className="previews flex flex-col gap-1">- {-- files.map((file: any, index: number) => (- <FileInputPreview- key={index}- file={file}- onRemove={onRemove(file)}- removeIcon={removeIcon}- >- <RecordContextProvider value={file}>- {childrenElement}- </RecordContextProvider>- </FileInputPreview>- ))- }+ {files.map((file: any, index: number) => (+ <FileInputPreview+ key={index}+ file={file}+ onRemove={onRemove(file)}+ removeIcon={removeIcon}+ >+ <RecordContextProvider value={file}>+ {childrenElement}+ </RecordContextProvider>+ </FileInputPreview>+ ))}</div>)}</FormField>@@ -264,12 +259,12 @@ export type FileInputProps = Omit<InputProps, "type"> & {minSize?: DropzoneOptions["minSize"];multiple?: DropzoneOptions["multiple"];options?: DropzoneOptions;-+onRemove?: (file: any) => void;placeholder?: ReactNode;removeIcon?: ComponentType<{ className?: string }>;inputProps?: DropzoneInputProps & React.ComponentProps<"input">;-+validateFileRemoval?(file: any): boolean | Promise<boolean>;};@@ -321,7 +316,6 @@ export const FileInputPreview = (props: FileInputPreviewProps) => {};export interface FileInputPreviewProps extends HTMLAttributes<HTMLDivElement> {-file: any;onRemove: () => void;removeIcon?: React.ComponentType<{ className?: string }>;diff --git a/src/components/admin/filter-form.tsx b/src/components/admin/filter-form.tsxindex 439f6f8c..b4fdba4c 100644--- a/src/components/admin/filter-form.tsx+++ b/src/components/admin/filter-form.tsx@@ -139,7 +139,6 @@ const StyledForm = (props: React.FormHTMLAttributes<HTMLFormElement>) => {);};-const isEmptyValue = (filterValue: any): boolean => {if (filterValue === "" || filterValue == null) return true;@@ -254,7 +253,6 @@ export const FilterButton = (props: FilterButtonProps) => {);const handleShow = useCallback(-({ source, defaultValue }: { source: string; defaultValue: any }) => {showFilter(source, defaultValue === "" ? undefined : defaultValue);// We have to fallback to imperative code because the new FilterFormInput@@ -488,7 +486,7 @@ export const FilterButtonMenuItem = React.forwardRef<export interface FilterButtonMenuItemProps {filter: React.ReactElement<FilterElementProps>;displayed: boolean;-+onShow: (params: { source: string; defaultValue: any }) => void;onHide: (params: { source: string }) => void;resource?: string;diff --git a/src/components/admin/form.tsx b/src/components/admin/form.tsxindex 595db417..4587c574 100644--- a/src/components/admin/form.tsx+++ b/src/components/admin/form.tsx@@ -194,7 +194,6 @@ const SaveButton = <RecordType extends RaRecord = RaRecord>();const handleSubmit = useCallback(-async (values: any) => {let errors;if (saveContext?.save) {@@ -279,7 +278,6 @@ export type SaveButtonProps<RecordType extends RaRecord = RaRecord> =alwaysEnable?: boolean;};-const valueOrDefault = (value: any, defaultValue: any) =>typeof value === "undefined" ? defaultValue : value;diff --git a/src/components/admin/layout.tsx b/src/components/admin/layout.tsxindex 29785445..dc59b8ad 100644--- a/src/components/admin/layout.tsx+++ b/src/components/admin/layout.tsx@@ -20,7 +20,7 @@ export const Layout = (props: CoreLayoutProps) => {"sm:transition-[width] sm:duration-200 sm:ease-linear","flex h-svh flex-col","group-data-[scroll-locked=1]/body:h-full",- "has-[main.fixed-main]:group-data-[scroll-locked=1]/body:h-svh"+ "has-[main.fixed-main]:group-data-[scroll-locked=1]/body:h-svh",)}><header className="flex h-16 md:h-12 shrink-0 items-center gap-2 px-4">diff --git a/src/components/admin/list-guesser.tsx b/src/components/admin/list-guesser.tsxindex 3455961c..da365f79 100644--- a/src/components/admin/list-guesser.tsx+++ b/src/components/admin/list-guesser.tsx@@ -109,7 +109,6 @@ const ListViewGuesser = (.sort();if (enableLog) {-console.log(`Guessed List:diff --git a/src/components/admin/list-pagination.tsx b/src/components/admin/list-pagination.tsxindex da1794b6..d2a537ef 100644--- a/src/components/admin/list-pagination.tsx+++ b/src/components/admin/list-pagination.tsx@@ -49,7 +49,7 @@ export const ListPagination = ({const startPages = range(1, Math.min(boundaryCount, count));const endPages = range(Math.max(count - boundaryCount + 1, boundaryCount + 1),- count+ count,);const siblingsStart = Math.max(@@ -57,10 +57,10 @@ export const ListPagination = ({// Natural startpage - siblingCount,// Lower boundary when page is high- count - boundaryCount - siblingCount * 2 - 1+ count - boundaryCount - siblingCount * 2 - 1,),// Greater than startPages- boundaryCount + 2+ boundaryCount + 2,);const siblingsEnd = Math.min(@@ -68,10 +68,10 @@ export const ListPagination = ({// Natural endpage + siblingCount,// Upper boundary when page is low- boundaryCount + siblingCount * 2 + 2+ boundaryCount + siblingCount * 2 + 2,),// Less than endPages- count - boundaryCount - 1+ count - boundaryCount - 1,);const siblingPages = range(siblingsStart, siblingsEnd);@@ -133,7 +133,7 @@ export const ListPagination = ({onClick={pageChangeHandler(page - 1)}className={cn("gap-1 px-2.5 sm:pr-2.5",- !hasPreviousPage ? "opacity-50 cursor-not-allowed" : ""+ !hasPreviousPage ? "opacity-50 cursor-not-allowed" : "",)}aria-label={translate("ra.navigation.previous", {_: "Previous",@@ -212,7 +212,7 @@ export const ListPagination = ({size="default"className={cn("gap-1 px-2.5 sm:pr-2.5",- !hasNextPage ? "opacity-50 cursor-not-allowed" : ""+ !hasNextPage ? "opacity-50 cursor-not-allowed" : "",)}aria-label={translate("ra.navigation.next", { _: "Next" })}>diff --git a/src/components/admin/login-page.tsx b/src/components/admin/login-page.tsxindex 35ddf1b3..70d11a21 100644--- a/src/components/admin/login-page.tsx+++ b/src/components/admin/login-page.tsx@@ -23,8 +23,8 @@ export const LoginPage = (props: { redirectTo?: string }) => {typeof error === "string"? error: typeof error === "undefined" || !error.message- ? "ra.auth.sign_in_error"- : error.message,+ ? "ra.auth.sign_in_error"+ : error.message,{type: "error",messageArgs: {@@ -32,10 +32,10 @@ export const LoginPage = (props: { redirectTo?: string }) => {typeof error === "string"? error: error && error.message- ? error.message- : undefined,+ ? error.message+ : undefined,},- }+ },);});};diff --git a/src/components/admin/notification.tsx b/src/components/admin/notification.tsxindex 15bd986a..17f66459 100644--- a/src/components/admin/notification.tsx+++ b/src/components/admin/notification.tsx@@ -55,8 +55,8 @@ export const Notification = (props: ToasterProps) => {? typeof message === "string"? translate(message, messageArgs): React.isValidElement(message)- ? message- : undefined+ ? message+ : undefined: undefined;toast[type](finalMessage, {diff --git a/src/components/admin/reference-array-input.tsx b/src/components/admin/reference-array-input.tsxindex 2dbdd399..b876e72c 100644--- a/src/components/admin/reference-array-input.tsx+++ b/src/components/admin/reference-array-input.tsx@@ -77,7 +77,7 @@ export const ReferenceArrayInput = (props: ReferenceArrayInputProps) => {} = props;if (React.Children.count(children) !== 1) {throw new Error(- "<ReferenceArrayInput> only accepts a single child (like <AutocompleteArrayInput>)"+ "<ReferenceArrayInput> only accepts a single child (like <AutocompleteArrayInput>)",);}diff --git a/src/components/admin/reference-field.tsx b/src/components/admin/reference-field.tsxindex fe196663..ff153788 100644--- a/src/components/admin/reference-field.tsx+++ b/src/components/admin/reference-field.tsx@@ -15,9 +15,9 @@ import { UseQueryOptions } from "@tanstack/react-query";export const ReferenceField = <RecordType extends RaRecord = RaRecord,- ReferenceRecordType extends RaRecord = RaRecord+ ReferenceRecordType extends RaRecord = RaRecord,>(- props: ReferenceFieldProps<RecordType, ReferenceRecordType>+ props: ReferenceFieldProps<RecordType, ReferenceRecordType>,) => {const { loading, error, empty, render, ...rest } = props;const id = useFieldValue<RecordType>(props);@@ -43,11 +43,10 @@ export const ReferenceField = <export interface ReferenceFieldProps<RecordType extends RaRecord = RaRecord,- ReferenceRecordType extends RaRecord = RaRecord+ ReferenceRecordType extends RaRecord = RaRecord,> extends Partial<ReferenceFieldViewProps<ReferenceRecordType>> {children?: ReactNode;queryOptions?: UseQueryOptions<RaRecord[], Error> & {-meta?: any;};record?: RecordType;@@ -62,9 +61,9 @@ const stopPropagation = (e: MouseEvent<HTMLAnchorElement>) =>e.stopPropagation();export const ReferenceFieldView = <- ReferenceRecordType extends RaRecord = RaRecord+ ReferenceRecordType extends RaRecord = RaRecord,>(- props: ReferenceFieldViewProps<ReferenceRecordType>+ props: ReferenceFieldViewProps<ReferenceRecordType>,) => {const {children,@@ -112,7 +111,7 @@ export const ReferenceFieldView = <};export interface ReferenceFieldViewProps<- ReferenceRecordType extends RaRecord = RaRecord+ ReferenceRecordType extends RaRecord = RaRecord,> {children?: ReactNode;className?: string;diff --git a/src/components/admin/reference-many-count.tsx b/src/components/admin/reference-many-count.tsxindex 72c5e79e..76218456 100644--- a/src/components/admin/reference-many-count.tsx+++ b/src/components/admin/reference-many-count.tsx@@ -64,7 +64,7 @@ export interface ReferenceManyCountProps<target: string;source?: string;sort?: SortPayload;-+filter?: any;link?: boolean;timeout?: number;diff --git a/src/components/admin/select-field.tsx b/src/components/admin/select-field.tsxindex 30e1d25c..5c50df70 100644--- a/src/components/admin/select-field.tsx+++ b/src/components/admin/select-field.tsx@@ -67,7 +67,6 @@ import { genericMemo } from "@/lib/genericMemo";* **Tip**: <ReferenceField> sets `translateChoice` to false by default.*/const SelectFieldImpl = <-RecordType extends Record<string, any> = Record<string, any>,>(props: SelectFieldProps<RecordType>,@@ -94,8 +93,7 @@ const SelectFieldImpl = <const translate = useTranslate();const choice = choices- ?- choices.find((choice: any) => getChoiceValue(choice) === value)+ ? choices.find((choice: any) => getChoiceValue(choice) === value): null;if (!choice) {@@ -124,7 +122,6 @@ SelectFieldImpl.displayName = "SelectFieldImpl";export const SelectField = genericMemo(SelectFieldImpl);export interface SelectFieldProps<-RecordType extends Record<string, any> = Record<string, any>,> extends Omit<ChoicesProps,diff --git a/src/components/admin/select-input.tsx b/src/components/admin/select-input.tsxindex 05c6b18b..26ff9ea3 100644--- a/src/components/admin/select-input.tsx+++ b/src/components/admin/select-input.tsx@@ -145,7 +145,6 @@ export const SelectInput = (props: SelectInputProps) => {}, [emptyText, translate]);const renderMenuItemOption = useCallback(-(choice: any) => getChoiceText(choice),[getChoiceText],);@@ -295,7 +294,7 @@ export type SelectInputProps = ChoicesProps &Partial<InputProps> &Omit<SupportCreateSuggestionOptions, "handleChange"> & {emptyText?: string | ReactElement;-+emptyValue?: any;onChange?: (value: string) => void;} & Omit<ComponentProps<typeof FormField>, "id" | "name" | "children">;diff --git a/src/components/admin/show-guesser.tsx b/src/components/admin/show-guesser.tsxindex 8560c593..fa669672 100644--- a/src/components/admin/show-guesser.tsx+++ b/src/components/admin/show-guesser.tsx@@ -72,7 +72,6 @@ const ShowViewGuesser = (props: { enableLog?: boolean }) => {).sort();-console.log(`Guessed Show:diff --git a/src/components/admin/single-field-list.tsx b/src/components/admin/single-field-list.tsxindex 608d043a..ef7bf91e 100644--- a/src/components/admin/single-field-list.tsx+++ b/src/components/admin/single-field-list.tsx@@ -5,7 +5,6 @@ import {} from "ra-core";import { Badge } from "@/components/ui/badge";-export const SingleFieldList = <RecordType = any,>({children,render,diff --git a/src/components/admin/sort-button.tsx b/src/components/admin/sort-button.tsxindex a29c3dbe..ba1628a1 100644--- a/src/components/admin/sort-button.tsx+++ b/src/components/admin/sort-button.tsx@@ -115,7 +115,6 @@ const defaultIcon = <ArrowUpDown className="h-4 w-4" />;const inverseOrder = (sort: string) => (sort === "ASC" ? "DESC" : "ASC");-const arePropsEqual = (prevProps: any, nextProps: any) =>shallowEqual(prevProps.fields, nextProps.fields);diff --git a/src/components/admin/toggle-filter-button.tsx b/src/components/admin/toggle-filter-button.tsxindex d0fa773e..c673ec14 100644--- a/src/components/admin/toggle-filter-button.tsx+++ b/src/components/admin/toggle-filter-button.tsx@@ -1,4 +1,3 @@-import React from "react";import { cn } from "@/lib/utils";import { Button } from "@/components/ui/button";diff --git a/src/components/admin/url-field.tsx b/src/components/admin/url-field.tsxindex 46edc3a2..43ccdd54 100644--- a/src/components/admin/url-field.tsx+++ b/src/components/admin/url-field.tsx@@ -6,7 +6,6 @@ import { genericMemo } from "@/lib/genericMemo";import { FieldProps } from "@/lib/field.type";const UrlFieldImpl = <-RecordType extends Record<string, any> = Record<string, any>,>(inProps: UrlFieldProps<RecordType>,@@ -51,7 +50,6 @@ UrlFieldImpl.displayName = "UrlFieldImpl";export const UrlField = genericMemo(UrlFieldImpl);export interface UrlFieldProps<-RecordType extends Record<string, any> = Record<string, any>,> extends FieldProps<RecordType>,AnchorHTMLAttributes<HTMLAnchorElement> {}diff --git a/src/components/ui/accordion.tsx b/src/components/ui/accordion.tsxindex d21b65f7..720bff51 100644--- a/src/components/ui/accordion.tsx+++ b/src/components/ui/accordion.tsx@@ -1,13 +1,13 @@-import * as React from "react"-import * as AccordionPrimitive from "@radix-ui/react-accordion"-import { ChevronDownIcon } from "lucide-react"+import * as React from "react";+import * as AccordionPrimitive from "@radix-ui/react-accordion";+import { ChevronDownIcon } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Accordion({...props}: React.ComponentProps<typeof AccordionPrimitive.Root>) {- return <AccordionPrimitive.Root data-slot="accordion" {...props} />+ return <AccordionPrimitive.Root data-slot="accordion" {...props} />;}function AccordionItem({@@ -20,7 +20,7 @@ function AccordionItem({className={cn("border-b last:border-b-0", className)}{...props}/>- )+ );}function AccordionTrigger({@@ -34,7 +34,7 @@ function AccordionTrigger({data-slot="accordion-trigger"className={cn("focus-visible:border-ring focus-visible:ring-ring/50 flex flex-1 items-start justify-between gap-4 rounded-md py-4 text-left text-sm font-medium transition-all outline-none hover:underline focus-visible:ring-[3px] disabled:pointer-events-none disabled:opacity-50 [&[data-state=open]>svg]:rotate-180",- className+ className,)}{...props}>@@ -42,7 +42,7 @@ function AccordionTrigger({<ChevronDownIcon className="text-muted-foreground pointer-events-none size-4 shrink-0 translate-y-0.5 transition-transform duration-200" /></AccordionPrimitive.Trigger></AccordionPrimitive.Header>- )+ );}function AccordionContent({@@ -58,7 +58,7 @@ function AccordionContent({><div className={cn("pt-0 pb-4", className)}>{children}</div></AccordionPrimitive.Content>- )+ );}-export { Accordion, AccordionItem, AccordionTrigger, AccordionContent }+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };diff --git a/src/components/ui/alert.tsx b/src/components/ui/alert.tsxindex 14213546..aa7de24d 100644--- a/src/components/ui/alert.tsx+++ b/src/components/ui/alert.tsx@@ -1,7 +1,7 @@-import * as React from "react"-import { cva, type VariantProps } from "class-variance-authority"+import * as React from "react";+import { cva, type VariantProps } from "class-variance-authority";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";const alertVariants = cva("relative w-full rounded-lg border px-4 py-3 text-sm grid has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current",@@ -16,8 +16,8 @@ const alertVariants = cva(defaultVariants: {variant: "default",},- }-)+ },+);function Alert({className,@@ -31,7 +31,7 @@ function Alert({className={cn(alertVariants({ variant }), className)}{...props}/>- )+ );}function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {@@ -40,11 +40,11 @@ function AlertTitle({ className, ...props }: React.ComponentProps<"div">) {data-slot="alert-title"className={cn("col-start-2 line-clamp-1 min-h-4 font-medium tracking-tight",- className+ className,)}{...props}/>- )+ );}function AlertDescription({@@ -56,11 +56,11 @@ function AlertDescription({data-slot="alert-description"className={cn("text-muted-foreground col-start-2 grid justify-items-start gap-1 text-sm [&_p]:leading-relaxed",- className+ className,)}{...props}/>- )+ );}-export { Alert, AlertTitle, AlertDescription }+export { Alert, AlertTitle, AlertDescription };diff --git a/src/components/ui/avatar.tsx b/src/components/ui/avatar.tsxindex b7224f00..dc33372d 100644--- a/src/components/ui/avatar.tsx+++ b/src/components/ui/avatar.tsx@@ -1,7 +1,7 @@-import * as React from "react"-import * as AvatarPrimitive from "@radix-ui/react-avatar"+import * as React from "react";+import * as AvatarPrimitive from "@radix-ui/react-avatar";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Avatar({className,@@ -12,11 +12,11 @@ function Avatar({data-slot="avatar"className={cn("relative flex size-8 shrink-0 overflow-hidden rounded-full",- className+ className,)}{...props}/>- )+ );}function AvatarImage({@@ -29,7 +29,7 @@ function AvatarImage({className={cn("aspect-square size-full", className)}{...props}/>- )+ );}function AvatarFallback({@@ -41,11 +41,11 @@ function AvatarFallback({data-slot="avatar-fallback"className={cn("bg-muted flex size-full items-center justify-center rounded-full",- className+ className,)}{...props}/>- )+ );}-export { Avatar, AvatarImage, AvatarFallback }+export { Avatar, AvatarImage, AvatarFallback };diff --git a/src/components/ui/badge.tsx b/src/components/ui/badge.tsxindex 83750ed1..46f988c2 100644--- a/src/components/ui/badge.tsx+++ b/src/components/ui/badge.tsx@@ -22,7 +22,7 @@ const badgeVariants = cva(defaultVariants: {variant: "default",},- }+ },);function Badge({diff --git a/src/components/ui/breadcrumb.tsx b/src/components/ui/breadcrumb.tsxindex eb88f321..f63ae19a 100644--- a/src/components/ui/breadcrumb.tsx+++ b/src/components/ui/breadcrumb.tsx@@ -1,11 +1,11 @@-import * as React from "react"-import { Slot } from "@radix-ui/react-slot"-import { ChevronRight, MoreHorizontal } from "lucide-react"+import * as React from "react";+import { Slot } from "@radix-ui/react-slot";+import { ChevronRight, MoreHorizontal } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Breadcrumb({ ...props }: React.ComponentProps<"nav">) {- return <nav aria-label="breadcrumb" data-slot="breadcrumb" {...props} />+ return <nav aria-label="breadcrumb" data-slot="breadcrumb" {...props} />;}function BreadcrumbList({ className, ...props }: React.ComponentProps<"ol">) {@@ -14,11 +14,11 @@ function BreadcrumbList({ className, ...props }: React.ComponentProps<"ol">) {data-slot="breadcrumb-list"className={cn("text-muted-foreground flex flex-wrap items-center gap-1.5 text-sm break-words sm:gap-2.5",- className+ className,)}{...props}/>- )+ );}function BreadcrumbItem({ className, ...props }: React.ComponentProps<"li">) {@@ -28,7 +28,7 @@ function BreadcrumbItem({ className, ...props }: React.ComponentProps<"li">) {className={cn("inline-flex items-center gap-1.5", className)}{...props}/>- )+ );}function BreadcrumbLink({@@ -36,9 +36,9 @@ function BreadcrumbLink({className,...props}: React.ComponentProps<"a"> & {- asChild?: boolean+ asChild?: boolean;}) {- const Comp = asChild ? Slot : "a"+ const Comp = asChild ? Slot : "a";return (<Comp@@ -46,7 +46,7 @@ function BreadcrumbLink({className={cn("hover:text-foreground transition-colors", className)}{...props}/>- )+ );}function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) {@@ -59,7 +59,7 @@ function BreadcrumbPage({ className, ...props }: React.ComponentProps<"span">) {className={cn("text-foreground font-normal", className)}{...props}/>- )+ );}function BreadcrumbSeparator({@@ -77,7 +77,7 @@ function BreadcrumbSeparator({>{children ?? <ChevronRight />}</li>- )+ );}function BreadcrumbEllipsis({@@ -95,7 +95,7 @@ function BreadcrumbEllipsis({<MoreHorizontal className="size-4" /><span className="sr-only">More</span></span>- )+ );}export {@@ -106,4 +106,4 @@ export {BreadcrumbPage,BreadcrumbSeparator,BreadcrumbEllipsis,-}+};diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsxindex 66ab90e5..2adaf00d 100644--- a/src/components/ui/button.tsx+++ b/src/components/ui/button.tsx@@ -32,7 +32,7 @@ const buttonVariants = cva(variant: "default",size: "default",},- }+ },);function Button({diff --git a/src/components/ui/card.tsx b/src/components/ui/card.tsxindex d05bbc6c..113d66c7 100644--- a/src/components/ui/card.tsx+++ b/src/components/ui/card.tsx@@ -1,6 +1,6 @@-import * as React from "react"+import * as React from "react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Card({ className, ...props }: React.ComponentProps<"div">) {return (@@ -8,11 +8,11 @@ function Card({ className, ...props }: React.ComponentProps<"div">) {data-slot="card"className={cn("bg-card text-card-foreground flex flex-col gap-6 rounded-xl border py-6 shadow-sm",- className+ className,)}{...props}/>- )+ );}function CardHeader({ className, ...props }: React.ComponentProps<"div">) {@@ -21,11 +21,11 @@ function CardHeader({ className, ...props }: React.ComponentProps<"div">) {data-slot="card-header"className={cn("@container/card-header grid auto-rows-min grid-rows-[auto_auto] items-start gap-1.5 px-6 has-data-[slot=card-action]:grid-cols-[1fr_auto] [.border-b]:pb-6",- className+ className,)}{...props}/>- )+ );}function CardTitle({ className, ...props }: React.ComponentProps<"div">) {@@ -35,7 +35,7 @@ function CardTitle({ className, ...props }: React.ComponentProps<"div">) {className={cn("leading-none font-semibold", className)}{...props}/>- )+ );}function CardDescription({ className, ...props }: React.ComponentProps<"div">) {@@ -45,7 +45,7 @@ function CardDescription({ className, ...props }: React.ComponentProps<"div">) {className={cn("text-muted-foreground text-sm", className)}{...props}/>- )+ );}function CardAction({ className, ...props }: React.ComponentProps<"div">) {@@ -54,11 +54,11 @@ function CardAction({ className, ...props }: React.ComponentProps<"div">) {data-slot="card-action"className={cn("col-start-2 row-span-2 row-start-1 self-start justify-self-end",- className+ className,)}{...props}/>- )+ );}function CardContent({ className, ...props }: React.ComponentProps<"div">) {@@ -68,7 +68,7 @@ function CardContent({ className, ...props }: React.ComponentProps<"div">) {className={cn("px-6", className)}{...props}/>- )+ );}function CardFooter({ className, ...props }: React.ComponentProps<"div">) {@@ -78,7 +78,7 @@ function CardFooter({ className, ...props }: React.ComponentProps<"div">) {className={cn("flex items-center px-6 [.border-t]:pt-6", className)}{...props}/>- )+ );}export {@@ -89,4 +89,4 @@ export {CardAction,CardDescription,CardContent,-}+};diff --git a/src/components/ui/checkbox.tsx b/src/components/ui/checkbox.tsxindex defeb01f..29c5f2ed 100644--- a/src/components/ui/checkbox.tsx+++ b/src/components/ui/checkbox.tsx@@ -1,8 +1,8 @@-import * as React from "react"-import * as CheckboxPrimitive from "@radix-ui/react-checkbox"-import { CheckIcon } from "lucide-react"+import * as React from "react";+import * as CheckboxPrimitive from "@radix-ui/react-checkbox";+import { CheckIcon } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Checkbox({className,@@ -13,7 +13,7 @@ function Checkbox({data-slot="checkbox"className={cn("peer border-input dark:bg-input/30 data-[state=checked]:bg-primary data-[state=checked]:text-primary-foreground dark:data-[state=checked]:bg-primary data-[state=checked]:border-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive size-4 shrink-0 rounded-[4px] border shadow-xs transition-shadow outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",- className+ className,)}{...props}>@@ -24,7 +24,7 @@ function Checkbox({<CheckIcon className="size-3.5" /></CheckboxPrimitive.Indicator></CheckboxPrimitive.Root>- )+ );}-export { Checkbox }+export { Checkbox };diff --git a/src/components/ui/command.tsx b/src/components/ui/command.tsxindex 5360f6db..8afbb0cc 100644--- a/src/components/ui/command.tsx+++ b/src/components/ui/command.tsx@@ -1,15 +1,15 @@-import * as React from "react"-import { Command as CommandPrimitive } from "cmdk"-import { SearchIcon } from "lucide-react"+import * as React from "react";+import { Command as CommandPrimitive } from "cmdk";+import { SearchIcon } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";import {Dialog,DialogContent,DialogDescription,DialogHeader,DialogTitle,-} from "@/components/ui/dialog"+} from "@/components/ui/dialog";function Command({className,@@ -20,11 +20,11 @@ function Command({data-slot="command"className={cn("bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md",- className+ className,)}{...props}/>- )+ );}function CommandDialog({@@ -33,8 +33,8 @@ function CommandDialog({children,...props}: React.ComponentProps<typeof Dialog> & {- title?: string- description?: string+ title?: string;+ description?: string;}) {return (<Dialog {...props}>@@ -48,7 +48,7 @@ function CommandDialog({</Command></DialogContent></Dialog>- )+ );}function CommandInput({@@ -65,12 +65,12 @@ function CommandInput({data-slot="command-input"className={cn("placeholder:text-muted-foreground flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-hidden disabled:cursor-not-allowed disabled:opacity-50",- className+ className,)}{...props}/></div>- )+ );}function CommandList({@@ -82,11 +82,11 @@ function CommandList({data-slot="command-list"className={cn("max-h-[300px] scroll-py-1 overflow-x-hidden overflow-y-auto",- className+ className,)}{...props}/>- )+ );}function CommandEmpty({@@ -98,7 +98,7 @@ function CommandEmpty({className="py-6 text-center text-sm"{...props}/>- )+ );}function CommandGroup({@@ -110,11 +110,11 @@ function CommandGroup({data-slot="command-group"className={cn("text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden p-1 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium",- className+ className,)}{...props}/>- )+ );}function CommandSeparator({@@ -127,7 +127,7 @@ function CommandSeparator({className={cn("bg-border -mx-1 h-px", className)}{...props}/>- )+ );}function CommandItem({@@ -139,11 +139,11 @@ function CommandItem({data-slot="command-item"className={cn("data-[selected=true]:bg-accent data-[selected=true]:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled=true]:pointer-events-none data-[disabled=true]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",- className+ className,)}{...props}/>- )+ );}function CommandShortcut({@@ -155,11 +155,11 @@ function CommandShortcut({data-slot="command-shortcut"className={cn("text-muted-foreground ml-auto text-xs tracking-widest",- className+ className,)}{...props}/>- )+ );}export {@@ -172,4 +172,4 @@ export {CommandItem,CommandShortcut,CommandSeparator,-}+};diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsxindex 981e999f..3b37abd1 100644--- a/src/components/ui/dialog.tsx+++ b/src/components/ui/dialog.tsx@@ -1,31 +1,31 @@-import * as React from "react"-import * as DialogPrimitive from "@radix-ui/react-dialog"-import { XIcon } from "lucide-react"+import * as React from "react";+import * as DialogPrimitive from "@radix-ui/react-dialog";+import { XIcon } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Dialog({...props}: React.ComponentProps<typeof DialogPrimitive.Root>) {- return <DialogPrimitive.Root data-slot="dialog" {...props} />+ return <DialogPrimitive.Root data-slot="dialog" {...props} />;}function DialogTrigger({...props}: React.ComponentProps<typeof DialogPrimitive.Trigger>) {- return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />+ return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;}function DialogPortal({...props}: React.ComponentProps<typeof DialogPrimitive.Portal>) {- return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />+ return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;}function DialogClose({...props}: React.ComponentProps<typeof DialogPrimitive.Close>) {- return <DialogPrimitive.Close data-slot="dialog-close" {...props} />+ return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;}function DialogOverlay({@@ -37,11 +37,11 @@ function DialogOverlay({data-slot="dialog-overlay"className={cn("data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",- className+ className,)}{...props}/>- )+ );}function DialogContent({@@ -56,7 +56,7 @@ function DialogContent({data-slot="dialog-content"className={cn("bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",- className+ className,)}{...props}>@@ -67,7 +67,7 @@ function DialogContent({</DialogPrimitive.Close></DialogPrimitive.Content></DialogPortal>- )+ );}function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {@@ -77,7 +77,7 @@ function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {className={cn("flex flex-col gap-2 text-center sm:text-left", className)}{...props}/>- )+ );}function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {@@ -86,11 +86,11 @@ function DialogFooter({ className, ...props }: React.ComponentProps<"div">) {data-slot="dialog-footer"className={cn("flex flex-col-reverse gap-2 sm:flex-row sm:justify-end",- className+ className,)}{...props}/>- )+ );}function DialogTitle({@@ -103,7 +103,7 @@ function DialogTitle({className={cn("text-lg leading-none font-semibold", className)}{...props}/>- )+ );}function DialogDescription({@@ -116,7 +116,7 @@ function DialogDescription({className={cn("text-muted-foreground text-sm", className)}{...props}/>- )+ );}export {@@ -130,4 +130,4 @@ export {DialogPortal,DialogTitle,DialogTrigger,-}+};diff --git a/src/components/ui/drawer.tsx b/src/components/ui/drawer.tsxindex 869955fc..d0c72ec5 100644--- a/src/components/ui/drawer.tsx+++ b/src/components/ui/drawer.tsx@@ -1,30 +1,30 @@-import * as React from "react"-import { Drawer as DrawerPrimitive } from "vaul"+import * as React from "react";+import { Drawer as DrawerPrimitive } from "vaul";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Drawer({...props}: React.ComponentProps<typeof DrawerPrimitive.Root>) {- return <DrawerPrimitive.Root data-slot="drawer" {...props} />+ return <DrawerPrimitive.Root data-slot="drawer" {...props} />;}function DrawerTrigger({...props}: React.ComponentProps<typeof DrawerPrimitive.Trigger>) {- return <DrawerPrimitive.Trigger data-slot="drawer-trigger" {...props} />+ return <DrawerPrimitive.Trigger data-slot="drawer-trigger" {...props} />;}function DrawerPortal({...props}: React.ComponentProps<typeof DrawerPrimitive.Portal>) {- return <DrawerPrimitive.Portal data-slot="drawer-portal" {...props} />+ return <DrawerPrimitive.Portal data-slot="drawer-portal" {...props} />;}function DrawerClose({...props}: React.ComponentProps<typeof DrawerPrimitive.Close>) {- return <DrawerPrimitive.Close data-slot="drawer-close" {...props} />+ return <DrawerPrimitive.Close data-slot="drawer-close" {...props} />;}function DrawerOverlay({@@ -36,11 +36,11 @@ function DrawerOverlay({data-slot="drawer-overlay"className={cn("data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",- className+ className,)}{...props}/>- )+ );}function DrawerContent({@@ -59,7 +59,7 @@ function DrawerContent({"data-[vaul-drawer-direction=bottom]:inset-x-0 data-[vaul-drawer-direction=bottom]:bottom-0 data-[vaul-drawer-direction=bottom]:mt-24 data-[vaul-drawer-direction=bottom]:max-h-[80vh] data-[vaul-drawer-direction=bottom]:rounded-t-lg data-[vaul-drawer-direction=bottom]:border-t","data-[vaul-drawer-direction=right]:inset-y-0 data-[vaul-drawer-direction=right]:right-0 data-[vaul-drawer-direction=right]:w-3/4 data-[vaul-drawer-direction=right]:border-l data-[vaul-drawer-direction=right]:sm:max-w-sm","data-[vaul-drawer-direction=left]:inset-y-0 data-[vaul-drawer-direction=left]:left-0 data-[vaul-drawer-direction=left]:w-3/4 data-[vaul-drawer-direction=left]:border-r data-[vaul-drawer-direction=left]:sm:max-w-sm",- className+ className,)}{...props}>@@ -67,7 +67,7 @@ function DrawerContent({{children}</DrawerPrimitive.Content></DrawerPortal>- )+ );}function DrawerHeader({ className, ...props }: React.ComponentProps<"div">) {@@ -76,11 +76,11 @@ function DrawerHeader({ className, ...props }: React.ComponentProps<"div">) {data-slot="drawer-header"className={cn("flex flex-col gap-0.5 p-4 group-data-[vaul-drawer-direction=bottom]/drawer-content:text-center group-data-[vaul-drawer-direction=top]/drawer-content:text-center md:gap-1.5 md:text-left",- className+ className,)}{...props}/>- )+ );}function DrawerFooter({ className, ...props }: React.ComponentProps<"div">) {@@ -90,7 +90,7 @@ function DrawerFooter({ className, ...props }: React.ComponentProps<"div">) {className={cn("mt-auto flex flex-col gap-2 p-4", className)}{...props}/>- )+ );}function DrawerTitle({@@ -103,7 +103,7 @@ function DrawerTitle({className={cn("text-foreground font-semibold", className)}{...props}/>- )+ );}function DrawerDescription({@@ -116,7 +116,7 @@ function DrawerDescription({className={cn("text-muted-foreground text-sm", className)}{...props}/>- )+ );}export {@@ -130,4 +130,4 @@ export {DrawerFooter,DrawerTitle,DrawerDescription,-}+};diff --git a/src/components/ui/dropdown-menu.tsx b/src/components/ui/dropdown-menu.tsxindex 0d6741b4..fe5ed99e 100644--- a/src/components/ui/dropdown-menu.tsx+++ b/src/components/ui/dropdown-menu.tsx@@ -1,13 +1,13 @@-import * as React from "react"-import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu"-import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react"+import * as React from "react";+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";+import { CheckIcon, ChevronRightIcon, CircleIcon } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function DropdownMenu({...props}: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {- return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />+ return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />;}function DropdownMenuPortal({@@ -15,7 +15,7 @@ function DropdownMenuPortal({}: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>) {return (<DropdownMenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />- )+ );}function DropdownMenuTrigger({@@ -26,7 +26,7 @@ function DropdownMenuTrigger({data-slot="dropdown-menu-trigger"{...props}/>- )+ );}function DropdownMenuContent({@@ -41,12 +41,12 @@ function DropdownMenuContent({sideOffset={sideOffset}className={cn("bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 max-h-(--radix-dropdown-menu-content-available-height) min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border p-1 shadow-md",- className+ className,)}{...props}/></DropdownMenuPrimitive.Portal>- )+ );}function DropdownMenuGroup({@@ -54,7 +54,7 @@ function DropdownMenuGroup({}: React.ComponentProps<typeof DropdownMenuPrimitive.Group>) {return (<DropdownMenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />- )+ );}function DropdownMenuItem({@@ -63,8 +63,8 @@ function DropdownMenuItem({variant = "default",...props}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {- inset?: boolean- variant?: "default" | "destructive"+ inset?: boolean;+ variant?: "default" | "destructive";}) {return (<DropdownMenuPrimitive.Item@@ -73,11 +73,11 @@ function DropdownMenuItem({data-variant={variant}className={cn("focus:bg-accent focus:text-accent-foreground data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 data-[variant=destructive]:focus:text-destructive data-[variant=destructive]:*:[svg]:!text-destructive [&_svg:not([class*='text-'])]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",- className+ className,)}{...props}/>- )+ );}function DropdownMenuCheckboxItem({@@ -91,7 +91,7 @@ function DropdownMenuCheckboxItem({data-slot="dropdown-menu-checkbox-item"className={cn("focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",- className+ className,)}checked={checked}{...props}@@ -103,7 +103,7 @@ function DropdownMenuCheckboxItem({</span>{children}</DropdownMenuPrimitive.CheckboxItem>- )+ );}function DropdownMenuRadioGroup({@@ -114,7 +114,7 @@ function DropdownMenuRadioGroup({data-slot="dropdown-menu-radio-group"{...props}/>- )+ );}function DropdownMenuRadioItem({@@ -127,7 +127,7 @@ function DropdownMenuRadioItem({data-slot="dropdown-menu-radio-item"className={cn("focus:bg-accent focus:text-accent-foreground relative flex cursor-default items-center gap-2 rounded-sm py-1.5 pr-2 pl-8 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",- className+ className,)}{...props}>@@ -138,7 +138,7 @@ function DropdownMenuRadioItem({</span>{children}</DropdownMenuPrimitive.RadioItem>- )+ );}function DropdownMenuLabel({@@ -146,7 +146,7 @@ function DropdownMenuLabel({inset,...props}: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {- inset?: boolean+ inset?: boolean;}) {return (<DropdownMenuPrimitive.Label@@ -154,11 +154,11 @@ function DropdownMenuLabel({data-inset={inset}className={cn("px-2 py-1.5 text-sm font-medium data-[inset]:pl-8",- className+ className,)}{...props}/>- )+ );}function DropdownMenuSeparator({@@ -171,7 +171,7 @@ function DropdownMenuSeparator({className={cn("bg-border -mx-1 my-1 h-px", className)}{...props}/>- )+ );}function DropdownMenuShortcut({@@ -183,17 +183,17 @@ function DropdownMenuShortcut({data-slot="dropdown-menu-shortcut"className={cn("text-muted-foreground ml-auto text-xs tracking-widest",- className+ className,)}{...props}/>- )+ );}function DropdownMenuSub({...props}: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {- return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />+ return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;}function DropdownMenuSubTrigger({@@ -202,7 +202,7 @@ function DropdownMenuSubTrigger({children,...props}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {- inset?: boolean+ inset?: boolean;}) {return (<DropdownMenuPrimitive.SubTrigger@@ -210,14 +210,14 @@ function DropdownMenuSubTrigger({data-inset={inset}className={cn("focus:bg-accent focus:text-accent-foreground data-[state=open]:bg-accent data-[state=open]:text-accent-foreground flex cursor-default items-center rounded-sm px-2 py-1.5 text-sm outline-hidden select-none data-[inset]:pl-8",- className+ className,)}{...props}>{children}<ChevronRightIcon className="ml-auto size-4" /></DropdownMenuPrimitive.SubTrigger>- )+ );}function DropdownMenuSubContent({@@ -229,11 +229,11 @@ function DropdownMenuSubContent({data-slot="dropdown-menu-sub-content"className={cn("bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 min-w-[8rem] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-md border p-1 shadow-lg",- className+ className,)}{...props}/>- )+ );}export {@@ -252,4 +252,4 @@ export {DropdownMenuSub,DropdownMenuSubTrigger,DropdownMenuSubContent,-}+};diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsxindex 03295ca6..b1a060f5 100644--- a/src/components/ui/input.tsx+++ b/src/components/ui/input.tsx@@ -1,6 +1,6 @@-import * as React from "react"+import * as React from "react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Input({ className, type, ...props }: React.ComponentProps<"input">) {return (@@ -11,11 +11,11 @@ function Input({ className, type, ...props }: React.ComponentProps<"input">) {"file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm","focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]","aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",- className+ className,)}{...props}/>- )+ );}-export { Input }+export { Input };diff --git a/src/components/ui/label.tsx b/src/components/ui/label.tsxindex fb5fbc3e..79d77b4b 100644--- a/src/components/ui/label.tsx+++ b/src/components/ui/label.tsx@@ -1,9 +1,9 @@-"use client"+"use client";-import * as React from "react"-import * as LabelPrimitive from "@radix-ui/react-label"+import * as React from "react";+import * as LabelPrimitive from "@radix-ui/react-label";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Label({className,@@ -14,11 +14,11 @@ function Label({data-slot="label"className={cn("flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50",- className+ className,)}{...props}/>- )+ );}-export { Label }+export { Label };diff --git a/src/components/ui/navigation-menu.tsx b/src/components/ui/navigation-menu.tsxindex 1199945c..0bcc7843 100644--- a/src/components/ui/navigation-menu.tsx+++ b/src/components/ui/navigation-menu.tsx@@ -1,9 +1,9 @@-import * as React from "react"-import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu"-import { cva } from "class-variance-authority"-import { ChevronDownIcon } from "lucide-react"+import * as React from "react";+import * as NavigationMenuPrimitive from "@radix-ui/react-navigation-menu";+import { cva } from "class-variance-authority";+import { ChevronDownIcon } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function NavigationMenu({className,@@ -11,7 +11,7 @@ function NavigationMenu({viewport = true,...props}: React.ComponentProps<typeof NavigationMenuPrimitive.Root> & {- viewport?: boolean+ viewport?: boolean;}) {return (<NavigationMenuPrimitive.Root@@ -19,14 +19,14 @@ function NavigationMenu({data-viewport={viewport}className={cn("group/navigation-menu relative flex max-w-max flex-1 items-center justify-center",- className+ className,)}{...props}>{children}{viewport && <NavigationMenuViewport />}</NavigationMenuPrimitive.Root>- )+ );}function NavigationMenuList({@@ -38,11 +38,11 @@ function NavigationMenuList({data-slot="navigation-menu-list"className={cn("group flex flex-1 list-none items-center justify-center gap-1",- className+ className,)}{...props}/>- )+ );}function NavigationMenuItem({@@ -55,12 +55,12 @@ function NavigationMenuItem({className={cn("relative", className)}{...props}/>- )+ );}const navigationMenuTriggerStyle = cva(- "group inline-flex h-9 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=open]:hover:bg-accent data-[state=open]:text-accent-foreground data-[state=open]:focus:bg-accent data-[state=open]:bg-accent/50 focus-visible:ring-ring/50 outline-none transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1"-)+ "group inline-flex h-9 w-max items-center justify-center rounded-md bg-background px-4 py-2 text-sm font-medium hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground disabled:pointer-events-none disabled:opacity-50 data-[state=open]:hover:bg-accent data-[state=open]:text-accent-foreground data-[state=open]:focus:bg-accent data-[state=open]:bg-accent/50 focus-visible:ring-ring/50 outline-none transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1",+);function NavigationMenuTrigger({className,@@ -79,7 +79,7 @@ function NavigationMenuTrigger({aria-hidden="true"/></NavigationMenuPrimitive.Trigger>- )+ );}function NavigationMenuContent({@@ -92,11 +92,11 @@ function NavigationMenuContent({className={cn("data-[motion^=from-]:animate-in data-[motion^=to-]:animate-out data-[motion^=from-]:fade-in data-[motion^=to-]:fade-out data-[motion=from-end]:slide-in-from-right-52 data-[motion=from-start]:slide-in-from-left-52 data-[motion=to-end]:slide-out-to-right-52 data-[motion=to-start]:slide-out-to-left-52 top-0 left-0 w-full p-2 pr-2.5 md:absolute md:w-auto","group-data-[viewport=false]/navigation-menu:bg-popover group-data-[viewport=false]/navigation-menu:text-popover-foreground group-data-[viewport=false]/navigation-menu:data-[state=open]:animate-in group-data-[viewport=false]/navigation-menu:data-[state=closed]:animate-out group-data-[viewport=false]/navigation-menu:data-[state=closed]:zoom-out-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:zoom-in-95 group-data-[viewport=false]/navigation-menu:data-[state=open]:fade-in-0 group-data-[viewport=false]/navigation-menu:data-[state=closed]:fade-out-0 group-data-[viewport=false]/navigation-menu:top-full group-data-[viewport=false]/navigation-menu:mt-1.5 group-data-[viewport=false]/navigation-menu:overflow-hidden group-data-[viewport=false]/navigation-menu:rounded-md group-data-[viewport=false]/navigation-menu:border group-data-[viewport=false]/navigation-menu:shadow group-data-[viewport=false]/navigation-menu:duration-200 **:data-[slot=navigation-menu-link]:focus:ring-0 **:data-[slot=navigation-menu-link]:focus:outline-none",- className+ className,)}{...props}/>- )+ );}function NavigationMenuViewport({@@ -106,19 +106,19 @@ function NavigationMenuViewport({return (<divclassName={cn(- "absolute top-full left-0 isolate z-50 flex justify-center"+ "absolute top-full left-0 isolate z-50 flex justify-center",)}><NavigationMenuPrimitive.Viewportdata-slot="navigation-menu-viewport"className={cn("origin-top-center bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-90 relative mt-1.5 h-[var(--radix-navigation-menu-viewport-height)] w-full overflow-hidden rounded-md border shadow md:w-[var(--radix-navigation-menu-viewport-width)]",- className+ className,)}{...props}/></div>- )+ );}function NavigationMenuLink({@@ -130,11 +130,11 @@ function NavigationMenuLink({data-slot="navigation-menu-link"className={cn("data-[active=true]:focus:bg-accent data-[active=true]:hover:bg-accent data-[active=true]:bg-accent/50 data-[active=true]:text-accent-foreground hover:bg-accent hover:text-accent-foreground focus:bg-accent focus:text-accent-foreground focus-visible:ring-ring/50 [&_svg:not([class*='text-'])]:text-muted-foreground flex flex-col gap-1 rounded-sm p-2 text-sm transition-all outline-none focus-visible:ring-[3px] focus-visible:outline-1 [&_svg:not([class*='size-'])]:size-4",- className+ className,)}{...props}/>- )+ );}function NavigationMenuIndicator({@@ -146,13 +146,13 @@ function NavigationMenuIndicator({data-slot="navigation-menu-indicator"className={cn("data-[state=visible]:animate-in data-[state=hidden]:animate-out data-[state=hidden]:fade-out data-[state=visible]:fade-in top-full z-[1] flex h-1.5 items-end justify-center overflow-hidden",- className+ className,)}{...props}><div className="bg-border relative top-[60%] h-2 w-2 rotate-45 rounded-tl-sm shadow-md" /></NavigationMenuPrimitive.Indicator>- )+ );}export {@@ -165,4 +165,4 @@ export {NavigationMenuIndicator,NavigationMenuViewport,navigationMenuTriggerStyle,-}+};diff --git a/src/components/ui/pagination.tsx b/src/components/ui/pagination.tsxindex 0d185410..1621cf3b 100644--- a/src/components/ui/pagination.tsx+++ b/src/components/ui/pagination.tsx@@ -1,12 +1,12 @@-import * as React from "react"+import * as React from "react";import {ChevronLeftIcon,ChevronRightIcon,MoreHorizontalIcon,-} from "lucide-react"+} from "lucide-react";-import { cn } from "@/lib/utils"-import { Button, buttonVariants } from "@/components/ui/button"+import { cn } from "@/lib/utils";+import { Button, buttonVariants } from "@/components/ui/button";function Pagination({ className, ...props }: React.ComponentProps<"nav">) {return (@@ -17,7 +17,7 @@ function Pagination({ className, ...props }: React.ComponentProps<"nav">) {className={cn("mx-auto flex w-full justify-center", className)}{...props}/>- )+ );}function PaginationContent({@@ -30,17 +30,17 @@ function PaginationContent({className={cn("flex flex-row items-center gap-1", className)}{...props}/>- )+ );}function PaginationItem({ ...props }: React.ComponentProps<"li">) {- return <li data-slot="pagination-item" {...props} />+ return <li data-slot="pagination-item" {...props} />;}type PaginationLinkProps = {- isActive?: boolean+ isActive?: boolean;} & Pick<React.ComponentProps<typeof Button>, "size"> &- React.ComponentProps<"a">+ React.ComponentProps<"a">;function PaginationLink({className,@@ -58,11 +58,11 @@ function PaginationLink({variant: isActive ? "outline" : "ghost",size,}),- className+ className,)}{...props}/>- )+ );}function PaginationPrevious({@@ -79,7 +79,7 @@ function PaginationPrevious({<ChevronLeftIcon /><span className="hidden sm:block">Previous</span></PaginationLink>- )+ );}function PaginationNext({@@ -96,7 +96,7 @@ function PaginationNext({<span className="hidden sm:block">Next</span><ChevronRightIcon /></PaginationLink>- )+ );}function PaginationEllipsis({@@ -113,7 +113,7 @@ function PaginationEllipsis({<MoreHorizontalIcon className="size-4" /><span className="sr-only">More pages</span></span>- )+ );}export {@@ -124,4 +124,4 @@ export {PaginationPrevious,PaginationNext,PaginationEllipsis,-}+};diff --git a/src/components/ui/popover.tsx b/src/components/ui/popover.tsxindex 6d51b6ce..ef5bfd04 100644--- a/src/components/ui/popover.tsx+++ b/src/components/ui/popover.tsx@@ -1,18 +1,18 @@-import * as React from "react"-import * as PopoverPrimitive from "@radix-ui/react-popover"+import * as React from "react";+import * as PopoverPrimitive from "@radix-ui/react-popover";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Popover({...props}: React.ComponentProps<typeof PopoverPrimitive.Root>) {- return <PopoverPrimitive.Root data-slot="popover" {...props} />+ return <PopoverPrimitive.Root data-slot="popover" {...props} />;}function PopoverTrigger({...props}: React.ComponentProps<typeof PopoverPrimitive.Trigger>) {- return <PopoverPrimitive.Trigger data-slot="popover-trigger" {...props} />+ return <PopoverPrimitive.Trigger data-slot="popover-trigger" {...props} />;}function PopoverContent({@@ -29,18 +29,18 @@ function PopoverContent({sideOffset={sideOffset}className={cn("bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 origin-(--radix-popover-content-transform-origin) rounded-md border p-4 shadow-md outline-hidden",- className+ className,)}{...props}/></PopoverPrimitive.Portal>- )+ );}function PopoverAnchor({...props}: React.ComponentProps<typeof PopoverPrimitive.Anchor>) {- return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />+ return <PopoverPrimitive.Anchor data-slot="popover-anchor" {...props} />;}-export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor }+export { Popover, PopoverTrigger, PopoverContent, PopoverAnchor };diff --git a/src/components/ui/progress.tsx b/src/components/ui/progress.tsxindex 10af7e63..d683666e 100644--- a/src/components/ui/progress.tsx+++ b/src/components/ui/progress.tsx@@ -1,7 +1,7 @@-import * as React from "react"-import * as ProgressPrimitive from "@radix-ui/react-progress"+import * as React from "react";+import * as ProgressPrimitive from "@radix-ui/react-progress";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Progress({className,@@ -13,7 +13,7 @@ function Progress({data-slot="progress"className={cn("bg-primary/20 relative h-2 w-full overflow-hidden rounded-full",- className+ className,)}{...props}>@@ -23,7 +23,7 @@ function Progress({style={{ transform: `translateX(-${100 - (value || 0)}%)` }}/></ProgressPrimitive.Root>- )+ );}-export { Progress }+export { Progress };diff --git a/src/components/ui/radio-group.tsx b/src/components/ui/radio-group.tsxindex dc682eb9..f2899c81 100644--- a/src/components/ui/radio-group.tsx+++ b/src/components/ui/radio-group.tsx@@ -1,8 +1,8 @@-import * as React from "react"-import * as RadioGroupPrimitive from "@radix-ui/react-radio-group"-import { CircleIcon } from "lucide-react"+import * as React from "react";+import * as RadioGroupPrimitive from "@radix-ui/react-radio-group";+import { CircleIcon } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function RadioGroup({className,@@ -14,7 +14,7 @@ function RadioGroup({className={cn("grid gap-3", className)}{...props}/>- )+ );}function RadioGroupItem({@@ -26,7 +26,7 @@ function RadioGroupItem({data-slot="radio-group-item"className={cn("border-input text-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 aspect-square size-4 shrink-0 rounded-full border shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",- className+ className,)}{...props}>@@ -37,7 +37,7 @@ function RadioGroupItem({<CircleIcon className="fill-primary absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2" /></RadioGroupPrimitive.Indicator></RadioGroupPrimitive.Item>- )+ );}-export { RadioGroup, RadioGroupItem }+export { RadioGroup, RadioGroupItem };diff --git a/src/components/ui/select.tsx b/src/components/ui/select.tsxindex 51f466ec..0c883e37 100644--- a/src/components/ui/select.tsx+++ b/src/components/ui/select.tsx@@ -1,25 +1,25 @@-import * as React from "react"-import * as SelectPrimitive from "@radix-ui/react-select"-import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react"+import * as React from "react";+import * as SelectPrimitive from "@radix-ui/react-select";+import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Select({...props}: React.ComponentProps<typeof SelectPrimitive.Root>) {- return <SelectPrimitive.Root data-slot="select" {...props} />+ return <SelectPrimitive.Root data-slot="select" {...props} />;}function SelectGroup({...props}: React.ComponentProps<typeof SelectPrimitive.Group>) {- return <SelectPrimitive.Group data-slot="select-group" {...props} />+ return <SelectPrimitive.Group data-slot="select-group" {...props} />;}function SelectValue({...props}: React.ComponentProps<typeof SelectPrimitive.Value>) {- return <SelectPrimitive.Value data-slot="select-value" {...props} />+ return <SelectPrimitive.Value data-slot="select-value" {...props} />;}function SelectTrigger({@@ -28,7 +28,7 @@ function SelectTrigger({children,...props}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {- size?: "sm" | "default"+ size?: "sm" | "default";}) {return (<SelectPrimitive.Trigger@@ -36,7 +36,7 @@ function SelectTrigger({data-size={size}className={cn("border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",- className+ className,)}{...props}>@@ -45,7 +45,7 @@ function SelectTrigger({<ChevronDownIcon className="size-4 opacity-50" /></SelectPrimitive.Icon></SelectPrimitive.Trigger>- )+ );}function SelectContent({@@ -62,7 +62,7 @@ function SelectContent({"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",position === "popper" &&"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",- className+ className,)}position={position}{...props}@@ -72,7 +72,7 @@ function SelectContent({className={cn("p-1",position === "popper" &&- "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1"+ "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1",)}>{children}@@ -80,7 +80,7 @@ function SelectContent({<SelectScrollDownButton /></SelectPrimitive.Content></SelectPrimitive.Portal>- )+ );}function SelectLabel({@@ -93,7 +93,7 @@ function SelectLabel({className={cn("text-muted-foreground px-2 py-1.5 text-xs", className)}{...props}/>- )+ );}function SelectItem({@@ -106,7 +106,7 @@ function SelectItem({data-slot="select-item"className={cn("focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",- className+ className,)}{...props}>@@ -117,7 +117,7 @@ function SelectItem({</span><SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText></SelectPrimitive.Item>- )+ );}function SelectSeparator({@@ -130,7 +130,7 @@ function SelectSeparator({className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)}{...props}/>- )+ );}function SelectScrollUpButton({@@ -142,13 +142,13 @@ function SelectScrollUpButton({data-slot="select-scroll-up-button"className={cn("flex cursor-default items-center justify-center py-1",- className+ className,)}{...props}><ChevronUpIcon className="size-4" /></SelectPrimitive.ScrollUpButton>- )+ );}function SelectScrollDownButton({@@ -160,13 +160,13 @@ function SelectScrollDownButton({data-slot="select-scroll-down-button"className={cn("flex cursor-default items-center justify-center py-1",- className+ className,)}{...props}><ChevronDownIcon className="size-4" /></SelectPrimitive.ScrollDownButton>- )+ );}export {@@ -180,4 +180,4 @@ export {SelectSeparator,SelectTrigger,SelectValue,-}+};diff --git a/src/components/ui/separator.tsx b/src/components/ui/separator.tsxindex 3cf4f89b..ccb63c04 100644--- a/src/components/ui/separator.tsx+++ b/src/components/ui/separator.tsx@@ -1,7 +1,7 @@-import * as React from "react"-import * as SeparatorPrimitive from "@radix-ui/react-separator"+import * as React from "react";+import * as SeparatorPrimitive from "@radix-ui/react-separator";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Separator({className,@@ -16,11 +16,11 @@ function Separator({orientation={orientation}className={cn("bg-border shrink-0 data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px",- className+ className,)}{...props}/>- )+ );}-export { Separator }+export { Separator };diff --git a/src/components/ui/sheet.tsx b/src/components/ui/sheet.tsxindex 6906f5b2..609cff0e 100644--- a/src/components/ui/sheet.tsx+++ b/src/components/ui/sheet.tsx@@ -1,29 +1,29 @@-import * as React from "react"-import * as SheetPrimitive from "@radix-ui/react-dialog"-import { XIcon } from "lucide-react"+import * as React from "react";+import * as SheetPrimitive from "@radix-ui/react-dialog";+import { XIcon } from "lucide-react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Sheet({ ...props }: React.ComponentProps<typeof SheetPrimitive.Root>) {- return <SheetPrimitive.Root data-slot="sheet" {...props} />+ return <SheetPrimitive.Root data-slot="sheet" {...props} />;}function SheetTrigger({...props}: React.ComponentProps<typeof SheetPrimitive.Trigger>) {- return <SheetPrimitive.Trigger data-slot="sheet-trigger" {...props} />+ return <SheetPrimitive.Trigger data-slot="sheet-trigger" {...props} />;}function SheetClose({...props}: React.ComponentProps<typeof SheetPrimitive.Close>) {- return <SheetPrimitive.Close data-slot="sheet-close" {...props} />+ return <SheetPrimitive.Close data-slot="sheet-close" {...props} />;}function SheetPortal({...props}: React.ComponentProps<typeof SheetPrimitive.Portal>) {- return <SheetPrimitive.Portal data-slot="sheet-portal" {...props} />+ return <SheetPrimitive.Portal data-slot="sheet-portal" {...props} />;}function SheetOverlay({@@ -35,11 +35,11 @@ function SheetOverlay({data-slot="sheet-overlay"className={cn("data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/50",- className+ className,)}{...props}/>- )+ );}function SheetContent({@@ -48,7 +48,7 @@ function SheetContent({side = "right",...props}: React.ComponentProps<typeof SheetPrimitive.Content> & {- side?: "top" | "right" | "bottom" | "left"+ side?: "top" | "right" | "bottom" | "left";}) {return (<SheetPortal>@@ -65,7 +65,7 @@ function SheetContent({"data-[state=closed]:slide-out-to-top data-[state=open]:slide-in-from-top inset-x-0 top-0 h-auto border-b",side === "bottom" &&"data-[state=closed]:slide-out-to-bottom data-[state=open]:slide-in-from-bottom inset-x-0 bottom-0 h-auto border-t",- className+ className,)}{...props}>@@ -76,7 +76,7 @@ function SheetContent({</SheetPrimitive.Close></SheetPrimitive.Content></SheetPortal>- )+ );}function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {@@ -86,7 +86,7 @@ function SheetHeader({ className, ...props }: React.ComponentProps<"div">) {className={cn("flex flex-col gap-1.5 p-4", className)}{...props}/>- )+ );}function SheetFooter({ className, ...props }: React.ComponentProps<"div">) {@@ -96,7 +96,7 @@ function SheetFooter({ className, ...props }: React.ComponentProps<"div">) {className={cn("mt-auto flex flex-col gap-2 p-4", className)}{...props}/>- )+ );}function SheetTitle({@@ -109,7 +109,7 @@ function SheetTitle({className={cn("text-foreground font-semibold", className)}{...props}/>- )+ );}function SheetDescription({@@ -122,7 +122,7 @@ function SheetDescription({className={cn("text-muted-foreground text-sm", className)}{...props}/>- )+ );}export {@@ -134,4 +134,4 @@ export {SheetFooter,SheetTitle,SheetDescription,-}+};diff --git a/src/components/ui/sidebar.tsx b/src/components/ui/sidebar.tsxindex 4fd907c0..ca2d372f 100644--- a/src/components/ui/sidebar.tsx+++ b/src/components/ui/sidebar.tsx@@ -83,7 +83,7 @@ function SidebarProvider({// This sets the cookie to keep the sidebar state.document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE}`;},- [setOpenProp, open]+ [setOpenProp, open],);// Helper to toggle the sidebar.@@ -121,7 +121,7 @@ function SidebarProvider({setOpenMobile,toggleSidebar,}),- [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar]+ [state, open, setOpen, isMobile, openMobile, setOpenMobile, toggleSidebar],);return (@@ -138,7 +138,7 @@ function SidebarProvider({}className={cn("group/sidebar-wrapper has-data-[variant=inset]:bg-sidebar flex min-h-svh w-full",- className+ className,)}{...props}>@@ -169,7 +169,7 @@ function Sidebar({data-slot="sidebar"className={cn("bg-sidebar text-sidebar-foreground flex h-full w-(--sidebar-width) flex-col",- className+ className,)}{...props}>@@ -221,7 +221,7 @@ function Sidebar({"group-data-[side=right]:rotate-180",variant === "floating" || variant === "inset"? "group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4)))]"- : "group-data-[collapsible=icon]:w-(--sidebar-width-icon)"+ : "group-data-[collapsible=icon]:w-(--sidebar-width-icon)",)}/><div@@ -235,7 +235,7 @@ function Sidebar({variant === "floating" || variant === "inset"? "p-2 group-data-[collapsible=icon]:w-[calc(var(--sidebar-width-icon)+(--spacing(4))+2px)]": "group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l",- className+ className,)}{...props}>@@ -295,7 +295,7 @@ function SidebarRail({ className, ...props }: React.ComponentProps<"button">) {"hover:group-data-[collapsible=offcanvas]:bg-sidebar group-data-[collapsible=offcanvas]:translate-x-0 group-data-[collapsible=offcanvas]:after:left-full","[[data-side=left][data-collapsible=offcanvas]_&]:-right-2","[[data-side=right][data-collapsible=offcanvas]_&]:-left-2",- className+ className,)}{...props}/>@@ -309,7 +309,7 @@ function SidebarInset({ className, ...props }: React.ComponentProps<"main">) {className={cn("bg-background relative flex w-full flex-1 flex-col","md:peer-data-[variant=inset]:m-2 md:peer-data-[variant=inset]:ml-0 md:peer-data-[variant=inset]:rounded-xl md:peer-data-[variant=inset]:shadow-sm md:peer-data-[variant=inset]:peer-data-[state=collapsed]:ml-2",- className+ className,)}{...props}/>@@ -373,7 +373,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {data-sidebar="content"className={cn("flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=icon]:overflow-hidden",- className+ className,)}{...props}/>@@ -405,7 +405,7 @@ function SidebarGroupLabel({className={cn("text-sidebar-foreground/70 ring-sidebar-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0","group-data-[collapsible=icon]:-mt-8 group-data-[collapsible=icon]:opacity-0",- className+ className,)}{...props}/>@@ -428,7 +428,7 @@ function SidebarGroupAction({// Increases the hit area of the button on mobile."after:absolute after:-inset-2 md:after:hidden","group-data-[collapsible=icon]:hidden",- className+ className,)}{...props}/>@@ -490,7 +490,7 @@ const sidebarMenuButtonVariants = cva(variant: "default",size: "default",},- }+ },);function SidebarMenuButton({@@ -568,7 +568,7 @@ function SidebarMenuAction({"group-data-[collapsible=icon]:hidden",showOnHover &&"peer-data-[active=true]/menu-button:text-sidebar-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0",- className+ className,)}{...props}/>@@ -590,7 +590,7 @@ function SidebarMenuBadge({"peer-data-[size=default]/menu-button:top-1.5","peer-data-[size=lg]/menu-button:top-2.5","group-data-[collapsible=icon]:hidden",- className+ className,)}{...props}/>@@ -643,7 +643,7 @@ function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {className={cn("border-sidebar-border mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l px-2.5 py-0.5","group-data-[collapsible=icon]:hidden",- className+ className,)}{...props}/>@@ -689,7 +689,7 @@ function SidebarMenuSubButton({size === "sm" && "text-xs",size === "md" && "text-sm","group-data-[collapsible=icon]:hidden",- className+ className,)}{...props}/>diff --git a/src/components/ui/skeleton.tsx b/src/components/ui/skeleton.tsxindex 32ea0ef7..01689981 100644--- a/src/components/ui/skeleton.tsx+++ b/src/components/ui/skeleton.tsx@@ -1,4 +1,4 @@-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Skeleton({ className, ...props }: React.ComponentProps<"div">) {return (@@ -7,7 +7,7 @@ function Skeleton({ className, ...props }: React.ComponentProps<"div">) {className={cn("bg-accent animate-pulse rounded-md", className)}{...props}/>- )+ );}-export { Skeleton }+export { Skeleton };diff --git a/src/components/ui/sonner.tsx b/src/components/ui/sonner.tsxindex cd62aff2..59f94479 100644--- a/src/components/ui/sonner.tsx+++ b/src/components/ui/sonner.tsx@@ -1,8 +1,8 @@-import { useTheme } from "next-themes"-import { Toaster as Sonner, ToasterProps } from "sonner"+import { useTheme } from "next-themes";+import { Toaster as Sonner, ToasterProps } from "sonner";const Toaster = ({ ...props }: ToasterProps) => {- const { theme = "system" } = useTheme()+ const { theme = "system" } = useTheme();return (<Sonner@@ -17,7 +17,7 @@ const Toaster = ({ ...props }: ToasterProps) => {}{...props}/>- )-}+ );+};-export { Toaster }+export { Toaster };diff --git a/src/components/ui/switch.tsx b/src/components/ui/switch.tsxindex b0363e3f..a026a47c 100644--- a/src/components/ui/switch.tsx+++ b/src/components/ui/switch.tsx@@ -1,7 +1,7 @@-import * as React from "react"-import * as SwitchPrimitive from "@radix-ui/react-switch"+import * as React from "react";+import * as SwitchPrimitive from "@radix-ui/react-switch";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Switch({className,@@ -12,18 +12,18 @@ function Switch({data-slot="switch"className={cn("peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50",- className+ className,)}{...props}><SwitchPrimitive.Thumbdata-slot="switch-thumb"className={cn(- "bg-background dark:data-[state=unchecked]:bg-foreground dark:data-[state=checked]:bg-primary-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0"+ "bg-background dark:data-[state=unchecked]:bg-foreground dark:data-[state=checked]:bg-primary-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0",)}/></SwitchPrimitive.Root>- )+ );}-export { Switch }+export { Switch };diff --git a/src/components/ui/table.tsx b/src/components/ui/table.tsxindex 5513a5cd..2ad27ce8 100644--- a/src/components/ui/table.tsx+++ b/src/components/ui/table.tsx@@ -1,6 +1,6 @@-import * as React from "react"+import * as React from "react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Table({ className, ...props }: React.ComponentProps<"table">) {return (@@ -14,7 +14,7 @@ function Table({ className, ...props }: React.ComponentProps<"table">) {{...props}/></div>- )+ );}function TableHeader({ className, ...props }: React.ComponentProps<"thead">) {@@ -24,7 +24,7 @@ function TableHeader({ className, ...props }: React.ComponentProps<"thead">) {className={cn("[&_tr]:border-b", className)}{...props}/>- )+ );}function TableBody({ className, ...props }: React.ComponentProps<"tbody">) {@@ -34,7 +34,7 @@ function TableBody({ className, ...props }: React.ComponentProps<"tbody">) {className={cn("[&_tr:last-child]:border-0", className)}{...props}/>- )+ );}function TableFooter({ className, ...props }: React.ComponentProps<"tfoot">) {@@ -43,11 +43,11 @@ function TableFooter({ className, ...props }: React.ComponentProps<"tfoot">) {data-slot="table-footer"className={cn("bg-muted/50 border-t font-medium [&>tr]:last:border-b-0",- className+ className,)}{...props}/>- )+ );}function TableRow({ className, ...props }: React.ComponentProps<"tr">) {@@ -56,11 +56,11 @@ function TableRow({ className, ...props }: React.ComponentProps<"tr">) {data-slot="table-row"className={cn("hover:bg-muted/50 data-[state=selected]:bg-muted border-b transition-colors",- className+ className,)}{...props}/>- )+ );}function TableHead({ className, ...props }: React.ComponentProps<"th">) {@@ -69,11 +69,11 @@ function TableHead({ className, ...props }: React.ComponentProps<"th">) {data-slot="table-head"className={cn("text-foreground h-10 px-2 text-left align-middle font-medium whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",- className+ className,)}{...props}/>- )+ );}function TableCell({ className, ...props }: React.ComponentProps<"td">) {@@ -82,11 +82,11 @@ function TableCell({ className, ...props }: React.ComponentProps<"td">) {data-slot="table-cell"className={cn("p-2 align-middle whitespace-nowrap [&:has([role=checkbox])]:pr-0 [&>[role=checkbox]]:translate-y-[2px]",- className+ className,)}{...props}/>- )+ );}function TableCaption({@@ -99,7 +99,7 @@ function TableCaption({className={cn("text-muted-foreground mt-4 text-sm", className)}{...props}/>- )+ );}export {@@ -111,4 +111,4 @@ export {TableRow,TableCell,TableCaption,-}+};diff --git a/src/components/ui/tabs.tsx b/src/components/ui/tabs.tsxindex 3d6f3acf..46295c2f 100644--- a/src/components/ui/tabs.tsx+++ b/src/components/ui/tabs.tsx@@ -1,7 +1,7 @@-import * as React from "react"-import * as TabsPrimitive from "@radix-ui/react-tabs"+import * as React from "react";+import * as TabsPrimitive from "@radix-ui/react-tabs";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Tabs({className,@@ -13,7 +13,7 @@ function Tabs({className={cn("flex flex-col gap-2", className)}{...props}/>- )+ );}function TabsList({@@ -25,11 +25,11 @@ function TabsList({data-slot="tabs-list"className={cn("bg-muted text-muted-foreground inline-flex h-9 w-fit items-center justify-center rounded-lg p-[3px]",- className+ className,)}{...props}/>- )+ );}function TabsTrigger({@@ -41,11 +41,11 @@ function TabsTrigger({data-slot="tabs-trigger"className={cn("data-[state=active]:bg-background dark:data-[state=active]:text-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:outline-ring dark:data-[state=active]:border-input dark:data-[state=active]:bg-input/30 text-foreground dark:text-muted-foreground inline-flex h-[calc(100%-1px)] flex-1 items-center justify-center gap-1.5 rounded-md border border-transparent px-2 py-1 text-sm font-medium whitespace-nowrap transition-[color,box-shadow] focus-visible:ring-[3px] focus-visible:outline-1 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",- className+ className,)}{...props}/>- )+ );}function TabsContent({@@ -58,7 +58,7 @@ function TabsContent({className={cn("flex-1 outline-none", className)}{...props}/>- )+ );}-export { Tabs, TabsList, TabsTrigger, TabsContent }+export { Tabs, TabsList, TabsTrigger, TabsContent };diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsxindex 7f21b5e7..0735a8ca 100644--- a/src/components/ui/textarea.tsx+++ b/src/components/ui/textarea.tsx@@ -1,6 +1,6 @@-import * as React from "react"+import * as React from "react";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {return (@@ -8,11 +8,11 @@ function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {data-slot="textarea"className={cn("border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",- className+ className,)}{...props}/>- )+ );}-export { Textarea }+export { Textarea };diff --git a/src/components/ui/tooltip.tsx b/src/components/ui/tooltip.tsxindex 4ee26b38..bf4a342a 100644--- a/src/components/ui/tooltip.tsx+++ b/src/components/ui/tooltip.tsx@@ -1,9 +1,9 @@-"use client"+"use client";-import * as React from "react"-import * as TooltipPrimitive from "@radix-ui/react-tooltip"+import * as React from "react";+import * as TooltipPrimitive from "@radix-ui/react-tooltip";-import { cn } from "@/lib/utils"+import { cn } from "@/lib/utils";function TooltipProvider({delayDuration = 0,@@ -15,7 +15,7 @@ function TooltipProvider({delayDuration={delayDuration}{...props}/>- )+ );}function Tooltip({@@ -25,13 +25,13 @@ function Tooltip({<TooltipProvider><TooltipPrimitive.Root data-slot="tooltip" {...props} /></TooltipProvider>- )+ );}function TooltipTrigger({...props}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {- return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />+ return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;}function TooltipContent({@@ -47,7 +47,7 @@ function TooltipContent({sideOffset={sideOffset}className={cn("bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance",- className+ className,)}{...props}>@@ -55,7 +55,7 @@ function TooltipContent({<TooltipPrimitive.Arrow className="bg-primary fill-primary z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px]" /></TooltipPrimitive.Content></TooltipPrimitive.Portal>- )+ );}-export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }+export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider };diff --git a/src/hooks/filter-context.tsx b/src/hooks/filter-context.tsxindex 38dcc3fd..2b5d9aeb 100644--- a/src/hooks/filter-context.tsx+++ b/src/hooks/filter-context.tsx@@ -4,13 +4,12 @@ import { useContext } from "react";export interface FilterElementProps {alwaysOn?: boolean;context?: string;-+defaultValue?: any;resource?: string;record?: object;source: string;-[key: string]: any; // Allow any other prop}diff --git a/src/hooks/saved-queries.tsx b/src/hooks/saved-queries.tsxindex 7c93d3ec..d5a0866b 100644--- a/src/hooks/saved-queries.tsx+++ b/src/hooks/saved-queries.tsx@@ -13,9 +13,8 @@ export const useSavedQueries = (resource: string) => {export interface SavedQuery {label: string;value: {-filter?: any;-+displayedFilters?: any[];sort?: SortPayload;perPage?: number;diff --git a/src/hooks/simple-form-iterator-context.tsx b/src/hooks/simple-form-iterator-context.tsxindex a761c284..a500cc11 100644--- a/src/hooks/simple-form-iterator-context.tsx+++ b/src/hooks/simple-form-iterator-context.tsx@@ -15,7 +15,6 @@ export const SimpleFormIteratorContext = createContext<* @deprecated Use SimpleFormIteratorContextValue from `ra-core` once available.*/export type SimpleFormIteratorContextValue = {-add: (item?: any) => void;remove: (index: number) => void;reOrder: (index: number, newIndex: number) => void;diff --git a/src/hooks/use-mobile.ts b/src/hooks/use-mobile.tsindex 48fab93c..a93d5839 100644--- a/src/hooks/use-mobile.ts+++ b/src/hooks/use-mobile.ts@@ -4,7 +4,7 @@ const MOBILE_BREAKPOINT = 768;export function useIsMobile() {const [isMobile, setIsMobile] = React.useState<boolean | undefined>(- undefined+ undefined,);React.useEffect(() => {diff --git a/src/hooks/useBulkExport.tsx b/src/hooks/useBulkExport.tsxindex badef485..6f755c77 100644--- a/src/hooks/useBulkExport.tsx+++ b/src/hooks/useBulkExport.tsx@@ -14,7 +14,7 @@ import { useCallback, useMemo } from "react";* @deprecated Import from 'ra-core' instead.*/export function useBulkExport<- ResourceInformationsType extends Partial<{ resource: string }>+ ResourceInformationsType extends Partial<{ resource: string }>,>(props: UseBulkExportProps<ResourceInformationsType>) {const { exporter: customExporter, meta } = props;@@ -33,8 +33,8 @@ export function useBulkExport<data,fetchRelatedRecords(dataProvider),dataProvider,- resource- )+ resource,+ ),).catch((error) => {console.error(error);@@ -56,6 +56,6 @@ export type ResourceInformation = Partial<{ resource: string }>;export type UseBulkExportProps<T extends ResourceInformation> = T & {exporter?: Exporter;-+meta?: any;};diff --git a/src/hooks/useSupportCreateSuggestion.tsx b/src/hooks/useSupportCreateSuggestion.tsxindex 58976d84..d6b451a2 100644--- a/src/hooks/useSupportCreateSuggestion.tsx+++ b/src/hooks/useSupportCreateSuggestion.tsx@@ -74,7 +74,7 @@ export const useSupportCreateSuggestion = <T = unknown,>(: createLabel,);},-+handleChange: async (eventOrValue: MouseEvent | any) => {const value = eventOrValue?.target?.value || eventOrValue;const finalValue = Array.isArray(value) ? [...value].pop() : value;@@ -116,7 +116,6 @@ export const useSupportCreateSuggestion = <T = unknown,>(</CreateSuggestionContext.Provider>) : null,getOptionDisabled: (option) =>-(option as any)?.id === createHintValue || option === createHintValue,};};@@ -144,7 +143,7 @@ export interface UseSupportCreateValue<T = unknown> {createHintId: string;getCreateItem: (filterValue?: string) => {id: Identifier;-+[key: string]: any;};handleChange: (eventOrValue: ChangeEvent | T) => Promise<void>;@@ -184,5 +183,5 @@ export const useCreateSuggestionContext = () => {/*** @deprecated Use `OnCreateHandler` from "ra-core" when available.*/-+export type OnCreateHandler = (filter?: string) => any | Promise<any>;diff --git a/src/main.tsx b/src/main.tsxindex 84cb87b3..c0833da8 100644--- a/src/main.tsx+++ b/src/main.tsx@@ -5,7 +5,7 @@ import App from "./App.tsx";// biome-ignore lint/style/noNonNullAssertion: #root element is guaranteed to existcreateRoot(document.getElementById("root")!).render(- <StrictMode>- <App />- </StrictMode>,+ <StrictMode>+ <App />+ </StrictMode>,);diff --git a/src/setupTests.js b/src/setupTests.jsindex 8f2609b7..1dd407a6 100644--- a/src/setupTests.js+++ b/src/setupTests.js@@ -2,4 +2,4 @@// allows you to do things like:// expect(element).toHaveTextContent(/react/i)// learn more: https://github.com/testing-library/jest-dom-import '@testing-library/jest-dom';+import "@testing-library/jest-dom";diff --git a/supabase/functions/_shared/supabaseAdmin.ts b/supabase/functions/_shared/supabaseAdmin.tsindex b758ed92..ecdc3790 100644--- a/supabase/functions/_shared/supabaseAdmin.ts+++ b/supabase/functions/_shared/supabaseAdmin.ts@@ -1,12 +1,12 @@-import { createClient, SupabaseClient } from 'jsr:@supabase/supabase-js@2';+import { createClient, SupabaseClient } from "jsr:@supabase/supabase-js@2";export const supabaseAdmin: SupabaseClient = createClient(- Deno.env.get('SUPABASE_URL') ?? '',- Deno.env.get('SUPABASE_SERVICE_ROLE_KEY') ?? '',- {- auth: {- autoRefreshToken: false,- persistSession: false,- },- }+ Deno.env.get("SUPABASE_URL") ?? "",+ Deno.env.get("SUPABASE_SERVICE_ROLE_KEY") ?? "",+ {+ auth: {+ autoRefreshToken: false,+ persistSession: false,+ },+ },);diff --git a/supabase/functions/_shared/utils.ts b/supabase/functions/_shared/utils.tsindex dc7e1a42..2195aae1 100644--- a/supabase/functions/_shared/utils.ts+++ b/supabase/functions/_shared/utils.ts@@ -1,13 +1,13 @@export const corsHeaders = {- 'Access-Control-Allow-Origin': '*',- 'Access-Control-Allow-Headers':- 'authorization, x-client-info, apikey, content-type',- 'Access-Control-Allow-Methods': 'POST, PATCH, DELETE',+ "Access-Control-Allow-Origin": "*",+ "Access-Control-Allow-Headers":+ "authorization, x-client-info, apikey, content-type",+ "Access-Control-Allow-Methods": "POST, PATCH, DELETE",};export function createErrorResponse(status: number, message: string) {- return new Response(JSON.stringify({ status, message }), {- headers: { 'Content-Type': 'application/json', ...corsHeaders },- status,- });+ return new Response(JSON.stringify({ status, message }), {+ headers: { "Content-Type": "application/json", ...corsHeaders },+ status,+ });}diff --git a/supabase/functions/postmark/addNoteToContact.ts b/supabase/functions/postmark/addNoteToContact.tsindex e1af4d77..f82a7dd1 100644--- a/supabase/functions/postmark/addNoteToContact.ts+++ b/supabase/functions/postmark/addNoteToContact.ts@@ -1,130 +1,129 @@-import { supabaseAdmin } from '../_shared/supabaseAdmin.ts';+import { supabaseAdmin } from "../_shared/supabaseAdmin.ts";export const addNoteToContact = async ({- salesEmail,- email,- domain,- firstName,- lastName,- noteContent,+ salesEmail,+ email,+ domain,+ firstName,+ lastName,+ noteContent,}: {- salesEmail: string;- email: string;- domain: string;- firstName: string;- lastName: string;- noteContent: string;+ salesEmail: string;+ email: string;+ domain: string;+ firstName: string;+ lastName: string;+ noteContent: string;}) => {- const { data: sales, error: fetchSalesError } = await supabaseAdmin- .from('sales')- .select('*')- .eq('email', salesEmail)- .neq('disabled', true)+ const { data: sales, error: fetchSalesError } = await supabaseAdmin+ .from("sales")+ .select("*")+ .eq("email", salesEmail)+ .neq("disabled", true)+ .maybeSingle();+ if (fetchSalesError)+ return new Response(+ `Could not fetch sales from database, email: ${salesEmail}`,+ { status: 500 },+ );+ if (!sales) {+ // Return a 403 to let Postmark know that it's no use to retry this request+ // https://postmarkapp.com/developer/webhooks/inbound-webhook#errors-and-retries+ return new Response(+ `Unable to find (active) sales in database, email: ${salesEmail}`,+ { status: 403 },+ );+ }++ // Check if the contact already exists+ const { data: existingContact, error: fetchContactError } =+ await supabaseAdmin+ .from("contacts")+ .select("*")+ .contains("email_jsonb", JSON.stringify([{ email }]))+ .maybeSingle();+ if (fetchContactError)+ return new Response(+ `Could not fetch contact from database, email: ${email}`,+ { status: 500 },+ );++ // deno-lint-ignore no-explicit-any+ let contact: any = undefined;+ if (existingContact) {+ contact = existingContact;+ } else {+ // If the contact does not exist, we need to create it, along with the company if needed++ // Check if the company already exists+ const { data: existingCompany, error: fetchCompanyError } =+ await supabaseAdmin+ .from("companies")+ .select("*")+ .eq("name", domain).maybeSingle();- if (fetchSalesError)- return new Response(- `Could not fetch sales from database, email: ${salesEmail}`,- { status: 500 }- );- if (!sales) {- // Return a 403 to let Postmark know that it's no use to retry this request- // https://postmarkapp.com/developer/webhooks/inbound-webhook#errors-and-retries- return new Response(- `Unable to find (active) sales in database, email: ${salesEmail}`,- { status: 403 }- );- }+ if (fetchCompanyError)+ return new Response(+ `Could not fetch companies from database, name: ${domain}`,+ { status: 500 },+ );- // Check if the contact already exists- const { data: existingContact, error: fetchContactError } =+ // deno-lint-ignore no-explicit-any+ let company: any = undefined;+ if (existingCompany) {+ company = existingCompany;+ } else {+ const { data: newCompanies, error: createCompanyError } =await supabaseAdmin- .from('contacts')- .select('*')- .contains('email_jsonb', JSON.stringify([{ email }]))- .maybeSingle();- if (fetchContactError)+ .from("companies")+ .insert({ name: domain, sales_id: sales.id })+ .select();+ if (createCompanyError)return new Response(- `Could not fetch contact from database, email: ${email}`,- { status: 500 }+ `Could not create company in database, name: ${domain}`,+ { status: 500 },);-- // deno-lint-ignore no-explicit-any- let contact: any = undefined;- if (existingContact) {- contact = existingContact;- } else {- // If the contact does not exist, we need to create it, along with the company if needed-- // Check if the company already exists- const { data: existingCompany, error: fetchCompanyError } =- await supabaseAdmin- .from('companies')- .select('*')- .eq('name', domain)- .maybeSingle();- if (fetchCompanyError)- return new Response(- `Could not fetch companies from database, name: ${domain}`,- { status: 500 }- );-- // deno-lint-ignore no-explicit-any- let company: any = undefined;- if (existingCompany) {- company = existingCompany;- } else {- const { data: newCompanies, error: createCompanyError } =- await supabaseAdmin- .from('companies')- .insert({ name: domain, sales_id: sales.id })- .select();- if (createCompanyError)- return new Response(- `Could not create company in database, name: ${domain}`,- { status: 500 }- );- company = newCompanies[0];- }-- // Create the contact- const { data: newContacts, error: createContactError } =- await supabaseAdmin- .from('contacts')- .insert({- first_name: firstName,- last_name: lastName,- email_jsonb: [{ email, type: 'Work' }],- company_id: company.id,- sales_id: sales.id,- first_seen: new Date(),- last_seen: new Date(),- tags: [],- })- .select();- if (createContactError || !newContacts[0])- return new Response(- `Could not create contact in database, email: ${email}`,- { status: 500 }- );- contact = newContacts[0];+ company = newCompanies[0];}- // Add note to contact- const { error: createNoteError } = await supabaseAdmin- .from('contactNotes')- .insert({- contact_id: contact.id,- text: noteContent,- sales_id: sales.id,- });- if (createNoteError)- return new Response(- `Could not add note to contact ${email}, sales ${salesEmail}`,- { status: 500 }- );+ // Create the contact+ const { data: newContacts, error: createContactError } = await supabaseAdmin+ .from("contacts")+ .insert({+ first_name: firstName,+ last_name: lastName,+ email_jsonb: [{ email, type: "Work" }],+ company_id: company.id,+ sales_id: sales.id,+ first_seen: new Date(),+ last_seen: new Date(),+ tags: [],+ })+ .select();+ if (createContactError || !newContacts[0])+ return new Response(+ `Could not create contact in database, email: ${email}`,+ { status: 500 },+ );+ contact = newContacts[0];+ }- await supabaseAdmin- .from('contacts')- .update({ last_seen: new Date() })- .eq('id', contact.id);+ // Add note to contact+ const { error: createNoteError } = await supabaseAdmin+ .from("contactNotes")+ .insert({+ contact_id: contact.id,+ text: noteContent,+ sales_id: sales.id,+ });+ if (createNoteError)+ return new Response(+ `Could not add note to contact ${email}, sales ${salesEmail}`,+ { status: 500 },+ );++ await supabaseAdmin+ .from("contacts")+ .update({ last_seen: new Date() })+ .eq("id", contact.id);};diff --git a/supabase/functions/postmark/extractMailContactData.ts b/supabase/functions/postmark/extractMailContactData.tsindex b434d13c..391e427e 100644--- a/supabase/functions/postmark/extractMailContactData.ts+++ b/supabase/functions/postmark/extractMailContactData.ts@@ -19,27 +19,23 @@**/export const extractMailContactData = (- ToFull: {- Email: string;- Name: string;- }[]+ ToFull: {+ Email: string;+ Name: string;+ }[],) => {- return ToFull.map(contact => {- const domain = contact.Email.split('@').at(-1)!;- const fullName =- contact.Name ||- contact.Email.split('@')- .slice(0, -1)- .join(' ')- .split('.')- .join(' ');- let firstName = '';- let lastName = fullName;- if (fullName && fullName.includes(' ')) {- const parts = fullName.split(' ');- firstName = parts[0];- lastName = parts.slice(1).join(' ');- }- return { firstName, lastName, email: contact.Email, domain };- });+ return ToFull.map((contact) => {+ const domain = contact.Email.split("@").at(-1)!;+ const fullName =+ contact.Name ||+ contact.Email.split("@").slice(0, -1).join(" ").split(".").join(" ");+ let firstName = "";+ let lastName = fullName;+ if (fullName && fullName.includes(" ")) {+ const parts = fullName.split(" ");+ firstName = parts[0];+ lastName = parts.slice(1).join(" ");+ }+ return { firstName, lastName, email: contact.Email, domain };+ });};diff --git a/supabase/functions/postmark/getExpectedAuthorization.ts b/supabase/functions/postmark/getExpectedAuthorization.tsindex 605f03bb..b9acb605 100644--- a/supabase/functions/postmark/getExpectedAuthorization.ts+++ b/supabase/functions/postmark/getExpectedAuthorization.ts@@ -1,4 +1,4 @@export const getExpectedAuthorization = (- webhookUser: string,- webhookPassword: string+ webhookUser: string,+ webhookPassword: string,) => `Basic ${btoa(`${webhookUser}:${webhookPassword}`)}`;diff --git a/supabase/functions/postmark/getNoteContent.ts b/supabase/functions/postmark/getNoteContent.tsindex 5a99b700..e194f203 100644--- a/supabase/functions/postmark/getNoteContent.ts+++ b/supabase/functions/postmark/getNoteContent.ts@@ -1,6 +1,6 @@export const getNoteContent = (- subject: string,- strippedText: string+ subject: string,+ strippedText: string,) => `${subject}${strippedText}`;diff --git a/supabase/functions/postmark/index.ts b/supabase/functions/postmark/index.tsindex 22fb864b..7b94d10e 100644--- a/supabase/functions/postmark/index.ts+++ b/supabase/functions/postmark/index.ts@@ -3,123 +3,120 @@// This enables autocomplete, go to definition, etc.// Setup type definitions for built-in Supabase Runtime APIs-import 'jsr:@supabase/functions-js/edge-runtime.d.ts';-import { addNoteToContact } from './addNoteToContact.ts';-import { extractMailContactData } from './extractMailContactData.ts';-import { getExpectedAuthorization } from './getExpectedAuthorization.ts';-import { getNoteContent } from './getNoteContent.ts';--const webhookUser = Deno.env.get('POSTMARK_WEBHOOK_USER');-const webhookPassword = Deno.env.get('POSTMARK_WEBHOOK_PASSWORD');+import "jsr:@supabase/functions-js/edge-runtime.d.ts";+import { addNoteToContact } from "./addNoteToContact.ts";+import { extractMailContactData } from "./extractMailContactData.ts";+import { getExpectedAuthorization } from "./getExpectedAuthorization.ts";+import { getNoteContent } from "./getNoteContent.ts";++const webhookUser = Deno.env.get("POSTMARK_WEBHOOK_USER");+const webhookPassword = Deno.env.get("POSTMARK_WEBHOOK_PASSWORD");if (!webhookUser || !webhookPassword) {- throw new Error(- 'Missing POSTMARK_WEBHOOK_USER or POSTMARK_WEBHOOK_PASSWORD env variable'- );+ throw new Error(+ "Missing POSTMARK_WEBHOOK_USER or POSTMARK_WEBHOOK_PASSWORD env variable",+ );}-const rawAuthorizedIPs = Deno.env.get('POSTMARK_WEBHOOK_AUTHORIZED_IPS');+const rawAuthorizedIPs = Deno.env.get("POSTMARK_WEBHOOK_AUTHORIZED_IPS");if (!rawAuthorizedIPs) {- throw new Error('Missing POSTMARK_WEBHOOK_AUTHORIZED_IPS env variable');+ throw new Error("Missing POSTMARK_WEBHOOK_AUTHORIZED_IPS env variable");}-Deno.serve(async req => {- let response: Response | undefined;+Deno.serve(async (req) => {+ let response: Response | undefined;- response = checkRequestTypeAndHeaders(req);- if (response) return response;+ response = checkRequestTypeAndHeaders(req);+ if (response) return response;- const json = await req.json();- response = checkBody(json);- if (response) return response;+ const json = await req.json();+ response = checkBody(json);+ if (response) return response;- const { ToFull, FromFull, Subject, TextBody } = json;+ const { ToFull, FromFull, Subject, TextBody } = json;- const noteContent = getNoteContent(Subject, TextBody);+ const noteContent = getNoteContent(Subject, TextBody);- const { Email: salesEmail } = FromFull;- if (!salesEmail) {- // Return a 403 to let Postmark know that it's no use to retry this request- // https://postmarkapp.com/developer/webhooks/inbound-webhook#errors-and-retries- return new Response(- `Could not extract sales email from FromFull: ${FromFull}`,- { status: 403 }- );- }+ const { Email: salesEmail } = FromFull;+ if (!salesEmail) {+ // Return a 403 to let Postmark know that it's no use to retry this request+ // https://postmarkapp.com/developer/webhooks/inbound-webhook#errors-and-retries+ return new Response(+ `Could not extract sales email from FromFull: ${FromFull}`,+ { status: 403 },+ );+ }- const contacts = extractMailContactData(ToFull);-- for (const { firstName, lastName, email, domain } of contacts) {- if (!email) {- // Return a 403 to let Postmark know that it's no use to retry this request- // https://postmarkapp.com/developer/webhooks/inbound-webhook#errors-and-retries- return new Response(- `Could not extract email from ToFull: ${ToFull}`,- {- status: 403,- }- );- }-- await addNoteToContact({- salesEmail,- email,- domain,- firstName,- lastName,- noteContent,- });+ const contacts = extractMailContactData(ToFull);++ for (const { firstName, lastName, email, domain } of contacts) {+ if (!email) {+ // Return a 403 to let Postmark know that it's no use to retry this request+ // https://postmarkapp.com/developer/webhooks/inbound-webhook#errors-and-retries+ return new Response(`Could not extract email from ToFull: ${ToFull}`, {+ status: 403,+ });}- return new Response('OK');+ await addNoteToContact({+ salesEmail,+ email,+ domain,+ firstName,+ lastName,+ noteContent,+ });+ }++ return new Response("OK");});const checkRequestTypeAndHeaders = (req: Request) => {- // Only allow known IP addresses- // We can use the x-forwarded-for header as it is populated by Supabase- // https://supabase.com/docs/guides/api/securing-your-api#accessing-request-information- const forwardedFor = req.headers.get('x-forwarded-for');- if (!forwardedFor) {- return new Response('Unauthorized', { status: 401 });- }- const ips = forwardedFor.split(',').map(ip => ip.trim());- const authorizedIPs = rawAuthorizedIPs.split(',').map(ip => ip.trim());- if (!ips.some(ip => authorizedIPs.includes(ip))) {- return new Response('Unauthorized', { status: 401 });- }-- // Only allow POST requests- if (req.method !== 'POST') {- return new Response(null, { status: 405 });- }-- // Check the Authorization header- const expectedAuthorization = getExpectedAuthorization(- webhookUser,- webhookPassword- );- const authorization = req.headers.get('Authorization');- if (authorization !== expectedAuthorization) {- return new Response('Unauthorized', { status: 401 });- }+ // Only allow known IP addresses+ // We can use the x-forwarded-for header as it is populated by Supabase+ // https://supabase.com/docs/guides/api/securing-your-api#accessing-request-information+ const forwardedFor = req.headers.get("x-forwarded-for");+ if (!forwardedFor) {+ return new Response("Unauthorized", { status: 401 });+ }+ const ips = forwardedFor.split(",").map((ip) => ip.trim());+ const authorizedIPs = rawAuthorizedIPs.split(",").map((ip) => ip.trim());+ if (!ips.some((ip) => authorizedIPs.includes(ip))) {+ return new Response("Unauthorized", { status: 401 });+ }++ // Only allow POST requests+ if (req.method !== "POST") {+ return new Response(null, { status: 405 });+ }++ // Check the Authorization header+ const expectedAuthorization = getExpectedAuthorization(+ webhookUser,+ webhookPassword,+ );+ const authorization = req.headers.get("Authorization");+ if (authorization !== expectedAuthorization) {+ return new Response("Unauthorized", { status: 401 });+ }};// deno-lint-ignore no-explicit-anyconst checkBody = (json: any) => {- const { ToFull, FromFull, Subject, TextBody } = json;-- // In case of incorrect request data, we- // return a 403 to let Postmark know that it's no use to retry this request- // https://postmarkapp.com/developer/webhooks/inbound-webhook#errors-and-retries- if (!ToFull || !ToFull.length)- return new Response('Missing parameter: ToFull', { status: 403 });- if (!FromFull)- return new Response('Missing parameter: FromFull', { status: 403 });- if (!Subject)- return new Response('Missing parameter: Subject', { status: 403 });- if (!TextBody)- return new Response('Missing parameter: TextBody', {- status: 403,- });+ const { ToFull, FromFull, Subject, TextBody } = json;++ // In case of incorrect request data, we+ // return a 403 to let Postmark know that it's no use to retry this request+ // https://postmarkapp.com/developer/webhooks/inbound-webhook#errors-and-retries+ if (!ToFull || !ToFull.length)+ return new Response("Missing parameter: ToFull", { status: 403 });+ if (!FromFull)+ return new Response("Missing parameter: FromFull", { status: 403 });+ if (!Subject)+ return new Response("Missing parameter: Subject", { status: 403 });+ if (!TextBody)+ return new Response("Missing parameter: TextBody", {+ status: 403,+ });};/* To invoke locally:diff --git a/supabase/functions/updatePassword/index.ts b/supabase/functions/updatePassword/index.tsindex 9c15aae0..a53ae46e 100644--- a/supabase/functions/updatePassword/index.ts+++ b/supabase/functions/updatePassword/index.ts@@ -1,50 +1,50 @@-import 'jsr:@supabase/functions-js/edge-runtime.d.ts';-import { createClient } from 'jsr:@supabase/supabase-js@2';-import { corsHeaders, createErrorResponse } from '../_shared/utils.ts';-import { supabaseAdmin } from '../_shared/supabaseAdmin.ts';+import "jsr:@supabase/functions-js/edge-runtime.d.ts";+import { createClient } from "jsr:@supabase/supabase-js@2";+import { corsHeaders, createErrorResponse } from "../_shared/utils.ts";+import { supabaseAdmin } from "../_shared/supabaseAdmin.ts";async function updatePassword(user: any) {- const { data, error } = await supabaseAdmin.auth.resetPasswordForEmail(- user.email- );-- if (!data || error) {- return createErrorResponse(500, 'Internal Server Error');- }-- return new Response(- JSON.stringify({- data,- }),- {- headers: { 'Content-Type': 'application/json', ...corsHeaders },- }- );+ const { data, error } = await supabaseAdmin.auth.resetPasswordForEmail(+ user.email,+ );++ if (!data || error) {+ return createErrorResponse(500, "Internal Server Error");+ }++ return new Response(+ JSON.stringify({+ data,+ }),+ {+ headers: { "Content-Type": "application/json", ...corsHeaders },+ },+ );}Deno.serve(async (req: Request) => {- if (req.method === 'OPTIONS') {- return new Response(null, {- status: 204,- headers: corsHeaders,- });- }-- const authHeader = req.headers.get('Authorization')!;- const localClient = createClient(- Deno.env.get('SUPABASE_URL') ?? '',- Deno.env.get('SUPABASE_ANON_KEY') ?? '',- { global: { headers: { Authorization: authHeader } } }- );-- const { data } = await localClient.auth.getUser();- if (!data?.user) {- return createErrorResponse(401, 'Unauthorized');- }-- if (req.method === 'PATCH') {- return updatePassword(data.user);- }-- return createErrorResponse(405, 'Method Not Allowed');+ if (req.method === "OPTIONS") {+ return new Response(null, {+ status: 204,+ headers: corsHeaders,+ });+ }++ const authHeader = req.headers.get("Authorization")!;+ const localClient = createClient(+ Deno.env.get("SUPABASE_URL") ?? "",+ Deno.env.get("SUPABASE_ANON_KEY") ?? "",+ { global: { headers: { Authorization: authHeader } } },+ );++ const { data } = await localClient.auth.getUser();+ if (!data?.user) {+ return createErrorResponse(401, "Unauthorized");+ }++ if (req.method === "PATCH") {+ return updatePassword(data.user);+ }++ return createErrorResponse(405, "Method Not Allowed");});diff --git a/supabase/functions/users/index.ts b/supabase/functions/users/index.tsindex e31601b1..a6c8c345 100644--- a/supabase/functions/users/index.ts+++ b/supabase/functions/users/index.ts@@ -1,207 +1,206 @@-import 'jsr:@supabase/functions-js/edge-runtime.d.ts';-import { createClient } from 'jsr:@supabase/supabase-js@2';-import { supabaseAdmin } from '../_shared/supabaseAdmin.ts';-import { corsHeaders, createErrorResponse } from '../_shared/utils.ts';+import "jsr:@supabase/functions-js/edge-runtime.d.ts";+import { createClient } from "jsr:@supabase/supabase-js@2";+import { supabaseAdmin } from "../_shared/supabaseAdmin.ts";+import { corsHeaders, createErrorResponse } from "../_shared/utils.ts";async function updateSaleDisabled(user_id: string, disabled: boolean) {- return await supabaseAdmin- .from('sales')- .update({ disabled: disabled ?? false })- .eq('user_id', user_id);+ return await supabaseAdmin+ .from("sales")+ .update({ disabled: disabled ?? false })+ .eq("user_id", user_id);}async function updateSaleAdministrator(- user_id: string,- administrator: boolean+ user_id: string,+ administrator: boolean,) {- const { data: sales, error: salesError } = await supabaseAdmin- .from('sales')- .update({ administrator })- .eq('user_id', user_id)- .select('*');-- if (!sales?.length || salesError) {- console.error('Error updating user:', salesError);- throw salesError ?? new Error('Failed to update sale');- }- return sales.at(0);+ const { data: sales, error: salesError } = await supabaseAdmin+ .from("sales")+ .update({ administrator })+ .eq("user_id", user_id)+ .select("*");++ if (!sales?.length || salesError) {+ console.error("Error updating user:", salesError);+ throw salesError ?? new Error("Failed to update sale");+ }+ return sales.at(0);}async function updateSaleAvatar(user_id: string, avatar: string) {- const { data: sales, error: salesError } = await supabaseAdmin- .from('sales')- .update({ avatar })- .eq('user_id', user_id)- .select('*');-- if (!sales?.length || salesError) {- console.error('Error updating user:', salesError);- throw salesError ?? new Error('Failed to update sale');- }- return sales.at(0);+ const { data: sales, error: salesError } = await supabaseAdmin+ .from("sales")+ .update({ avatar })+ .eq("user_id", user_id)+ .select("*");++ if (!sales?.length || salesError) {+ console.error("Error updating user:", salesError);+ throw salesError ?? new Error("Failed to update sale");+ }+ return sales.at(0);}async function inviteUser(req: Request, currentUserSale: any) {- const { email, password, first_name, last_name, disabled, administrator } =- await req.json();-- if (!currentUserSale.administrator) {- return createErrorResponse(401, 'Not Authorized');- }-- const { data, error: userError } =- await supabaseAdmin.auth.admin.createUser({- email,- password,- user_metadata: { first_name, last_name },- });-- const { error: emailError } =- await supabaseAdmin.auth.admin.inviteUserByEmail(email);-- if (!data?.user || userError) {- console.error(`Error inviting user: user_error=${userError}`);- return createErrorResponse(500, 'Internal Server Error');- }-- if (!data?.user || userError || emailError) {- console.error(`Error inviting user, email_error=${emailError}`);- return createErrorResponse(500, 'Failed to send invitation mail');- }-- try {- await updateSaleDisabled(data.user.id, disabled);- const sale = await updateSaleAdministrator(data.user.id, administrator);-- return new Response(- JSON.stringify({- data: sale,- }),- {- headers: { 'Content-Type': 'application/json', ...corsHeaders },- }- );- } catch (e) {- console.error('Error patching sale:', e);- return createErrorResponse(500, 'Internal Server Error');- }+ const { email, password, first_name, last_name, disabled, administrator } =+ await req.json();++ if (!currentUserSale.administrator) {+ return createErrorResponse(401, "Not Authorized");+ }++ const { data, error: userError } = await supabaseAdmin.auth.admin.createUser({+ email,+ password,+ user_metadata: { first_name, last_name },+ });++ const { error: emailError } =+ await supabaseAdmin.auth.admin.inviteUserByEmail(email);++ if (!data?.user || userError) {+ console.error(`Error inviting user: user_error=${userError}`);+ return createErrorResponse(500, "Internal Server Error");+ }++ if (!data?.user || userError || emailError) {+ console.error(`Error inviting user, email_error=${emailError}`);+ return createErrorResponse(500, "Failed to send invitation mail");+ }++ try {+ await updateSaleDisabled(data.user.id, disabled);+ const sale = await updateSaleAdministrator(data.user.id, administrator);++ return new Response(+ JSON.stringify({+ data: sale,+ }),+ {+ headers: { "Content-Type": "application/json", ...corsHeaders },+ },+ );+ } catch (e) {+ console.error("Error patching sale:", e);+ return createErrorResponse(500, "Internal Server Error");+ }}async function patchUser(req: Request, currentUserSale: any) {- const {- sales_id,- email,- first_name,- last_name,- avatar,- administrator,- disabled,- } = await req.json();- const { data: sale } = await supabaseAdmin- .from('sales')- .select('*')- .eq('id', sales_id)- .single();-- if (!sale) {- return createErrorResponse(404, 'Not Found');- }-- // Users can only update their own profile unless they are an administrator- if (!currentUserSale.administrator && currentUserSale.id !== sale.id) {- return createErrorResponse(401, 'Not Authorized');- }-- const { data, error: userError } =- await supabaseAdmin.auth.admin.updateUserById(sale.user_id, {- email,- ban_duration: disabled ? '87600h' : 'none',- user_metadata: { first_name, last_name },- });-- if (!data?.user || userError) {- console.error('Error patching user:', userError);- return createErrorResponse(500, 'Internal Server Error');- }-- if (avatar) {- await updateSaleAvatar(data.user.id, avatar);- }-- // Only administrators can update the administrator and disabled status- if (!currentUserSale.administrator) {- const { data: new_sale } = await supabaseAdmin- .from('sales')- .select('*')- .eq('id', sales_id)- .single();- return new Response(- JSON.stringify({- data: new_sale,- }),- {- headers: {- 'Content-Type': 'application/json',- ...corsHeaders,- },- }- );- }-- try {- await updateSaleDisabled(data.user.id, disabled);- const sale = await updateSaleAdministrator(data.user.id, administrator);- return new Response(- JSON.stringify({- data: sale,- }),- {- headers: {- 'Content-Type': 'application/json',- ...corsHeaders,- },- }- );- } catch (e) {- console.error('Error patching sale:', e);- return createErrorResponse(500, 'Internal Server Error');- }+ const {+ sales_id,+ email,+ first_name,+ last_name,+ avatar,+ administrator,+ disabled,+ } = await req.json();+ const { data: sale } = await supabaseAdmin+ .from("sales")+ .select("*")+ .eq("id", sales_id)+ .single();++ if (!sale) {+ return createErrorResponse(404, "Not Found");+ }++ // Users can only update their own profile unless they are an administrator+ if (!currentUserSale.administrator && currentUserSale.id !== sale.id) {+ return createErrorResponse(401, "Not Authorized");+ }++ const { data, error: userError } =+ await supabaseAdmin.auth.admin.updateUserById(sale.user_id, {+ email,+ ban_duration: disabled ? "87600h" : "none",+ user_metadata: { first_name, last_name },+ });++ if (!data?.user || userError) {+ console.error("Error patching user:", userError);+ return createErrorResponse(500, "Internal Server Error");+ }++ if (avatar) {+ await updateSaleAvatar(data.user.id, avatar);+ }++ // Only administrators can update the administrator and disabled status+ if (!currentUserSale.administrator) {+ const { data: new_sale } = await supabaseAdmin+ .from("sales")+ .select("*")+ .eq("id", sales_id)+ .single();+ return new Response(+ JSON.stringify({+ data: new_sale,+ }),+ {+ headers: {+ "Content-Type": "application/json",+ ...corsHeaders,+ },+ },+ );+ }++ try {+ await updateSaleDisabled(data.user.id, disabled);+ const sale = await updateSaleAdministrator(data.user.id, administrator);+ return new Response(+ JSON.stringify({+ data: sale,+ }),+ {+ headers: {+ "Content-Type": "application/json",+ ...corsHeaders,+ },+ },+ );+ } catch (e) {+ console.error("Error patching sale:", e);+ return createErrorResponse(500, "Internal Server Error");+ }}Deno.serve(async (req: Request) => {- if (req.method === 'OPTIONS') {- return new Response(null, {- status: 204,- headers: corsHeaders,- });- }-- const authHeader = req.headers.get('Authorization')!;- const localClient = createClient(- Deno.env.get('SUPABASE_URL') ?? '',- Deno.env.get('SUPABASE_ANON_KEY') ?? '',- { global: { headers: { Authorization: authHeader } } }- );- const { data } = await localClient.auth.getUser();- if (!data?.user) {- return createErrorResponse(401, 'Unauthorized');- }- const currentUserSale = await supabaseAdmin- .from('sales')- .select('*')- .eq('user_id', data.user.id)- .single();-- if (!currentUserSale?.data) {- return createErrorResponse(401, 'Unauthorized');- }- if (req.method === 'POST') {- return inviteUser(req, currentUserSale.data);- }-- if (req.method === 'PATCH') {- return patchUser(req, currentUserSale.data);- }-- return createErrorResponse(405, 'Method Not Allowed');+ if (req.method === "OPTIONS") {+ return new Response(null, {+ status: 204,+ headers: corsHeaders,+ });+ }++ const authHeader = req.headers.get("Authorization")!;+ const localClient = createClient(+ Deno.env.get("SUPABASE_URL") ?? "",+ Deno.env.get("SUPABASE_ANON_KEY") ?? "",+ { global: { headers: { Authorization: authHeader } } },+ );+ const { data } = await localClient.auth.getUser();+ if (!data?.user) {+ return createErrorResponse(401, "Unauthorized");+ }+ const currentUserSale = await supabaseAdmin+ .from("sales")+ .select("*")+ .eq("user_id", data.user.id)+ .single();++ if (!currentUserSale?.data) {+ return createErrorResponse(401, "Unauthorized");+ }+ if (req.method === "POST") {+ return inviteUser(req, currentUserSale.data);+ }++ if (req.method === "PATCH") {+ return patchUser(req, currentUserSale.data);+ }++ return createErrorResponse(405, "Method Not Allowed");});diff --git a/supabase/templates/invite.html b/supabase/templates/invite.htmlindex 5f53082e..eadf62d8 100644--- a/supabase/templates/invite.html+++ b/supabase/templates/invite.html@@ -1,73 +1,70 @@<!doctype html><html>- <head>- <style>- body {- font-family: Arial, sans-serif;- background-color: #f4f4f4;- margin: 0;- padding: 0;- }- .container {- width: 100%;- max-width: 600px;- margin: 0 auto;- background-color: #ffffff;- padding: 20px;- border-radius: 8px;- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);- }- .header {- text-align: center;- padding: 10px 0;- }- .header h2 {- margin: 0;- color: #333333;- }- .content {- padding: 20px;- line-height: 1.6;- color: #555555;- }- .content p {- margin: 0 0 10px;- }- .button {- display: block;- width: 200px;- margin: 20px auto;- padding: 10px;- text-align: center;- background-color: #007bff;- color: #ffffff !important;- text-decoration: none;- border-radius: 5px;- }- </style>- </head>- <body>- <div class="container">- <div class="header">- <h2>Confirm your account</h2>- </div>- <div class="content">- <p>Hello {{ .Data.first_name }},</p>- <p>- You've been invited to join Atomic CRM. To confirm your- account and choose your password, please click the link- below.- </p>- <p>- <a- href="{{ .ConfirmationURL }}auth-callback.html"- class="button"- >Create my account</a- >- </p>- <p>See you soon!</p>- <p>The Atomic CRM team</p>- </div>- </div>- </body>+ <head>+ <style>+ body {+ font-family: Arial, sans-serif;+ background-color: #f4f4f4;+ margin: 0;+ padding: 0;+ }+ .container {+ width: 100%;+ max-width: 600px;+ margin: 0 auto;+ background-color: #ffffff;+ padding: 20px;+ border-radius: 8px;+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);+ }+ .header {+ text-align: center;+ padding: 10px 0;+ }+ .header h2 {+ margin: 0;+ color: #333333;+ }+ .content {+ padding: 20px;+ line-height: 1.6;+ color: #555555;+ }+ .content p {+ margin: 0 0 10px;+ }+ .button {+ display: block;+ width: 200px;+ margin: 20px auto;+ padding: 10px;+ text-align: center;+ background-color: #007bff;+ color: #ffffff !important;+ text-decoration: none;+ border-radius: 5px;+ }+ </style>+ </head>+ <body>+ <div class="container">+ <div class="header">+ <h2>Confirm your account</h2>+ </div>+ <div class="content">+ <p>Hello {{ .Data.first_name }},</p>+ <p>+ You've been invited to join Atomic CRM. To confirm your account and+ choose your password, please click the link below.+ </p>+ <p>+ <a href="{{ .ConfirmationURL }}auth-callback.html" class="button"+ >Create my account</a+ >+ </p>+ <p>See you soon!</p>+ <p>The Atomic CRM team</p>+ </div>+ </div>+ </body></html>diff --git a/supabase/templates/recovery.html b/supabase/templates/recovery.htmlindex 0965bdd2..5edf765a 100644--- a/supabase/templates/recovery.html+++ b/supabase/templates/recovery.html@@ -1,77 +1,75 @@<!doctype html><html>- <head>- <style>- body {- font-family: Arial, sans-serif;- background-color: #f4f4f4;- margin: 0;- padding: 0;- }- .container {- width: 100%;- max-width: 600px;- margin: 0 auto;- background-color: #ffffff;- padding: 20px;- border-radius: 8px;- box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);- }- .header {- text-align: center;- padding: 10px 0;- }- .header h2 {- margin: 0;- color: #333333;- }- .content {- padding: 20px;- line-height: 1.6;- color: #555555;- }- .content p {- margin: 0 0 10px;- }- .button {- display: block;- width: 200px;- margin: 20px auto;- padding: 10px;- text-align: center;- background-color: #007bff;- color: #ffffff !important;- text-decoration: none;- border-radius: 5px;- }- </style>- </head>- <body>- <div class="container">- <div class="header">- <h2>Reset Your Atomic CRM Password</h2>- </div>- <div class="content">- <p>Hello,</p>- <p>- We've received a request to reset the password for the- Atomic CRM account associated with the email {{ .Email }}.- No changes have been made to your account yet.- </p>- <p>You can reset your password by clicking the button below.</p>- <p>- <a- href="{{ .ConfirmationURL }}auth-callback.html"- class="button"- >Reset your password</a- >- </p>- <p>- If you did not request a new password, please contact the- Atomic CRM administrator immediately.- </p>- <p>The Atomic CRM team</p>- </div>- </div>- </body>+ <head>+ <style>+ body {+ font-family: Arial, sans-serif;+ background-color: #f4f4f4;+ margin: 0;+ padding: 0;+ }+ .container {+ width: 100%;+ max-width: 600px;+ margin: 0 auto;+ background-color: #ffffff;+ padding: 20px;+ border-radius: 8px;+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);+ }+ .header {+ text-align: center;+ padding: 10px 0;+ }+ .header h2 {+ margin: 0;+ color: #333333;+ }+ .content {+ padding: 20px;+ line-height: 1.6;+ color: #555555;+ }+ .content p {+ margin: 0 0 10px;+ }+ .button {+ display: block;+ width: 200px;+ margin: 20px auto;+ padding: 10px;+ text-align: center;+ background-color: #007bff;+ color: #ffffff !important;+ text-decoration: none;+ border-radius: 5px;+ }+ </style>+ </head>+ <body>+ <div class="container">+ <div class="header">+ <h2>Reset Your Atomic CRM Password</h2>+ </div>+ <div class="content">+ <p>Hello,</p>+ <p>+ We've received a request to reset the password for the Atomic CRM+ account associated with the email {{ .Email }}. No changes have been+ made to your account yet.+ </p>+ <p>You can reset your password by clicking the button below.</p>+ <p>+ <a href="{{ .ConfirmationURL }}auth-callback.html" class="button"+ >Reset your password</a+ >+ </p>+ <p>+ If you did not request a new password, please contact the Atomic CRM+ administrator immediately.+ </p>+ <p>The Atomic CRM team</p>+ </div>+ </div>+ </body></html>diff --git a/vitest.config.ts b/vitest.config.tsindex d05168d0..e2ec3329 100644--- a/vitest.config.ts+++ b/vitest.config.ts@@ -1,7 +1,7 @@-import {defineConfig} from 'vitest/config';+import { defineConfig } from "vitest/config";export default defineConfig({- test: {- globals: true,- },+ test: {+ globals: true,+ },});