diff --git a/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx b/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx index 2392b8b..ccf1364 100644 --- a/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx +++ b/src/widgets/CatalogueJurForm/CatalogueJurForm.tsx @@ -54,9 +54,7 @@ export const CatalogueJurForm: React.FC = ({ open, onCancel, onOk, jurId } catch (e) { if (e instanceof ApiError) { notification.error({ description: e.message }); - } else { - console.error(e); - } + } } finally { setInitialDataLoading(false); } @@ -115,8 +113,6 @@ export const CatalogueJurForm: React.FC = ({ open, onCancel, onOk, jurId notification.error({ description: e.message, }); - } else if (e instanceof Error && e.name !== 'ValidationError') { - console.error(e); } } finally { setConfirmLoading(false); diff --git a/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx b/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx index 9306b33..edb5b12 100644 --- a/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx +++ b/src/widgets/CatalogueJurTable/CatalogueJurTable.tsx @@ -60,7 +60,7 @@ export function CatalogueJurTable({ outside_group, tabsComponent }: CatalogueJur }); } return rawRows; - }, [rawRows, relatedGroupFilter]); + }, [rawRows, relatedGroupFilter, outside_group]); const { visibleKeys, setVisibleKeys } = useVisibleColumns(catalogueJurConfig); const { rawQuery, setRawQuery, columnFilters, setColumnFilters, sort, setSort, resetAll, hasActiveFilters } = diff --git a/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx b/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx index c970080..7f6653f 100644 --- a/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx +++ b/src/widgets/CompanyGroupForm/CompanyGroupForm.tsx @@ -52,8 +52,6 @@ export const CompanyGroupForm: React.FC = ({ open, onCancel, onOk }) => { notification.error({ description: e.message, }); - } else if (e instanceof Error && e.name !== 'ValidationError') { - console.error(e); } } finally { setConfirmLoading(false); diff --git a/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx b/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx index bfea78e..f6b0fcd 100644 --- a/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx +++ b/src/widgets/CompanyGroupsList/CompanyGroupsList.tsx @@ -39,6 +39,14 @@ export const CompanyGroupsList = () => { } }, [rawRows, activeCompanyGroup, dispatch]); + if (loading) { + return ( +
+ +
+ ); + } + return (
{
- {loading ? ( -
- -
- ) : filtered.length === 0 ? ( + {filtered.length === 0 ? ( ) : (
@@ -72,7 +76,7 @@ export const CompanyGroupsList = () => { { + renderItem={({ item }) => { const active = item.id === activeCompanyGroup?.id; return (