feat: filter sellable and purchasable items.

This commit is contained in:
Ahmed Bouhuolia
2020-11-24 11:24:48 +02:00
parent 4cdaacfa61
commit a7e5401b7d
5 changed files with 51 additions and 16 deletions

View File

@@ -2,12 +2,17 @@ import React, { useCallback } from 'react';
import { FormattedMessage as T } from 'react-intl'; import { FormattedMessage as T } from 'react-intl';
import { ListSelect } from 'components'; import { ListSelect } from 'components';
import { MenuItem } from '@blueprintjs/core'; import { MenuItem } from '@blueprintjs/core';
import { saveInvoke } from 'utils';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
export default function CategoriesSelectList({ export default function CategoriesSelectList({
categoriesList, categoriesList,
selecetedCategoryId, selecetedCategoryId,
defaultSelectText = <T id={'select_category'} />, defaultSelectText = <T id={'select_category'} />,
onCategorySelected, onCategorySelected,
popoverFill = false,
className,
...restProps ...restProps
}) { }) {
@@ -23,9 +28,10 @@ export default function CategoriesSelectList({
}; };
const handleItemCategorySelected = useCallback( const handleItemCategorySelected = useCallback(
(ItemCategory) => onCategorySelected && onCategorySelected(ItemCategory), (ItemCategory) => saveInvoke(onCategorySelected, ItemCategory),
[], [onCategorySelected],
); );
const categoryItem = useCallback( const categoryItem = useCallback(
(item, { handleClick }) => ( (item, { handleClick }) => (
<MenuItem key={item.id} text={item.name} onClick={handleClick} /> <MenuItem key={item.id} text={item.name} onClick={handleClick} />
@@ -43,6 +49,10 @@ export default function CategoriesSelectList({
onItemSelect={handleItemCategorySelected} onItemSelect={handleItemCategorySelected}
itemPredicate={filterItemCategory} itemPredicate={filterItemCategory}
itemRenderer={categoryItem} itemRenderer={categoryItem}
popoverProps={{ minimal: true, usePortal: !popoverFill }}
className={classNames('form-group--select-list', {
[CLASSES.SELECT_LIST_FILL_POPOVER]: popoverFill,
}, className)}
{...restProps} {...restProps}
/> />
); );

View File

@@ -2,13 +2,15 @@ import React, { useCallback, useState, useEffect, useMemo } from 'react';
import { FormattedMessage as T } from 'react-intl'; import { FormattedMessage as T } from 'react-intl';
import { ListSelect } from 'components'; import { ListSelect } from 'components';
import { MenuItem } from '@blueprintjs/core'; import { MenuItem } from '@blueprintjs/core';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
export default function ContactSelecetList({ export default function ContactSelecetList({
contactsList, contactsList,
selectedContactId, selectedContactId,
defaultSelectText = <T id={'select_contact'} />, defaultSelectText = <T id={'select_contact'} />,
onContactSelected, onContactSelected,
// disabled = false, popoverFill = false,
...restProps ...restProps
}) { }) {
const [selecetedContact, setSelectedContact] = useState(null); const [selecetedContact, setSelectedContact] = useState(null);
@@ -56,8 +58,10 @@ export default function ContactSelecetList({
onItemSelect={onContactSelect} onItemSelect={onContactSelect}
itemPredicate={FilterContacts} itemPredicate={FilterContacts}
itemRenderer={handleContactRenderer} itemRenderer={handleContactRenderer}
popoverProps={{ minimal: true }} popoverProps={{ minimal: true, usePortal: !popoverFill }}
className={'form-group--select-list'} className={classNames(CLASSES.FORM_GROUP_LIST_SELECT, {
[CLASSES.SELECT_LIST_FILL_POPOVER]: popoverFill,
})}
{...restProps} {...restProps}
/> />
); );

View File

@@ -1,5 +1,7 @@
import React, { useCallback, useMemo } from 'react'; import React, { useCallback, useMemo } from 'react';
import { MenuItem, Button } from '@blueprintjs/core'; import { MenuItem } from '@blueprintjs/core';
import classNames from 'classnames';
import { CLASSES } from 'common/classes';
import ListSelect from 'components/ListSelect'; import ListSelect from 'components/ListSelect';
import { FormattedMessage as T } from 'react-intl'; import { FormattedMessage as T } from 'react-intl';
@@ -9,6 +11,7 @@ export default function ContactsListField({
selectedContactId, selectedContactId,
selectedContactType, selectedContactType,
defautlSelectText = <T id={'select_contact'} />, defautlSelectText = <T id={'select_contact'} />,
popoverFill = false,
}) { }) {
// Contact item of select accounts field. // Contact item of select accounts field.
const contactRenderer = useCallback( const contactRenderer = useCallback(
@@ -39,13 +42,16 @@ export default function ContactsListField({
items={items} items={items}
noResults={<MenuItem disabled={true} text="No results." />} noResults={<MenuItem disabled={true} text="No results." />}
itemRenderer={contactRenderer} itemRenderer={contactRenderer}
popoverProps={{ minimal: true }}
filterable={true} filterable={true}
onItemSelect={onContactSelect} onItemSelect={onContactSelect}
labelProp={'display_name'} labelProp={'display_name'}
selectedItem={`${selectedContactId}_${selectedContactType}`} selectedItem={`${selectedContactId}_${selectedContactType}`}
selectedItemProp={'_id'} selectedItemProp={'_id'}
defaultText={defautlSelectText} defaultText={defautlSelectText}
popoverProps={{ minimal: true, usePortal: !popoverFill }}
className={classNames(CLASSES.FORM_GROUP_LIST_SELECT, {
[CLASSES.SELECT_LIST_FILL_POPOVER]: popoverFill,
})}
/> />
); );
} }

View File

@@ -4,8 +4,8 @@ import classNames from 'classnames';
import { FormGroup, Classes, Intent } from '@blueprintjs/core'; import { FormGroup, Classes, Intent } from '@blueprintjs/core';
function ItemsListCell({ export default function ItemsListCell({
column: { id }, column: { id, filterSellable, filterPurchasable },
row: { index }, row: { index },
cell: { value: initialValue }, cell: { value: initialValue },
payload: { items, updateData, errors }, payload: { items, updateData, errors },
@@ -28,9 +28,9 @@ function ItemsListCell({
items={items} items={items}
onItemSelected={handleItemSelected} onItemSelected={handleItemSelected}
selectedItemId={initialValue} selectedItemId={initialValue}
sellable={filterSellable}
purchasable={filterPurchasable}
/> />
</FormGroup> </FormGroup>
); );
} }
export default ItemsListCell;

View File

@@ -8,8 +8,23 @@ function ItemsListField({
selectedItemId, selectedItemId,
defautlSelectText = 'Click to select an item.', defautlSelectText = 'Click to select an item.',
onItemSelected, onItemSelected,
sellable = false,
purchasable = false,
}) { }) {
const initialItem = useMemo(() => items.find((a) => a.id === initialItemId), [ const filteredItems = useMemo(() => {
let filteredItems = [...items];
if (sellable) {
filteredItems = filteredItems.filter((item) => item.sellable);
}
if (purchasable) {
filteredItems = filteredItems.filter((item) => item.purchasable);
}
return filteredItems;
}, [items, sellable, purchasable])
const initialItem = useMemo(() => filteredItems.find((a) => a.id === initialItemId), [
initialItemId, initialItemId,
]); ]);
@@ -18,11 +33,11 @@ function ItemsListField({
useEffect(() => { useEffect(() => {
if (typeof selectedItemId !== 'undefined') { if (typeof selectedItemId !== 'undefined') {
const item = selectedItemId const item = selectedItemId
? items.find((a) => a.id === selectedItemId) ? filteredItems.find((a) => a.id === selectedItemId)
: null; : null;
setSelectedItem(item); setSelectedItem(item);
} }
}, [selectedItemId, items, setSelectedItem]); }, [selectedItemId, filteredItems, setSelectedItem]);
const onItemSelect = useCallback( const onItemSelect = useCallback(
(item) => { (item) => {
@@ -34,7 +49,7 @@ function ItemsListField({
const itemRenderer = useCallback( const itemRenderer = useCallback(
(item, { handleClick }) => ( (item, { handleClick }) => (
<MenuItem key={item.id} text={item.name} onClick={handleClick} /> <MenuItem key={item.id} text={item.name} label={item.code} onClick={handleClick} />
), ),
[], [],
); );
@@ -52,7 +67,7 @@ function ItemsListField({
return ( return (
<ListSelect <ListSelect
items={items} items={filteredItems}
noResults={<MenuItem disabled={true} text="No results." />} noResults={<MenuItem disabled={true} text="No results." />}
itemRenderer={itemRenderer} itemRenderer={itemRenderer}
itemPredicate={filterItem} itemPredicate={filterItem}