diff --git a/client/src/containers/Items/ItemCategoriesList.js b/client/src/containers/Items/ItemCategoriesList.js index 01c824262..e15049fa0 100644 --- a/client/src/containers/Items/ItemCategoriesList.js +++ b/client/src/containers/Items/ItemCategoriesList.js @@ -9,6 +9,7 @@ import { } from 'react-intl'; import AppToaster from 'components/AppToaster'; +import DashboardPageContent from 'components/Dashboard/DashboardPageContent'; import DashboardInsider from 'components/Dashboard/DashboardInsider'; import ItemCategoriesDataTable from 'containers/Items/ItemCategoriesTable'; import ItemsCategoryActionsBar from 'containers/Items/ItemsCategoryActionsBar'; @@ -156,7 +157,7 @@ const ItemCategoryList = ({ return ( + + - + } + confirmButtonText={} + icon="trash" + intent={Intent.DANGER} + isOpen={deleteCategory} + onCancel={handleCancelItemDelete} + onConfirm={handleConfirmItemDelete} + > +

+ +

+
- } - confirmButtonText={} - icon="trash" - intent={Intent.DANGER} - isOpen={deleteCategory} - onCancel={handleCancelItemDelete} - onConfirm={handleConfirmItemDelete} - > -

- -

-
- - } - confirmButtonText={`${formatMessage({ - id: 'delete', - })} (${selectedRowsCount})`} - icon="trash" - intent={Intent.DANGER} - isOpen={bulkDelete} - onCancel={handleCancelBulkDelete} - onConfirm={handleConfirmBulkDelete} - > -

- -

-
+ } + confirmButtonText={`${formatMessage({ + id: 'delete', + })} (${selectedRowsCount})`} + icon="trash" + intent={Intent.DANGER} + isOpen={bulkDelete} + onCancel={handleCancelBulkDelete} + onConfirm={handleConfirmBulkDelete} + > +

+ +

+
+
); }; diff --git a/client/src/containers/Items/ItemCategoriesTable.js b/client/src/containers/Items/ItemCategoriesTable.js index 4347e9965..03e4dba8b 100644 --- a/client/src/containers/Items/ItemCategoriesTable.js +++ b/client/src/containers/Items/ItemCategoriesTable.js @@ -21,6 +21,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions'; const ItemsCategoryList = ({ // #withItemCategories categoriesList, + categoriesTableLoading, // #withDialogActions. openDialog, @@ -72,21 +73,21 @@ const ItemsCategoryList = ({ id: 'name', Header: formatMessage({ id: 'category_name' }), accessor: 'name', - width: 150, + width: 220, }, { id: 'description', Header: formatMessage({ id: 'description' }), accessor: 'description', className: 'description', - width: 150, + width: 220, }, { id: 'count', Header: formatMessage({ id: 'count' }), accessor: 'count', className: 'count', - width: 50, + width: 180, }, { id: 'actions', @@ -94,14 +95,13 @@ const ItemsCategoryList = ({ Cell: ({ cell }) => (