feat(branches & warehouses): fix Context menu.

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

View File

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

View File

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

View File

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

View File

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