Skip to content

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

Merge branch 'main' into highrise-import

React-Admin CI03146a4a224d
diff --cc package-lock.json
index 2851c45c,e7f714fb..5f7e71ee
--- a/package-lock.json
+++ b/package-lock.json
@@@ -36,15 -34,11 +36,15 @@@
"diacritic": "^0.0.2",
"faker": "^5.5.3",
"inflection": "^3.0.2",
+ "json-stream-es": "^1.2.1",
"jsonexport": "^3.2.0",
- "lodash": "^4.17.21",
+ "lodash": "^4.17.23",
"lucide-react": "^0.542.0",
+ "mime": "^4.1.0",
+ "ms": "^2.1.3",
"next-themes": "^0.4.6",
"papaparse": "^5.5.3",
+ "qs": "^6.14.1",
"query-string": "^7.1.3",
"ra-core": "^5.13.4",
"ra-data-fakerest": "^5.10.0",
diff --cc package.json
index be8b478d,48ae005e..eca48c3f
--- a/package.json
+++ b/package.json
@@@ -49,15 -47,11 +49,15 @@@
"diacritic": "^0.0.2",
"faker": "^5.5.3",
"inflection": "^3.0.2",
+ "json-stream-es": "^1.2.1",
"jsonexport": "^3.2.0",
- "lodash": "^4.17.21",
+ "lodash": "^4.17.23",
"lucide-react": "^0.542.0",
+ "mime": "^4.1.0",
+ "ms": "^2.1.3",
"next-themes": "^0.4.6",
"papaparse": "^5.5.3",
+ "qs": "^6.14.1",
"query-string": "^7.1.3",
"ra-core": "^5.13.4",
"ra-data-fakerest": "^5.10.0",
diff --cc src/components/atomic-crm/providers/supabase/dataProvider.ts
index f832494f,45943807..d6795d74
--- a/src/components/atomic-crm/providers/supabase/dataProvider.ts
+++ b/src/components/atomic-crm/providers/supabase/dataProvider.ts
@@@ -207,96 -235,100 +207,96 @@@ const dataProviderWithCustomMethods =
export type CrmDataProvider = typeof dataProviderWithCustomMethods;
-export const dataProvider = withLifecycleCallbacks(
- dataProviderWithCustomMethods,
- [
- {
- resource: "contact_notes",
- beforeSave: async (data: ContactNote, _, __) => {
- if (data.attachments) {
- for (const fi of data.attachments) {
- await uploadToBucket(fi);
- }
- }
- return data;
- },
+const lifeCycleCallbacks: ResourceCallbacks[] = [
+ {
- resource: "contactNotes",
++ resource: "contact_notes",
+ beforeSave: async (data: ContactNote, _, __) => {
+ if (data.attachments) {
+ data.attachments = await Promise.all(
+ data.attachments.map((fi) => uploadToBucket(fi)),
+ );
+ }
+ return data;
},
- {
- resource: "deal_notes",
- beforeSave: async (data: DealNote, _, __) => {
- if (data.attachments) {
- for (const fi of data.attachments) {
- await uploadToBucket(fi);
- }
- }
- return data;
- },
+ },
+ {
- resource: "dealNotes",
++ resource: "deal_notes",
+ beforeSave: async (data: DealNote, _, __) => {
+ if (data.attachments) {
+ data.attachments = await Promise.all(
+ data.attachments.map((fi) => uploadToBucket(fi)),
+ );
+ }
+ return data;
},
- {
- resource: "sales",
- beforeSave: async (data: Sale, _, __) => {
- if (data.avatar) {
- await uploadToBucket(data.avatar);
- }
- return data;
- },
+ },
+ {
+ resource: "sales",
+ beforeSave: async (data: Sale, _, __) => {
+ if (data.avatar) {
+ await uploadToBucket(data.avatar);
+ }
+ return data;
},
- {
- resource: "contacts",
- beforeCreate: async (params) => {
- return processContactAvatar(params);
- },
- beforeUpdate: async (params) => {
- return processContactAvatar(params);
- },
- beforeGetList: async (params) => {
- return applyFullTextSearch([
- "first_name",
- "last_name",
- "company_name",
- "title",
- "email",
- "phone",
- "background",
- ])(params);
- },
+ },
+ {
+ resource: "contacts",
+ beforeGetList: async (params) => {
+ return applyFullTextSearch([
+ "first_name",
+ "last_name",
+ "company_name",
+ "title",
+ "email",
+ "phone",
+ "background",
+ ])(params);
},
- {
- resource: "companies",
- beforeGetList: async (params) => {
- return applyFullTextSearch([
- "name",
- "phone_number",
- "website",
- "zipcode",
- "city",
- "state_abbr",
- ])(params);
- },
- beforeCreate: async (params) => {
- const createParams = await processCompanyLogo(params);
-
- return {
- ...createParams,
- data: {
- ...createParams.data,
- created_at: new Date().toISOString(),
- },
- };
- },
- beforeUpdate: async (params) => {
- return await processCompanyLogo(params);
- },
+ },
+ {
+ resource: "companies",
+ beforeGetList: async (params) => {
+ return applyFullTextSearch([
+ "name",
+ "phone_number",
+ "website",
+ "zipcode",
+ "city",
+ "stateAbbr",
+ ])(params);
},
- {
- resource: "contacts_summary",
- beforeGetList: async (params) => {
- return applyFullTextSearch(["first_name", "last_name"])(params);
- },
+ beforeCreate: async (params) => {
+ const createParams = await processCompanyLogo(params);
+
+ return {
+ ...createParams,
+ data: {
+ ...createParams.data,
+ created_at: new Date().toISOString(),
+ },
+ };
},
- {
- resource: "deals",
- beforeGetList: async (params) => {
- return applyFullTextSearch(["name", "type", "description"])(params);
- },
+ beforeUpdate: async (params) => {
+ return await processCompanyLogo(params);
+ },
+ },
+ {
+ resource: "contacts_summary",
+ beforeGetList: async (params) => {
+ return applyFullTextSearch(["first_name", "last_name"])(params);
+ },
+ },
+ {
+ resource: "deals",
+ beforeGetList: async (params) => {
+ return applyFullTextSearch(["name", "type", "description"])(params);
},
- ],
+ },
+];
+
+export const dataProvider = withLifecycleCallbacks(
+ dataProviderWithCustomMethods,
+ lifeCycleCallbacks,
);
const applyFullTextSearch = (columns: string[]) => (params: GetListParams) => {
diff --cc src/components/atomic-crm/types.ts
index 7cd2284c,831c0b25..1a90e747
--- a/src/components/atomic-crm/types.ts
+++ b/src/components/atomic-crm/types.ts
@@@ -59,8 -59,8 +59,8 @@@ export type Company =
address: string;
zipcode: string;
city: string;
- stateAbbr: string;
+ state_abbr: string;
- sales_id: Identifier;
+ sales_id?: Identifier | null;
created_at: string;
description: string;
revenue: string;