Merge remote-tracking branch 'origin/fix/last_tasks'

client/src/containers/Items/ItemCategoriesList.js

@@ -19,6 +19,9 @@ import withItemCategoriesActions from 'containers/Items/withItemCategoriesAction
 
 import { compose } from 'utils';
 
+/**
+ * Item categories list.
+ */
 const ItemCategoryList = ({
   // #withDashboardActions
   changePageTitle,
@@ -182,9 +185,7 @@ const ItemCategoryList = ({
       >
         <p>
           <FormattedHTMLMessage
-            id={
-              'once_delete_these_item_categories_you_will_not_able_restore_them'
-            }
+            id={'once_delete_these_items_you_will_not_able_restore_them'}
           />
         </p>
       </Alert>

client/src/containers/Items/ItemCategoriesTable.js

@@ -1,5 +1,11 @@
 import React, { useCallback, useMemo } from 'react';
-import { Button, Popover, Menu, MenuItem, Position } from '@blueprintjs/core';
+import {
+  Button,
+  Popover,
+  Menu,
+  MenuItem,
+  Position,
+} from '@blueprintjs/core';
 import { FormattedMessage as T, useIntl } from 'react-intl';
 
 import Icon from 'components/Icon';

client/src/containers/Items/ItemsCategoryActionsBar.js

@@ -1,6 +1,7 @@
 import React, { useCallback, useMemo,useState } from 'react';
 import {
   NavbarGroup,
+  NavbarDivider,
   Button,
   Classes,
   Intent,
@@ -70,6 +71,8 @@ const ItemsCategoryActionsBar = ({
           text={<T id={'new_category'}/>}
           onClick={onClickNewCategory}
         />
+        <NavbarDivider />
+
         <Popover
           minimal={true}
           content={filterDropdown}
@@ -79,14 +82,14 @@ const ItemsCategoryActionsBar = ({
           <Button
             className={classNames(Classes.MINIMAL, 'button--filter')}
             text={ filterCount <= 0 ? <T id={'filter'}/> : `${filterCount} filters applied`}
-            icon={<Icon icon='filter-18' iconSize={18} />}
+            icon={<Icon icon='filter-16' iconSize={16} />}
           />
         </Popover>
 
         <If condition={hasSelectedRows}>
           <Button
             className={Classes.MINIMAL}
-            icon={<Icon icon='trash' iconSize={15} />}
+            icon={<Icon icon='trash-16' iconSize={16} />}
             text={<T id={'delete'}/>}
             intent={Intent.DANGER}
             onClick={handelBulkDelete}
@@ -95,12 +98,12 @@ const ItemsCategoryActionsBar = ({
 
         <Button
           className={Classes.MINIMAL}
-          icon={<Icon icon='file-import' />}
+          icon={<Icon icon='file-import-16' iconSize={16} />}
           text={<T id={'import'}/>}
         />
         <Button
           className={Classes.MINIMAL}
-          icon={<Icon icon='file-export' />}
+          icon={<Icon icon='file-export-16' iconSize={16} />}
           text={<T id={'export'}/>}
         />
       </NavbarGroup>