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/containers/Service/ServiceContext.tsx | 13 +++++++++---- src/containers/Service/ServiceItem.tsx | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'src/containers/Service') diff --git a/src/containers/Service/ServiceContext.tsx b/src/containers/Service/ServiceContext.tsx index 75ac0fb..0cccc93 100644 --- a/src/containers/Service/ServiceContext.tsx +++ b/src/containers/Service/ServiceContext.tsx @@ -1,6 +1,11 @@ import React from 'react'; import { FormikProps } from 'formik'; -import { Action } from '../Page'; +import { Props as ButtonProps } from '../../components/Button'; +import { Field } from '../../components/ListTable'; + +export interface Action extends ButtonProps { + name: string; +} export interface PanelProps { item: any; @@ -10,9 +15,9 @@ export interface PanelProps { export interface ServiceParams { route: string; name: string; - nameSingular: string; - tableFields: any[]; - default: Record; + nameSingular?: string; + tableFields: Field[]; + default?: Record; routes?: Record; actions?: Action[]; rowLink?: (item: any) => string; diff --git a/src/containers/Service/ServiceItem.tsx b/src/containers/Service/ServiceItem.tsx index f833227..0e24895 100644 --- a/src/containers/Service/ServiceItem.tsx +++ b/src/containers/Service/ServiceItem.tsx @@ -2,11 +2,11 @@ import React, { useContext } from 'react'; import { useParams, useHistory } from 'react-router-dom'; import { Formik } from 'formik'; import _ from 'lodash'; -import Page, { Action } from '../Page'; +import Page from '../Page'; import hooks from '../../hooks/useAPIClient'; import useQuery from '../../hooks/useQuery'; import { post, patch, del } from '../../requests'; -import ServiceContext from './ServiceContext'; +import ServiceContext, { Action } from './ServiceContext'; interface Params { id: string; -- cgit v1.2.3