A full-featured CRM built with React, shadcn/ui, and Supabase.
Fix(init): Remove login required notification if crm is not initialized
Jonathan ARNAULTcf7e5532b44b
diff --git a/src/authProvider.ts b/src/authProvider.tsindex a4ede8ec..56276ea3 100644--- a/src/authProvider.ts+++ b/src/authProvider.ts@@ -1,9 +1,10 @@import { supabaseAuthProvider } from 'ra-supabase';+import { AuthProvider } from 'react-admin';import { supabase } from './supabase';export const USER_STORAGE_KEY = 'user';-export const authProvider = supabaseAuthProvider(supabase, {+const baseAuthProvider = supabaseAuthProvider(supabase, {getIdentity: async user => {const { data, error } = await supabase.from('sales')@@ -29,9 +30,32 @@ export const authProvider = supabaseAuthProvider(supabase, {.single();if (!data || error) {- throw new Error();+ return null;}return data?.administrator ? 'admin' : 'user';},});++export async function getIsInitialized() {+ const { data } = await supabase.from('init_state').select('is_initialized');++ return data?.at(0)?.is_initialized > 0;+}++export const authProvider: AuthProvider = {+ ...baseAuthProvider,+ checkAuth: async params => {+ const isInitialized = await getIsInitialized();++ if (!isInitialized) {+ // eslint-disable-next-line no-throw-literal+ throw {+ redirectTo: '/sign-up',+ message: false,+ };+ }++ return baseAuthProvider.checkAuth(params);+ },+};diff --git a/src/dataProvider.ts b/src/dataProvider.tsindex 45443449..06f899f4 100644--- a/src/dataProvider.ts+++ b/src/dataProvider.ts@@ -8,7 +8,10 @@ import {UpdateParams,withLifecycleCallbacks,} from 'react-admin';+import { getIsInitialized } from './authProvider';import { getActivityLog } from './dataProvider/activity';+import { getCompanyAvatar } from './misc/getCompanyAvatar';+import { getContactAvatar } from './misc/getContactAvatar';import { supabase } from './supabase';import {Contact,@@ -19,8 +22,6 @@ import {SalesFormData,SignUpData,} from './types';-import { getCompanyAvatar } from './misc/getCompanyAvatar';-import { getContactAvatar } from './misc/getContactAvatar';if (import.meta.env.VITE_SUPABASE_URL === undefined) {throw new Error('Please set the VITE_SUPABASE_URL environment variable');@@ -194,11 +195,7 @@ const dataProviderWithCustomMethods = {return getActivityLog(baseDataProvider, companyId);},async isInitialized() {- const { data } = await supabase- .from('init_state')- .select('is_initialized');-- return data?.at(0)?.is_initialized > 0;+ return getIsInitialized();},} satisfies DataProvider;diff --git a/src/root/CRM.tsx b/src/root/CRM.tsxindex 2a6b91e6..ffb635bc 100644--- a/src/root/CRM.tsx+++ b/src/root/CRM.tsx@@ -8,6 +8,7 @@ import {localStorageStore,} from 'react-admin';+import { deepmerge } from '@mui/utils';import { Route } from 'react-router';import Layout from '../Layout';import { authProvider } from '../authProvider';@@ -18,6 +19,7 @@ import { dataProvider } from '../dataProvider';import deals from '../deals';import { LoginPage } from '../login/LoginPage';import { SignupPage } from '../login/SignupPage';+import sales from '../sales';import { SettingsPage } from '../settings/SettingsPage';import {ConfigurationContextValue,@@ -34,8 +36,6 @@ import {defaultTaskTypes,defaultTitle,} from './defaultConfiguration';-import sales from '../sales';-import { deepmerge } from '@mui/utils';// Define the interface for the CRM component propstype CRMProps = {@@ -136,14 +136,11 @@ export const CRM = ({theme={lightTheme}darkTheme={darkTheme || null}>+ <CustomRoutes noLayout>+ <Route path={SignupPage.path} element={<SignupPage />} />+ </CustomRoutes>{permissions => (<>- <CustomRoutes noLayout>- <Route- path={SignupPage.path}- element={<SignupPage />}- />- </CustomRoutes><CustomRoutes><Routepath={SettingsPage.path}