QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 13:20:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Fix/View'

Browse Source
This commit is contained in:
a.bouhuolia
2020-12-17 01:21:34 +02:00
parent ebe9ed108f e398b8c239
commit 897908c1ab
20 changed files with 242 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/containers/Items/ItemsDataTable.js
View File

@@ -46,6 +46,7 @@ function ItemsDataTable({
onInactiveItem,
onActivateItem,
onSelectedRowsChange,
itemsViewLoading,
}) {
const { formatMessage } = useIntl();
const isLoadedBefore = useIsValuePassed(itemsTableLoading, false);
@@ -238,7 +239,9 @@ function ItemsDataTable({
return (
<div className={classNames(CLASSES.DASHBOARD_DATATABLE)}>
<LoadingIndicator loading={itemsTableLoading && !isLoadedBefore}>
<LoadingIndicator
loading={(itemsTableLoading && !isLoadedBefore) || itemsViewLoading}
>
<Choose>
<Choose.When condition={showEmptyStatus}>
<ItemsEmptyStatus />