From f1cdf02e9c0dca3354f4eebd38edd2ba12075893 Mon Sep 17 00:00:00 2001 From: eug-vs Date: Fri, 26 Mar 2021 00:44:51 +0300 Subject: fix: improve typings --- src/services/transfers/TransfersUpload.tsx | 3 ++- src/services/transfers/index.ts | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/services/transfers') diff --git a/src/services/transfers/TransfersUpload.tsx b/src/services/transfers/TransfersUpload.tsx index 1c81b08..18a33b8 100644 --- a/src/services/transfers/TransfersUpload.tsx +++ b/src/services/transfers/TransfersUpload.tsx @@ -3,7 +3,8 @@ import { useHistory } from 'react-router-dom'; import { Form, Formik } from 'formik'; import Button from '../../components/Button'; import Input from '../../components/Input'; -import Page, { Action } from '../../containers/Page'; +import Page from '../../containers/Page'; +import { Action } from '../../containers/Service/ServiceContext'; import { post } from '../../requests'; const TransfersUpload: React.FC = () => { diff --git a/src/services/transfers/index.ts b/src/services/transfers/index.ts index 09f6e04..51be7e3 100644 --- a/src/services/transfers/index.ts +++ b/src/services/transfers/index.ts @@ -1,16 +1,17 @@ import Form from './TransferForm'; import UploadPage from './TransfersUpload'; +import { transformOperation } from '../transforms'; +import { ServiceParams } from '../../containers/Service/ServiceContext'; -import { operationNames } from '../constants'; -const service = { +const service: ServiceParams = { route: 'transfers', name: 'Переводы', nameSingular: 'Перевод', tableFields: [ - { key: 'date', label: 'Дата', transform: (date: string) => new Date(date).toLocaleDateString() }, + { key: 'date', label: 'Дата', transform: date => new Date(date).toLocaleDateString() }, { key: 'contractor.name', label: 'Контрагент' }, - { key: 'operation', label: 'Операция', transform: (op: 'in' | 'out') => operationNames[op] }, + { key: 'operation', label: 'Операция', transform: transformOperation }, { key: 'amount', label: 'Сумма' }, ], actions: [ -- cgit v1.2.3