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

feat(branches & warehouses): fix Context menu.

Browse Source
This commit is contained in:
elforjani13
2022-03-13 14:30:52 +02:00
parent c5c490d7ce
commit 0bbd31dcce
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/containers/Preferences/Branches/components.js
View File

@@ -3,7 +3,7 @@ import intl from 'react-intl-universal';
import { Intent, Menu, MenuDivider, MenuItem } from '@blueprintjs/core'; import { Intent, Menu, MenuDivider, MenuItem } from '@blueprintjs/core';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
import { Icon } from 'components'; import { Icon, If } from 'components';
/** /**
* Context menu of Branches. * Context menu of Branches.
@@ -19,11 +19,13 @@ export function ActionsMenu({
text={intl.get('branches.action.edit_branch')} text={intl.get('branches.action.edit_branch')}
onClick={safeCallback(onEdit, original)} onClick={safeCallback(onEdit, original)}
/> />
<MenuItem <If condition={!original.primary}>
icon={<Icon icon="check" />} <MenuItem
text={intl.get('branches.action.mark_as_primary')} icon={<Icon icon={'check'} iconSize={18} />}
onClick={safeCallback(onMarkPrimary, original)} text={intl.get('branches.action.mark_as_primary')}
/> onClick={safeCallback(onMarkPrimary, original)}
/>
</If>
<MenuDivider /> <MenuDivider />
<MenuItem <MenuItem
icon={<Icon icon="trash-16" iconSize={16} />} icon={<Icon icon="trash-16" iconSize={16} />}

1
src/containers/Preferences/Warehouses/WarehousesGridItems.js
View File

@@ -48,6 +48,7 @@ function WarehouseGridItem({
<ContextMenu2 <ContextMenu2
content={ content={
<WarehouseContextMenu <WarehouseContextMenu
warehouse={warehouse}
onEditClick={handleEditWarehouse} onEditClick={handleEditWarehouse}
onDeleteClick={handleDeleteWarehouse} onDeleteClick={handleDeleteWarehouse}
onMarkPrimary={handleMarkWarehouseAsPrimary} onMarkPrimary={handleMarkWarehouseAsPrimary}

15
src/containers/Preferences/Warehouses/components.js
View File

@@ -9,7 +9,7 @@ import {
Classes, Classes,
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import { Icon } from '../../../components'; import { Icon, If } from '../../../components';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
const WAREHOUSES_SKELETON_N = 4; const WAREHOUSES_SKELETON_N = 4;
@@ -22,6 +22,7 @@ export function WarehouseContextMenu({
onEditClick, onEditClick,
onDeleteClick, onDeleteClick,
onMarkPrimary, onMarkPrimary,
warehouse,
}) { }) {
return ( return (
<Menu> <Menu>
@@ -30,11 +31,13 @@ export function WarehouseContextMenu({
text={intl.get('warehouses.action.edit_warehouse')} text={intl.get('warehouses.action.edit_warehouse')}
onClick={safeCallback(onEditClick)} onClick={safeCallback(onEditClick)}
/> />
<MenuItem <If condition={!warehouse.primary}>
icon={<Icon icon="check" />} <MenuItem
text={intl.get('warehouses.action.make_as_parimary')} icon={<Icon icon={'check'} iconSize={18} />}
onClick={safeCallback(onMarkPrimary)} text={intl.get('warehouses.action.make_as_parimary')}
/> onClick={safeCallback(onMarkPrimary)}
/>
</If>
<MenuDivider /> <MenuDivider />
<MenuItem <MenuItem
text={intl.get('warehouses.action.delete_warehouse')} text={intl.get('warehouses.action.delete_warehouse')}

2
src/containers/WarehouseTransfers/WarehouseTransfersLanding/components.js
View File

@@ -41,7 +41,7 @@ export function ActionsMenu({
<If condition={!original.is_transferred && !original.is_initiated}> <If condition={!original.is_transferred && !original.is_initiated}>
<MenuItem <MenuItem
icon={<Icon icon="check" iconSize={16} />} icon={<Icon icon={'check'} iconSize={18} />}
text={intl.get('warehouse_transfer.action.initiate_transfer')} text={intl.get('warehouse_transfer.action.initiate_transfer')}
onClick={safeCallback(onInitate, original)} onClick={safeCallback(onInitate, original)}
/> />