Skip to content

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

Fix types

François Zaninottof18090a58e4b
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e44af946..f2b29315 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -45,6 +45,28 @@ jobs:
prettier: true
prettier_args: "--config ./.prettierrc.json \"**/*.{js,json,ts,tsx,css,md,html}\""
+
+ typecheck:
+ name: 🏷️ Typecheck
+ timeout-minutes: 10
+ runs-on: ubuntu-latest
+ if: ${{ !github.event.pull_request.draft || github.event_name == 'push' }}
+ steps:
+ - name: 📥 Checkout repo
+ uses: actions/checkout@v4
+
+ - name: ⚙️ Setup node
+ uses: actions/setup-node@v4
+ with:
+ node-version: 20
+ cache: npm
+
+ - name: 📥 Download deps
+ run: npm ci
+
+ - name: 🏷️ Typecheck
+ run: npm run typecheck
+
test-app:
name: 🔎 Test
runs-on: ubuntu-latest
diff --git a/package.json b/package.json
index 66579cf7..d8ff8a23 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"build": "tsc && vite build",
"build:e2e": "vite build --mode e2e",
"build:demo": "tsc && vite build --config vite.demo.config",
- "typecheck": "tsc --noEmit",
+ "typecheck": "tsc --noEmit --project tsconfig.app.json",
"preview": "vite preview",
"lint:apply": "eslint **/*.{mjs,ts,tsx} --fix",
"lint": "eslint **/*.{mjs,ts,tsx}",
diff --git a/registry.json b/registry.json
index 16be1eda..bd582791 100644
--- a/registry.json
+++ b/registry.json
@@ -453,10 +453,6 @@
"path": "src/components/atomic-crm/misc/ImportPage.tsx",
"type": "registry:component"
},
- {
- "path": "src/components/atomic-crm/misc/ImportFromJsonButton.tsx",
- "type": "registry:component"
- },
{
"path": "src/components/atomic-crm/misc/ImageEditorField.tsx",
"type": "registry:component"
diff --git a/src/components/atomic-crm/contacts/ContactList.tsx b/src/components/atomic-crm/contacts/ContactList.tsx
index d687665c..3df2aea6 100644
--- a/src/components/atomic-crm/contacts/ContactList.tsx
+++ b/src/components/atomic-crm/contacts/ContactList.tsx
@@ -154,9 +154,9 @@ const exporter: Exporter<Contact> = async (records, fetchRelatedRecords) => {
contact.company_id != null
? companies[contact.company_id].name
: undefined,
- sales: `${sales[contact.sales_id].first_name} ${
- sales[contact.sales_id].last_name
- }`,
+ sales: contact.sales_id != null
+ ? `${sales[contact.sales_id].first_name} ${sales[contact.sales_id].last_name}`
+ : undefined,
tags: contact.tags.map((tagId) => tags[tagId].name).join(", "),
email_work: contact.email_jsonb?.find((email) => email.type === "Work")
?.email,
diff --git a/src/components/atomic-crm/contacts/ExportVCardButton.tsx b/src/components/atomic-crm/contacts/ExportVCardButton.tsx
index 89d28517..bb7b7c49 100644
--- a/src/components/atomic-crm/contacts/ExportVCardButton.tsx
+++ b/src/components/atomic-crm/contacts/ExportVCardButton.tsx
@@ -11,7 +11,7 @@ export const ExportVCardButton = () => {
// Fetch the company data on mount
const { data: company } = useGetOne<Company>(
"companies",
- { id: contact?.company_id },
+ { id: contact?.company_id ?? undefined },
{ enabled: !!contact?.company_id },
);
diff --git a/src/components/atomic-crm/contacts/TagsListEdit.tsx b/src/components/atomic-crm/contacts/TagsListEdit.tsx
index d5dd513c..ac038676 100644
--- a/src/components/atomic-crm/contacts/TagsListEdit.tsx
+++ b/src/components/atomic-crm/contacts/TagsListEdit.tsx
@@ -41,7 +41,7 @@ export const TagsListEdit = () => {
record &&
allTags.filter((tag) => !record.tags?.includes(tag.id));
- const handleTagAdd = (id: Identifier) => {
+ const handleTagAdd = (id: number) => {
if (!record) {
throw new Error("No contact record found");
}
diff --git a/src/components/atomic-crm/misc/ImportFromJsonButton.tsx b/src/components/atomic-crm/misc/ImportFromJsonButton.tsx
deleted file mode 100644
index 62e1d5b8..00000000
--- a/src/components/atomic-crm/misc/ImportFromJsonButton.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Button } from "@/components/ui/button";
-import { useState } from "react";
-import { ImportFromJsonDialog } from "./ImportFromJsonDialog";
-import { Upload } from "lucide-react";
-
-export const ImportFromJsonButton = () => {
- const [modalOpen, setModalOpen] = useState(false);
-
- const handleOpenModal = () => {
- setModalOpen(true);
- };
-
- const handleCloseModal = (open: boolean) => {
- setModalOpen(open);
- };
-
- return (
- <>
- <Button
- variant="outline"
- onClick={handleOpenModal}
- className="flex items-center gap-2 cursor-pointer"
- >
- <Upload /> Import JSON file
- </Button>
- <ImportFromJsonDialog open={modalOpen} onOpenChange={handleCloseModal} />
- </>
- );
-};
diff --git a/src/components/atomic-crm/notes/NoteInputs.tsx b/src/components/atomic-crm/notes/NoteInputs.tsx
index 234748e7..6e3f9857 100644
--- a/src/components/atomic-crm/notes/NoteInputs.tsx
+++ b/src/components/atomic-crm/notes/NoteInputs.tsx
@@ -8,6 +8,7 @@ import { Button } from "@/components/ui/button";
import { cn } from "@/lib/utils";
import { useFormContext, useWatch } from "react-hook-form";
+import type { ContactNote, DealNote } from "../types";
import { Status } from "../misc/Status";
import { useConfigurationContext } from "../root/ConfigurationContext";
import { getCurrentDate } from "./utils";
@@ -33,7 +34,9 @@ export const NoteInputs = ({
const [displayMore, setDisplayMore] = useState(false);
const [isFocused, setIsFocused] = useState(false);
const containerRef = useRef<HTMLDivElement>(null);
- const { control, formState, setValue } = useFormContext();
+ const { control, formState, setValue } = useFormContext<
+ ContactNote | DealNote
+ >();
const selectedContactId = useWatch({ control, name: "contact_id" });
const selectedStatus = useWatch({ control, name: "status" });
const textValue = useWatch({ control, name: "text" as any });
diff --git a/src/components/atomic-crm/providers/commons/activity.ts b/src/components/atomic-crm/providers/commons/activity.ts
index 6655074f..7f41cc24 100644
--- a/src/components/atomic-crm/providers/commons/activity.ts
+++ b/src/components/atomic-crm/providers/commons/activity.ts
@@ -66,14 +66,16 @@ const getNewCompanies = async (
pagination: { page: 1, perPage: 250 },
sort: { field: "created_at", order: "DESC" },
});
- return companies.map((company) => ({
- id: `company.${company.id}.created`,
- type: COMPANY_CREATED,
- company_id: company.id,
- company,
- sales_id: company.sales_id,
- date: company.created_at,
- }));
+ return companies
+ .filter((company: Company) => company.sales_id != null)
+ .map((company) => ({
+ id: `company.${company.id}.created`,
+ type: COMPANY_CREATED,
+ company_id: company.id,
+ company,
+ sales_id: company.sales_id!,
+ date: company.created_at,
+ }));
};
async function getNewContactsAndNotes(
@@ -106,14 +108,16 @@ async function getNewContactsAndNotes(
},
);
- const newContacts = contacts.map((contact) => ({
- id: `contact.${contact.id}.created`,
- type: CONTACT_CREATED,
- company_id: contact.company_id,
- sales_id: contact.sales_id,
- contact,
- date: contact.first_seen,
- }));
+ const newContacts = contacts
+ .filter((contact): contact is Contact & { company_id: Identifier } => contact.company_id != null)
+ .map((contact) => ({
+ id: `contact.${contact.id}.created`,
+ type: CONTACT_CREATED,
+ company_id: contact.company_id,
+ sales_id: contact.sales_id,
+ contact,
+ date: contact.first_seen,
+ }));
const newContactNotes = contactNotes.map((contactNote) => ({
id: `contactNote.${contactNote.id}.created`,
diff --git a/src/components/atomic-crm/providers/fakerest/dataGenerator/contactNotes.ts b/src/components/atomic-crm/providers/fakerest/dataGenerator/contactNotes.ts
index 11480ff1..da3fe63b 100644
--- a/src/components/atomic-crm/providers/fakerest/dataGenerator/contactNotes.ts
+++ b/src/components/atomic-crm/providers/fakerest/dataGenerator/contactNotes.ts
@@ -18,7 +18,7 @@ export const generateContactNotes = (db: Db): ContactNote[] => {
contact_id: contact.id,
text: lorem.paragraphs(datatype.number({ min: 1, max: 4 })),
date: date.toISOString(),
- sales_id: contact.sales_id,
+ sales_id: contact.sales_id!,
status: random.arrayElement(defaultNoteStatuses).value,
};
});
diff --git a/src/components/atomic-crm/providers/fakerest/dataGenerator/contacts.ts b/src/components/atomic-crm/providers/fakerest/dataGenerator/contacts.ts
index 8c5bd0f9..9c12b44d 100644
--- a/src/components/atomic-crm/providers/fakerest/dataGenerator/contacts.ts
+++ b/src/components/atomic-crm/providers/fakerest/dataGenerator/contacts.ts
@@ -64,11 +64,11 @@ export const generateContacts = (db: Db, size = 500): Required<Contact>[] => {
}
// choose company with people left to know
- let company: Required<Company>;
+ let company: Company;
do {
company = random.arrayElement(db.companies);
- } while (company.nb_contacts >= maxContacts[company.size]);
- company.nb_contacts++;
+ } while ((company.nb_contacts ?? 0) >= maxContacts[company.size]);
+ company.nb_contacts = (company.nb_contacts ?? 0) + 1;
const first_seen = randomDate(new Date(company.created_at)).toISOString();
const last_seen = first_seen;
@@ -93,7 +93,7 @@ export const generateContacts = (db: Db, size = 500): Required<Contact>[] => {
tags: random
.arrayElements(db.tags, random.arrayElement([0, 0, 0, 1, 1, 2]))
.map((tag) => tag.id), // finalize
- sales_id: company.sales_id,
+ sales_id: company.sales_id!,
nb_tasks: 0,
linkedin_url: null,
};
diff --git a/src/components/atomic-crm/providers/fakerest/dataGenerator/deals.ts b/src/components/atomic-crm/providers/fakerest/dataGenerator/deals.ts
index 0db67084..440592c6 100644
--- a/src/components/atomic-crm/providers/fakerest/dataGenerator/deals.ts
+++ b/src/components/atomic-crm/providers/fakerest/dataGenerator/deals.ts
@@ -12,7 +12,7 @@ import { randomDate } from "./utils";
export const generateDeals = (db: Db): Deal[] => {
const deals = Array.from(Array(50).keys()).map((id) => {
const company = random.arrayElement(db.companies);
- company.nb_deals++;
+ company.nb_deals = (company.nb_deals ?? 0) + 1;
const contacts = random.arrayElements(
db.contacts.filter((contact) => contact.company_id === company.id),
datatype.number({ min: 1, max: 3 }),
@@ -39,7 +39,7 @@ export const generateDeals = (db: Db): Deal[] => {
created_at,
updated_at: randomDate(new Date(created_at)).toISOString(),
expected_closing_date,
- sales_id: company.sales_id,
+ sales_id: company.sales_id!,
index: 0,
};
});
diff --git a/src/components/atomic-crm/providers/fakerest/dataGenerator/tasks.ts b/src/components/atomic-crm/providers/fakerest/dataGenerator/tasks.ts
index 9f67db5d..f5a50fe4 100644
--- a/src/components/atomic-crm/providers/fakerest/dataGenerator/tasks.ts
+++ b/src/components/atomic-crm/providers/fakerest/dataGenerator/tasks.ts
@@ -36,7 +36,7 @@ export const type: string[] = [
export const generateTasks = (db: Db) => {
return Array.from(Array(400).keys()).map<Task>((id) => {
const contact = random.arrayElement(db.contacts);
- contact.nb_tasks++;
+ contact.nb_tasks = (contact.nb_tasks ?? 0) + 1;
return {
id,
contact_id: contact.id,
diff --git a/src/components/atomic-crm/providers/supabase/dataProvider.ts b/src/components/atomic-crm/providers/supabase/dataProvider.ts
index 26b4e749..d588e9aa 100644
--- a/src/components/atomic-crm/providers/supabase/dataProvider.ts
+++ b/src/components/atomic-crm/providers/supabase/dataProvider.ts
@@ -105,7 +105,7 @@ const getDataProviderWithCustomMethods = () => {
}
// Update the is initialized cache
- getIsInitialized._is_initialized_cache = true;
+ (getIsInitialized as any)._is_initialized_cache = true;
return {
id: response.data.user.id,
@@ -404,7 +404,7 @@ const uploadToBucket = async (fi: RAFile) => {
if (!fi.src.startsWith("blob:") && !fi.src.startsWith("data:")) {
// Sign URL check if path exists in the bucket
if (fi.path) {
- const { error } = await supabase.storage
+ const { error } = await getSupabaseClient().storage
.from(ATTACHMENTS_BUCKET)
.createSignedUrl(fi.path, 60);
@@ -438,7 +438,7 @@ const uploadToBucket = async (fi: RAFile) => {
const fileExt = fileParts.length > 1 ? `.${file.name.split(".").pop()}` : "";
const fileName = `${Math.random()}${fileExt}`;
const filePath = `${fileName}`;
- const { error: uploadError } = await supabase.storage
+ const { error: uploadError } = await getSupabaseClient().storage
.from(ATTACHMENTS_BUCKET)
.upload(filePath, dataContent);
@@ -447,7 +447,7 @@ const uploadToBucket = async (fi: RAFile) => {
throw new Error("Failed to upload attachment");
}
- const { data } = supabase.storage
+ const { data } = getSupabaseClient().storage
.from(ATTACHMENTS_BUCKET)
.getPublicUrl(filePath);
diff --git a/src/components/atomic-crm/types.ts b/src/components/atomic-crm/types.ts
index 333a5188..6d1d6ff6 100644
--- a/src/components/atomic-crm/types.ts
+++ b/src/components/atomic-crm/types.ts
@@ -92,7 +92,7 @@ export type Contact = {
first_seen: string;
last_seen: string;
has_newsletter: boolean;
- tags: Identifier[];
+ tags: number[];
gender: string;
sales_id?: Identifier;
status: string;
diff --git a/src/test/StoryWrapper.tsx b/src/test/StoryWrapper.tsx
index 5ff8ecb6..f9f1a16f 100644
--- a/src/test/StoryWrapper.tsx
+++ b/src/test/StoryWrapper.tsx
@@ -26,7 +26,7 @@ export const createTestAuthProvider = (): AuthProvider => ({
const baseSale: Sale = {
administrator: true,
- avatar: DEFAULT_USER.avatar,
+ avatar: DEFAULT_USER.avatar as Sale["avatar"],
disabled: false,
email: DEFAULT_USER.email,
first_name: DEFAULT_USER.first_name,
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 06b96674..c90f33bd 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -32,5 +32,5 @@
"@/*": ["./src/*"]
}
},
- "include": ["src", "demo", "vitest.d.ts"]
+ "include": ["src", "demo", "vitest-browser.d.ts"]
}
diff --git a/vitest.d.ts b/vitest-browser.d.ts
similarity index 100%
rename from vitest.d.ts
rename to vitest-browser.d.ts