feat: activate & inactive item.

This commit is contained in:
elforjani3
2020-12-16 18:54:01 +02:00
parent 9818215c78
commit bd09ab1144
6 changed files with 218 additions and 76 deletions

View File

@@ -12,7 +12,14 @@ import {
import { FormattedMessage as T, useIntl } from 'react-intl'; import { FormattedMessage as T, useIntl } from 'react-intl';
import classNames from 'classnames'; import classNames from 'classnames';
import { Icon, DataTable, Money, LoadingIndicator, Choose } from 'components'; import {
Icon,
DataTable,
Money,
LoadingIndicator,
Choose,
If,
} from 'components';
import ItemsEmptyStatus from './ItemsEmptyStatus'; import ItemsEmptyStatus from './ItemsEmptyStatus';
import { useIsValuePassed } from 'hooks'; import { useIsValuePassed } from 'hooks';
import { CLASSES } from 'common/classes'; import { CLASSES } from 'common/classes';
@@ -36,6 +43,8 @@ function ItemsDataTable({
// props // props
onEditItem, onEditItem,
onDeleteItem, onDeleteItem,
onInactiveItem,
onActivateItem,
onSelectedRowsChange, onSelectedRowsChange,
}) { }) {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
@@ -83,6 +92,20 @@ function ItemsDataTable({
text={formatMessage({ id: 'edit_item' })} text={formatMessage({ id: 'edit_item' })}
onClick={handleEditItem(item)} onClick={handleEditItem(item)}
/> />
<If condition={item.active}>
<MenuItem
text={formatMessage({ id: 'inactivate_item' })}
icon={<Icon icon="pause-16" iconSize={16} />}
onClick={() => onInactiveItem(item)}
/>
</If>
<If condition={!item.active}>
<MenuItem
text={formatMessage({ id: 'activate_item' })}
icon={<Icon icon="play-16" iconSize={16} />}
onClick={() => onActivateItem(item)}
/>
</If>
<MenuItem <MenuItem
text={formatMessage({ id: 'delete_item' })} text={formatMessage({ id: 'delete_item' })}
icon={<Icon icon="trash-16" iconSize={16} />} icon={<Icon icon="trash-16" iconSize={16} />}
@@ -91,7 +114,13 @@ function ItemsDataTable({
/> />
</Menu> </Menu>
), ),
[handleEditItem, handleDeleteItem, formatMessage], [
handleEditItem,
handleDeleteItem,
onInactiveItem,
onActivateItem,
formatMessage,
],
); );
const handleRowContextMenu = useCallback( const handleRowContextMenu = useCallback(
@@ -196,6 +225,12 @@ function ItemsDataTable({
[onSelectedRowsChange], [onSelectedRowsChange],
); );
const rowClassNames = (row) => {
return {
inactive: !row.original.active,
};
};
const showEmptyStatus = [ const showEmptyStatus = [
itemsCurrentPage.length === 0, itemsCurrentPage.length === 0,
itemsCurrentViewId === -1, itemsCurrentViewId === -1,
@@ -221,6 +256,7 @@ function ItemsDataTable({
rowContextMenu={handleRowContextMenu} rowContextMenu={handleRowContextMenu}
expandable={false} expandable={false}
sticky={true} sticky={true}
rowClassNames={rowClassNames}
pagination={true} pagination={true}
pagesCount={itemsPagination.pagesCount} pagesCount={itemsPagination.pagesCount}
autoResetSortBy={false} autoResetSortBy={false}

View File

@@ -1,7 +1,7 @@
import React, { useEffect, useCallback, useState, useMemo } from 'react'; import React, { useEffect, useCallback, useState, useMemo } from 'react';
import { Route, Switch, useHistory } from 'react-router-dom'; import { Route, Switch, useHistory } from 'react-router-dom';
import { Intent, Alert } from '@blueprintjs/core'; import { Intent, Alert } from '@blueprintjs/core';
import { useQuery } from 'react-query'; import { useQuery, queryCache } from 'react-query';
import { import {
FormattedMessage as T, FormattedMessage as T,
FormattedHTMLMessage, FormattedHTMLMessage,
@@ -38,10 +38,14 @@ function ItemsList({
// #withItemsActions // #withItemsActions
requestDeleteItem, requestDeleteItem,
requestFetchItems, requestFetchItems,
requestInactiveItem,
requestActivateItem,
addItemsTableQueries, addItemsTableQueries,
requestDeleteBulkItems, requestDeleteBulkItems,
}) { }) {
const [deleteItem, setDeleteItem] = useState(false); const [deleteItem, setDeleteItem] = useState(false);
const [inactiveItem, setInactiveItem] = useState(false);
const [activateItem, setActivateItem] = useState(false);
const [selectedRows, setSelectedRows] = useState([]); const [selectedRows, setSelectedRows] = useState([]);
const [bulkDelete, setBulkDelete] = useState(false); const [bulkDelete, setBulkDelete] = useState(false);
@@ -65,9 +69,8 @@ function ItemsList({
); );
// Handle fetching the items table based on the given query. // Handle fetching the items table based on the given query.
const fetchItems = useQuery( const fetchItems = useQuery(['items-table', itemsTableQuery], (key, _query) =>
['items-table', itemsTableQuery], requestFetchItems({ ..._query }),
(key, _query) => requestFetchItems({ ..._query }),
); );
// Handle click delete item. // Handle click delete item.
@@ -92,7 +95,8 @@ function ItemsList({
// handle confirm delete item. // handle confirm delete item.
const handleConfirmDeleteItem = useCallback(() => { const handleConfirmDeleteItem = useCallback(() => {
requestDeleteItem(deleteItem.id).then(() => { requestDeleteItem(deleteItem.id)
.then(() => {
AppToaster.show({ AppToaster.show({
message: formatMessage({ message: formatMessage({
id: 'the_item_has_been_successfully_deleted', id: 'the_item_has_been_successfully_deleted',
@@ -100,8 +104,13 @@ function ItemsList({
intent: Intent.SUCCESS, intent: Intent.SUCCESS,
}); });
setDeleteItem(false); setDeleteItem(false);
}).catch(({ errors }) => { })
if (errors.find(error => error.type === 'ITEM_HAS_ASSOCIATED_TRANSACTINS')) { .catch(({ errors }) => {
if (
errors.find(
(error) => error.type === 'ITEM_HAS_ASSOCIATED_TRANSACTINS',
)
) {
AppToaster.show({ AppToaster.show({
message: formatMessage({ message: formatMessage({
id: 'the_item_has_associated_transactions', id: 'the_item_has_associated_transactions',
@@ -113,12 +122,9 @@ function ItemsList({
}); });
}, [requestDeleteItem, deleteItem, formatMessage]); }, [requestDeleteItem, deleteItem, formatMessage]);
const handleFetchData = useCallback( const handleFetchData = useCallback(({ pageIndex, pageSize, sortBy }) => {}, [
({ pageIndex, pageSize, sortBy }) => { addItemsTableQueries,
]);
},
[addItemsTableQueries],
);
// Handle filter change to re-fetch the items. // Handle filter change to re-fetch the items.
const handleFilterChanged = useCallback( const handleFilterChanged = useCallback(
@@ -174,6 +180,62 @@ function ItemsList({
setBulkDelete(false); setBulkDelete(false);
}, []); }, []);
// Handle cancel/confirm item inactive.
const handleInactiveItem = useCallback((item) => {
setInactiveItem(item);
}, []);
// Handle cancel inactive item alert.
const handleCancelInactiveItem = useCallback(() => {
setInactiveItem(false);
}, []);
// Handle confirm item Inactive.
const handleConfirmItemInactive = useCallback(() => {
requestInactiveItem(inactiveItem.id)
.then(() => {
setInactiveItem(false);
AppToaster.show({
message: formatMessage({
id: 'the_item_has_been_successfully_inactivated',
}),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('items-table');
})
.catch((error) => {
setInactiveItem(false);
});
}, [inactiveItem, requestInactiveItem, formatMessage]);
// Handle activate item click.
const handleActivateItem = useCallback((item) => {
setActivateItem(item);
});
// Handle activate item alert cancel.
const handleCancelActivateItem = useCallback(() => {
setActivateItem(false);
});
// Handle activate item confirm.
const handleConfirmItemActivate = useCallback(() => {
requestActivateItem(activateItem.id)
.then(() => {
setActivateItem(false);
AppToaster.show({
message: formatMessage({
id: 'the_item_has_been_successfully_activated',
}),
intent: Intent.SUCCESS,
});
queryCache.invalidateQueries('items-table');
})
.catch((error) => {
setActivateItem(false);
});
}, [activateItem, requestActivateItem, formatMessage]);
return ( return (
<DashboardInsider <DashboardInsider
loading={fetchResourceViews.isFetching || fetchResourceFields.isFetching} loading={fetchResourceViews.isFetching || fetchResourceFields.isFetching}
@@ -196,6 +258,8 @@ function ItemsList({
<ItemsDataTable <ItemsDataTable
onDeleteItem={handleDeleteItem} onDeleteItem={handleDeleteItem}
onEditItem={handleEditItem} onEditItem={handleEditItem}
onInactiveItem={handleInactiveItem}
onActivateItem={handleActivateItem}
onSelectedRowsChange={handleSelectedRowsChange} onSelectedRowsChange={handleSelectedRowsChange}
/> />
<Alert <Alert
@@ -231,6 +295,30 @@ function ItemsList({
/> />
</p> </p>
</Alert> </Alert>
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'inactivate'} />}
intent={Intent.WARNING}
isOpen={inactiveItem}
onCancel={handleCancelInactiveItem}
onConfirm={handleConfirmItemInactive}
>
<p>
<T id={'are_sure_to_inactive_this_item'} />
</p>
</Alert>
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'activate'} />}
intent={Intent.WARNING}
isOpen={activateItem}
onCancel={handleCancelActivateItem}
onConfirm={handleConfirmItemActivate}
>
<p>
<T id={'are_sure_to_activate_this_item'} />
</p>
</Alert>
</Route> </Route>
</Switch> </Switch>
</DashboardPageContent> </DashboardPageContent>

View File

@@ -6,6 +6,8 @@ import {
submitItem, submitItem,
editItem, editItem,
deleteBulkItems, deleteBulkItems,
activateItem,
inactiveItem,
} from 'store/items/items.actions'; } from 'store/items/items.actions';
import t from 'store/types'; import t from 'store/types';
@@ -16,6 +18,8 @@ export const mapDispatchToProps = (dispatch) => ({
requestDeleteBulkItems: (ids) => dispatch(deleteBulkItems({ ids })), requestDeleteBulkItems: (ids) => dispatch(deleteBulkItems({ ids })),
requestSubmitItem: (form) => dispatch(submitItem({ form })), requestSubmitItem: (form) => dispatch(submitItem({ form })),
requestEditItem: (id, form) => dispatch(editItem({ id, form })), requestEditItem: (id, form) => dispatch(editItem({ id, form })),
requestInactiveItem: (id) => dispatch(inactiveItem({ id })),
requestActivateItem: (id) => dispatch(activateItem({ id })),
addBulkActionItem: (id) => addBulkActionItem: (id) =>
dispatch({ dispatch({
type: t.ITEM_BULK_ACTION_ADD, type: t.ITEM_BULK_ACTION_ADD,

View File

@@ -920,7 +920,15 @@ export default {
mark_as_rejected: 'Mark as rejected', mark_as_rejected: 'Mark as rejected',
delivered: 'Delivered', delivered: 'Delivered',
rejected: 'Rejected', rejected: 'Rejected',
approved:'Approved' approved: 'Approved',
the_item_has_been_successfully_inactivated:
'The item has been successfully inactivated.',
the_item_has_been_successfully_activated:
'The item has been successfully activated.',
are_sure_to_inactive_this_item:
'Are you sure you want to inactive this item? You will be able to activate it later',
are_sure_to_activate_this_item:
'Are you sure you want to activate this item? You will be able to inactivate it later',
inactivate_item: 'Inactivate Item',
activate_item: 'Activate Item',
}; };

View File

@@ -105,3 +105,11 @@ export const deleteBulkItems = ({ ids }) => {
}); });
}); });
}; };
export const activateItem = ({ id }) => {
return (dispatch) => ApiService.post(`items/${id}/activate`);
};
export const inactiveItem = ({ id }) => {
return (dispatch) => ApiService.post(`items/${id}/inactivate`);
};

View File

@@ -1,4 +1,3 @@
.page-form--item { .page-form--item {
$self: '.page-form'; $self: '.page-form';
padding: 20px; padding: 20px;
@@ -21,7 +20,6 @@
margin-bottom: 14px; margin-bottom: 14px;
&.bp3-inline { &.bp3-inline {
.bp3-label { .bp3-label {
min-width: 140px; min-width: 140px;
} }
@@ -38,7 +36,6 @@
} }
.bp3-control { .bp3-control {
h3 { h3 {
display: inline; display: inline;
margin-bottom: 0; margin-bottom: 0;
@@ -82,21 +79,22 @@
} }
} }
.dashboard__insider--items-list { .dashboard__insider--items-list {
.bigcapital-datatable { .bigcapital-datatable {
.table { .table {
.tbody { .tbody {
.item_type.td { .item_type.td {
.bp3-tag { .bp3-tag {
font-size: 13px; font-size: 13px;
} }
} }
.tr.inactive .td {
color: #646b82;
&.normal .#{$ns}-icon {
color: #9eaab6;
}
}
} }
} }
} }