}
+ label={}
labelInfo={requiredSpan}
className={'form-group--currency-name'}
- intent={(errors.currency_name && touched.currency_name) && Intent.DANGER}
- helperText={}
+ intent={
+ errors.currency_name && touched.currency_name && Intent.DANGER
+ }
+ helperText={
+
+ }
inline={true}
>
}
+ label={}
labelInfo={requiredSpan}
className={'form-group--currency-code'}
- intent={(errors.currency_code && touched.currency_code) && Intent.DANGER}
- helperText={}
+ intent={
+ errors.currency_code && touched.currency_code && Intent.DANGER
+ }
+ helperText={
+
+ }
inline={true}
>
@@ -172,9 +201,19 @@ function CurrencyDialog({
-
-
@@ -190,8 +229,8 @@ const mapStateToProps = (state, props) => {
name: 'currency-form',
payload: { action: 'new', currencyCode: null, ...dialogPayload },
currencyCode: dialogPayload?.currencyCode || null,
- }
-}
+ };
+};
const withCurrencyFormDialog = connect(mapStateToProps);
diff --git a/client/src/containers/Dialogs/ExchangeRateDialog.js b/client/src/containers/Dialogs/ExchangeRateDialog.js
index 810faabb2..4df64e802 100644
--- a/client/src/containers/Dialogs/ExchangeRateDialog.js
+++ b/client/src/containers/Dialogs/ExchangeRateDialog.js
@@ -12,20 +12,19 @@ import { pick } from 'lodash';
import * as Yup from 'yup';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { useFormik } from 'formik';
-import { Select } from '@blueprintjs/select';
-import { useQuery } from 'react-query';
+import { useQuery, queryCache } from 'react-query';
import moment from 'moment';
import { DateInput } from '@blueprintjs/datetime';
import { momentFormatter } from 'utils';
import AppToaster from 'components/AppToaster';
+
import Dialog from 'components/Dialog';
import ErrorMessage from 'components/ErrorMessage';
import classNames from 'classnames';
-
+import { ListSelect } from 'components';
import withExchangeRatesDialog from './ExchangeRateDialog.container';
-
function ExchangeRateDialog({
name,
payload,
@@ -43,24 +42,37 @@ function ExchangeRateDialog({
requestEditExchangeRate,
requestFetchCurrencies,
editExchangeRate,
-
}) {
const { formatMessage } = useIntl();
const [selectedItems, setSelectedItems] = useState({});
const validationSchema = Yup.object().shape({
- exchange_rate: Yup.number().required().label(formatMessage({id:'exchange_rate_'})),
- currency_code: Yup.string().max(3).required(formatMessage({id:'currency_code_'})),
- date: Yup.date().required().label(formatMessage({id:'date'})),
+ exchange_rate: Yup.number()
+ .required()
+ .label(formatMessage({ id: 'exchange_rate_' })),
+ currency_code: Yup.string()
+ .max(3)
+ .required(formatMessage({ id: 'currency_code_' })),
+ date: Yup.date()
+ .required()
+ .label(formatMessage({ id: 'date' })),
});
- const initialValues = useMemo(() => ({
- exchange_rate: '',
- currency_code: '',
- date: moment(new Date()).format('YYYY-MM-DD'),
- }), []);
+ const initialValues = useMemo(
+ () => ({
+ exchange_rate: '',
+ currency_code: '',
+ date: moment(new Date()).format('YYYY-MM-DD'),
+ }),
+ [],
+ );
+
+ const fetchExchangeRatesDialog = useQuery('exchange-rates-dialog', () =>
+ requestFetchExchangeRates(),
+ );
const {
+ values,
touched,
errors,
isSubmitting,
@@ -75,15 +87,19 @@ function ExchangeRateDialog({
...(payload.action === 'edit' &&
pick(editExchangeRate, Object.keys(initialValues))),
},
- onSubmit: (values, { setSubmitting }) => {
+ onSubmit: (values, { setSubmitting, setErrors }) => {
if (payload.action === 'edit') {
requestEditExchangeRate(payload.id, values)
.then((response) => {
closeDialog(name);
AppToaster.show({
- message: formatMessage({id:'the_exchange_rate_has_been_successfully_edited'})
+ message: formatMessage({
+ id: 'the_exchange_rate_has_been_successfully_edited',
+ }),
+ intent: Intent.SUCCESS,
});
setSubmitting(false);
+ queryCache.removeQueries('exchange-rates-dialog', { force: true });
})
.catch((error) => {
setSubmitting(false);
@@ -93,30 +109,40 @@ function ExchangeRateDialog({
.then((response) => {
closeDialog(name);
AppToaster.show({
- message: formatMessage({id:'the_exchange_rate_has_been_successfully_created'})
+ message: formatMessage({
+ id: 'the_exchange_rate_has_been_successfully_created',
+ }),
+ intent: Intent.SUCCESS,
});
setSubmitting(false);
+ queryCache.refetchQueries('exchange-rates-table', { force: true });
})
- .catch((error) => {
- setSubmitting(false);
+ .catch((errors) => {
+ if (
+ errors.find((e) => e.type === 'EXCHANGE.RATE.DATE.PERIOD.DEFINED')
+ ) {
+ setErrors({
+ exchange_rate: formatMessage({
+ id:
+ 'there_is_exchange_rate_in_this_date_with_the_same_currency',
+ }),
+ });
+ }
});
}
},
});
- const requiredSpan = useMemo(() =>
*, []);
+ const requiredSpan = useMemo(() =>
*, []);
const handleClose = useCallback(() => {
closeDialog(name);
}, [name, closeDialog]);
- const fetchExchangeRatesDialog = useQuery('exchange-rates-dialog',
- () => requestFetchExchangeRates());
-
const onDialogClosed = useCallback(() => {
resetForm();
closeDialog(name);
- }, [closeDialog, name,resetForm]);
+ }, [closeDialog, name, resetForm]);
const onDialogOpening = useCallback(() => {
fetchExchangeRatesDialog.refetch();
@@ -127,7 +153,7 @@ function ExchangeRateDialog({
const formatted = moment(date).format('YYYY-MM-DD');
setFieldValue('date', formatted);
},
- [setFieldValue]
+ [setFieldValue],
);
const onItemsSelect = useCallback(
@@ -140,19 +166,19 @@ function ExchangeRateDialog({
setFieldValue(filedName, filed.currency_code);
};
},
- [setFieldValue, selectedItems]
+ [setFieldValue, selectedItems],
);
- const filterCurrencyCode = (query, currency_code, _index, exactMatch) => {
- const normalizedTitle = currency_code.currency_code.toLowerCase();
+ const filterCurrencyCode = (query, currency, _index, exactMatch) => {
+ const normalizedTitle = currency.currency_code.toLowerCase();
const normalizedQuery = query.toLowerCase();
if (exactMatch) {
return normalizedTitle === normalizedQuery;
} else {
return (
- `${currency_code.currency_code} ${normalizedTitle}`.indexOf(
- normalizedQuery
+ `${currency.currency_code} ${normalizedTitle}`.indexOf(
+ normalizedQuery,
) >= 0
);
}
@@ -169,20 +195,19 @@ function ExchangeRateDialog({
);
}, []);
- const getSelectedItemLabel = useCallback((fieldName, defaultLabel) => {
- return typeof selectedItems[fieldName] !== 'undefined'
- ? selectedItems[fieldName].currency_code
- : defaultLabel;
- }, [selectedItems]);
-
return (
@@ -195,5 +211,5 @@ function InviteUserDialog({
export default compose(
UserListDialogConnect,
- DialogReduxConnect
+ DialogReduxConnect,
)(InviteUserDialog);
diff --git a/client/src/containers/Dialogs/ItemCategoryDialog.js b/client/src/containers/Dialogs/ItemCategoryDialog.js
index 0dd751053..de9547d85 100644
--- a/client/src/containers/Dialogs/ItemCategoryDialog.js
+++ b/client/src/containers/Dialogs/ItemCategoryDialog.js
@@ -6,7 +6,7 @@ import {
InputGroup,
Intent,
TextArea,
- MenuItem
+ MenuItem,
} from '@blueprintjs/core';
import { Select } from '@blueprintjs/select';
import { pick } from 'lodash';
@@ -16,10 +16,11 @@ import { useFormik } from 'formik';
import { compose } from 'utils';
import { useQuery, queryCache } from 'react-query';
import classNames from 'classnames';
-import {connect} from 'react-redux';
+import { connect } from 'react-redux';
import AppToaster from 'components/AppToaster';
import ErrorMessage from 'components/ErrorMessage';
+import { ListSelect } from 'components';
import Dialog from 'components/Dialog';
import DialogConnect from 'connectors/Dialog.connector';
@@ -32,7 +33,6 @@ import withItemCategoriesActions from 'containers/Items/withItemCategoriesAction
import Icon from 'components/Icon';
-
function ItemCategoryDialog({
name,
payload,
@@ -57,23 +57,30 @@ function ItemCategoryDialog({
const [selectedParentCategory, setParentCategory] = useState(null);
const { formatMessage } = useIntl();
- const fetchList = useQuery(['items-categories-list'],
- () => requestFetchItemCategories());
+ const fetchList = useQuery(['items-categories-list'], () =>
+ requestFetchItemCategories(),
+ );
const validationSchema = Yup.object().shape({
- name: Yup.string().required().label(formatMessage({id:'category_name_'})),
+ name: Yup.string()
+ .required()
+ .label(formatMessage({ id: 'category_name_' })),
parent_category_id: Yup.string().nullable(),
- description: Yup.string().trim()
+ description: Yup.string().trim(),
});
- const initialValues = useMemo(() => ({
- name: '',
- description: '',
- parent_category_id: null
- }), []);
+ const initialValues = useMemo(
+ () => ({
+ name: '',
+ description: '',
+ parent_category_id: null,
+ }),
+ [],
+ );
// Formik
const {
+ values,
errors,
touched,
setFieldValue,
@@ -85,24 +92,28 @@ function ItemCategoryDialog({
enableReinitialize: true,
initialValues: {
...(payload.action === 'edit' &&
- pick(itemCategory, Object.keys(initialValues)))
+ pick(itemCategory, Object.keys(initialValues))),
},
validationSchema,
onSubmit: (values, { setSubmitting }) => {
if (payload.action === 'edit') {
- requestEditItemCategory(payload.id, values).then(response => {
- closeDialog(name);
- AppToaster.show({
- message: formatMessage({
- id: 'the_item_category_has_been_successfully_edited',
- }),
- intent: Intent.SUCCESS,
+ requestEditItemCategory(payload.id, values)
+ .then((response) => {
+ closeDialog(name);
+ AppToaster.show({
+ message: formatMessage({
+ id: 'the_item_category_has_been_successfully_edited',
+ }),
+ intent: Intent.SUCCESS,
+ });
+ setSubmitting(false);
+ queryCache.refetchQueries('items-categories-table', {
+ force: true,
+ });
+ })
+ .catch((error) => {
+ setSubmitting(false);
});
- setSubmitting(false);
- queryCache.refetchQueries('items-categories-table', { force: true });
- }).catch((error) => {
- setSubmitting(false);
- });
} else {
requestSubmitItemCategory(values)
.then((response) => {
@@ -114,60 +125,84 @@ function ItemCategoryDialog({
intent: Intent.SUCCESS,
});
setSubmitting(false);
- queryCache.refetchQueries('items-categories-table', { force: true });
+ queryCache.refetchQueries('items-categories-table', {
+ force: true,
+ });
})
.catch((error) => {
setSubmitting(false);
});
}
- }
+ },
});
- const filterItemCategory = useCallback((query, category, _index, exactMatch) => {
- const normalizedTitle = category.name.toLowerCase();
- const normalizedQuery = query.toLowerCase();
+ const filterItemCategory = useCallback(
+ (query, category, _index, exactMatch) => {
+ const normalizedTitle = category.name.toLowerCase();
+ const normalizedQuery = query.toLowerCase();
- if (exactMatch) {
- return normalizedTitle === normalizedQuery;
- } else {
- return normalizedTitle.indexOf(normalizedQuery) >= 0;
- }
- }, []);
+ if (exactMatch) {
+ return normalizedTitle === normalizedQuery;
+ } else {
+ return normalizedTitle.indexOf(normalizedQuery) >= 0;
+ }
+ },
+ [],
+ );
- const parentCategoryItem = useCallback((category, { handleClick, modifiers, query }) => {
- return (
-