A full-featured CRM built with React, shadcn/ui, and Supabase.
Feat(sales): Add sales edit support
Jonathan ARNAULTd948e72e33a2
diff --git a/src/dataProvider.ts b/src/dataProvider.tsindex 2b90e10b..043a2bfd 100644--- a/src/dataProvider.ts+++ b/src/dataProvider.ts@@ -50,76 +50,45 @@ const dataProviderWithCustomMethods = {password,};},- async salesCreate({ administrator, ...signUpData }: SalesFormData) {- const { data, error } = await supabase.functions.invoke<{- user: { id: Identifier };- }>('users', {+ async salesCreate(body: SalesFormData) {+ const { data, error } = await supabase.functions.invoke<Sale>('users', {method: 'POST',- body: signUpData,+ body,});- if (!data?.user || error) {+ if (!data || error) {console.error('salesCreate.error', error);- throw new Error('Failed to create user');+ throw new Error('Failed to create account manager');}- console.log('data.user.id', data.user.id);-- // We need to update sale administrator role here as we can't do it in signUp method as- // it is not supported in the trigger for security reasons.- const { data: users, error: userError } = await supabase- .from('sales')- .update({ administrator })- .eq('user_id', data.user.id)- .select('*');-- console.log(users, administrator);- if (!users?.length || userError) {- // We silently fail here as the user is created but the role is not updated- return null;- }-- return users.at(0);+ return data;},async salesUpdate(id: Identifier,data: Partial<Omit<SalesFormData, 'password'>>) {- const { data: sale } = await baseDataProvider.getOne<Sale>('sales', {- id,- });-- if (!sale) {- return null;- }-const { email, first_name, last_name, administrator } = data;- const updatedUser = await supabase.auth.admin.updateUserById(- sale.user_id,+ const { data: sale, error } = await supabase.functions.invoke<Sale>(+ 'users',{- email,- user_metadata: {+ method: 'PATCH',+ body: {+ sales_id: id,+ email,first_name,last_name,+ administrator,},});- if (updatedUser.error) {- console.error('salesUpdate.error', updatedUser.error);- throw new Error('Failed to update sale');+ if (!sale || error) {+ console.error('salesCreate.error', error);+ throw new Error('Failed to update account manager');}- return await baseDataProvider.update('sales', {- id,- data: {- first_name,- last_name,- administrator,- },- previousData: sale,- });+ return data;},async transferAdministratorRole(from: Identifier, to: Identifier) {const { data: sales } = await baseDataProvider.getList('sales', {diff --git a/src/sales/SalesEdit.tsx b/src/sales/SalesEdit.tsxindex ba425c11..fa45d06a 100644--- a/src/sales/SalesEdit.tsx+++ b/src/sales/SalesEdit.tsx@@ -65,8 +65,6 @@ export function SalesEdit() {mutate(data);};- console.log('record', record);-return (<Container maxWidth="sm" sx={{ mt: 4 }}><Card>diff --git a/supabase/functions/users/index.ts b/supabase/functions/users/index.tsindex bb55ea11..dbca3d67 100644--- a/supabase/functions/users/index.ts+++ b/supabase/functions/users/index.ts@@ -5,6 +5,7 @@ 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',};const supabaseServiceClient = createClient(@@ -25,23 +26,98 @@ function createErrorResponse(status: number, message: string) {});}+async function updateSaleAdministrator(+ user_id: string,+ administrator: boolean+) {+ const { data: sales, error: salesError } = await supabaseServiceClient+ .from('sales')+ .update({ administrator })+ .eq('user_id', user_id)+ .select('*');++ if (!sales?.length || salesError) {+ console.error('Error inviting user:', salesError);+ throw salesError ?? new Error('Failed to update sale');+ }+ return sales.at(0);+}+async function inviteUser(req: Request) {- const { email, password, first_name, last_name } = await req.json();+ const { email, password, first_name, last_name, administrator } =+ await req.json();- const { data, error } = await supabaseServiceClient.auth.admin.createUser({- email,- password,- user_metadata: { first_name, last_name },- });+ const { data, error: userError } =+ await supabaseServiceClient.auth.admin.createUser({+ email,+ password,+ user_metadata: { first_name, last_name },+ });- if (!data || error) {- console.error('Error inviting user:', error);+ if (!data?.user || userError) {+ console.error('Error inviting user:', userError);return createErrorResponse(500, 'Internal Server Error');}- return new Response(JSON.stringify(data), {- headers: { 'Content-Type': 'application/json', ...corsHeaders },- });+ try {+ 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) {+ const { sales_id, email, first_name, last_name, administrator } =+ await req.json();++ const { data: sale } = await supabaseServiceClient+ .from('sales')+ .select('*')+ .eq('id', sales_id)+ .single();++ console.log('sale', sale);++ if (!sale) {+ return createErrorResponse(404, 'Not Found');+ }++ const { data, error: userError } =+ await supabaseServiceClient.auth.admin.updateUserById(sale.user_id, {+ email,+ user_metadata: { first_name, last_name },+ });++ if (!data?.user || userError) {+ console.error('Error patching user:', userError);+ return createErrorResponse(500, 'Internal Server Error');+ }++ try {+ 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) => {@@ -68,5 +144,9 @@ Deno.serve(async (req: Request) => {return inviteUser(req);}+ if (req.method === 'PATCH') {+ return patchUser(req);+ }+return createErrorResponse(405, 'Method Not Allowed');});