A full-featured CRM built with React, shadcn/ui, and Supabase.
Remove double progress while loading
François Zaninotto89bb00081603
diff --git a/src/companies/CompanyList.tsx b/src/companies/CompanyList.tsxindex fac7d832..0c795dd1 100644--- a/src/companies/CompanyList.tsx+++ b/src/companies/CompanyList.tsx@@ -1,4 +1,3 @@-import * as React from 'react';import {TopToolbar,ExportButton,@@ -13,7 +12,7 @@ import {import { ImageList } from './GridList';import { CompanyListFilter } from './CompanyListFilter';-import { LinearProgress, Stack } from '@mui/material';+import { Stack } from '@mui/material';import { CompanyEmpty } from './CompanyEmpty';export const CompanyList = () => {@@ -30,7 +29,7 @@ const CompanyListLayout = () => {const { data, isPending, filterValues } = useListContext();const hasFilters = filterValues && Object.keys(filterValues).length > 0;- if (isPending) return <LinearProgress />;+ if (isPending) return null;if (!data?.length && !hasFilters) return <CompanyEmpty />;return (diff --git a/src/contacts/ContactList.tsx b/src/contacts/ContactList.tsxindex ef45db01..5d8702db 100644--- a/src/contacts/ContactList.tsx+++ b/src/contacts/ContactList.tsx@@ -1,5 +1,5 @@/* eslint-disable import/no-anonymous-default-export */-import { Card, LinearProgress, Stack } from '@mui/material';+import { Card, Stack } from '@mui/material';import jsonExport from 'jsonexport/dist';import type { Exporter, Identifier, RaRecord } from 'react-admin';import {@@ -17,6 +17,7 @@ import {useGetIdentity,useListContext,} from 'react-admin';+import { Company, Contact, Sale, Tag } from '../types';import { ContactEmpty } from './ContactEmpty';import { ContactImportButton } from './ContactImportButton';@@ -45,8 +46,7 @@ const ContactListLayout = () => {const hasFilters = filterValues && Object.keys(filterValues).length > 0;- if (!identity) return null;- if (isPending) return <LinearProgress />;+ if (!identity || isPending) return null;if (!data?.length && !hasFilters) return <ContactEmpty />;diff --git a/src/deals/DealList.tsx b/src/deals/DealList.tsxindex 38ce8e60..05546bad 100644--- a/src/deals/DealList.tsx+++ b/src/deals/DealList.tsx@@ -14,7 +14,7 @@ import {} from 'react-admin';import { matchPath, useLocation } from 'react-router';-import { Card, LinearProgress, Stack } from '@mui/material';+import { Card, Stack } from '@mui/material';import { useConfigurationContext } from '../root/ConfigurationContext';import { DealArchivedList } from './DealArchivedList';import { DealCreate } from './DealCreate';@@ -63,7 +63,7 @@ const DealLayout = () => {const { data, isPending, filterValues } = useListContext();const hasFilters = filterValues && Object.keys(filterValues).length > 0;- if (isPending) return <LinearProgress />;+ if (isPending) return null;if (!data?.length && !hasFilters)return (<>diff --git a/src/layout/Layout.tsx b/src/layout/Layout.tsxindex ceb28c36..6ce6dff0 100644--- a/src/layout/Layout.tsx+++ b/src/layout/Layout.tsx@@ -1,9 +1,8 @@import { Suspense, ReactNode } from 'react';import { CssBaseline, Container } from '@mui/material';-import { CheckForApplicationUpdate } from 'react-admin';+import { Error, Loading, CheckForApplicationUpdate } from 'react-admin';import { ErrorBoundary } from 'react-error-boundary';-import { Error, Loading } from 'react-admin';import Header from './Header';const Layout = ({ children }: { children: ReactNode }) => (