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

fix(preferences): fix preferences users page.

Browse Source
This commit is contained in:
a.bouhuolia
2021-03-22 19:23:36 +02:00
parent d79be910f9
commit a0f4947138
20 changed files with 451 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormFields.js
View File

@@ -1,19 +1,14 @@
import React, { useMemo, useCallback } from 'react';
import React from 'react';
import {
Button,
Classes,
FormGroup,
InputGroup,
Intent,
} from '@blueprintjs/core';
import { Form, useFormikContext, FastField } from 'formik';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { pick } from 'lodash';
import { FastField } from 'formik';
import { FormattedMessage as T } from 'react-intl';
import {
ErrorMessage,
AppToaster,
FieldRequiredHint,
DialogContent,
} from 'components';
import { useAutofocus } from 'hooks';
@@ -33,7 +28,7 @@ export default function CurrencyFormFields() {
className={'form-group--currency-name'}
intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="currency_name" />}
inline={true}
// inline={true}
>
<InputGroup
inputRef={(ref) => (currencyNameFieldRef.current = ref)}
@@ -51,7 +46,7 @@ export default function CurrencyFormFields() {
className={'form-group--currency-code'}
intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="currency_code" />}
inline={true}
// inline={true}
>
<InputGroup {...field} />
</FormGroup>

2
client/src/containers/Dialogs/CurrencyFormDialog/CurrencyFormProvider.js
View File

@@ -14,7 +14,7 @@ function CurrencyFormProvider({ isEditMode, currency, dialogName, ...props }) {
const { mutateAsync: editCurrencyMutate } = useEditCurrency();
// fetch Currencies list.
const { data: currencies, isFetching: isCurrenciesLoading } = useCurrencies();
const { data: currencies, isLoading: isCurrenciesLoading } = useCurrencies();
// Provider state.
const provider = {

3
client/src/containers/Dialogs/CurrencyFormDialog/index.js
View File

@@ -1,5 +1,5 @@
import React, { lazy } from 'react';
import { FormattedMessage as T, useIntl } from 'react-intl';
import { FormattedMessage as T } from 'react-intl';
import { Dialog, DialogSuspense } from 'components';
import withDialogRedux from 'components/DialogReduxConnect';
import { compose } from 'utils';
@@ -30,6 +30,7 @@ function CurrencyFormDialog({
isOpen={isOpen}
autoFocus={true}
canEscapeKeyClose={true}
style={{ width: '450px' }}
>
<DialogSuspense>
<CurrencyFormDialogContent

2
client/src/containers/Dialogs/InviteUserDialog/InviteUserFormProvider.js
View File

@@ -12,7 +12,7 @@ function InviteUserFormProvider({ userId, isEditMode, dialogName, ...props }) {
const { mutateAsync: inviteUserMutate } = useCreateInviteUser();
// fetch users list.
const { isFetching: isUsersLoading } = useUsers();
const { isLoading: isUsersLoading } = useUsers();
// Provider state.
const provider = {

14
client/src/containers/Dialogs/InviteUserDialog/utils.js
View File

@@ -1,10 +1,10 @@
import { formatMessage } from 'services/intl';
export const transformApiErrors = (errors) => {
const fields = {};
if (errors.find(error => error.type === 'EMAIL.ALREADY.INVITED')) {
fields.email = formatMessage({ id: 'email_is_already_used' });
}
return fields;
}
const fields = {};
if (errors.find((error) => error.type === 'EMAIL.ALREADY.INVITED')) {
fields.email = formatMessage({ id: 'email_is_already_used' });
}
return fields;
};