diff --git a/src/api/base/index.ts b/src/api/base/index.ts index 8e1f6e8..c820fc6 100644 --- a/src/api/base/index.ts +++ b/src/api/base/index.ts @@ -1,8 +1,8 @@ import { merge } from 'lodash' import type { AxiosError, AxiosInstance, AxiosRequestConfig, CancelTokenSource } from 'axios' import axios from 'axios' -import { HTTP_METHODS } from '../../constants' import { getError, parseResponse } from './parse' +import { HTTP_METHODS } from '~/constants' import { config } from '~/configs' import type { RequestOptions } from '~/types/models/requestOptions' @@ -16,12 +16,12 @@ const axiosInstance = axios.create({ const axiosInstanceSource = CancelToken.source() export function setAxiosRequestConfig( - api: AxiosInstance, source: CancelTokenSource, methodType: string, url: string, options?: RequestOptions, + api: AxiosInstance, { token: cancelToken }: CancelTokenSource, method: string, url: string, options?: RequestOptions, ) { const requestConfig = merge({ url, - cancelToken: source.token, - method: methodType, + cancelToken, + method, }, options) // eslint-disable-next-line no-console @@ -44,8 +44,8 @@ export function getHttpMethodsWithCancel( source = axiosInstanceSource, parse = parseResponse, ) { - const getApiPromise = (methodType: string, url: string, options?: RequestOptions) => - setAxiosRequestConfig(api, source, methodType, url, options) + const getApiPromise = (method: string, url: string, options?: RequestOptions) => + setAxiosRequestConfig(api, source, method, url, options) .then(parse) .catch((error: AxiosError) => { getError(error) diff --git a/src/api/base/parse.ts b/src/api/base/parse.ts index e32109a..020ec8e 100644 --- a/src/api/base/parse.ts +++ b/src/api/base/parse.ts @@ -2,7 +2,7 @@ import type { AxiosError, AxiosResponse } from 'axios' import { ERROR_CODE, HTTP_STATUS_CODE, -} from '../../constants' +} from '~/constants' import type { ResponseModel } from '~/types/models/responseModel' export const getError = (responseError: AxiosError) => { diff --git a/src/store/modules/test/state.ts b/src/store/modules/test/state.ts index 3832895..be5d975 100644 --- a/src/store/modules/test/state.ts +++ b/src/store/modules/test/state.ts @@ -1,6 +1,6 @@ import type { HeroModel } from '~/types/models/heroModel' -export type HeroStateType = { +export interface HeroStateType { heroes: HeroModel[] hero: HeroModel loading: boolean diff --git a/src/types/models/heroModel.ts b/src/types/models/heroModel.ts index 1f79373..d48149d 100644 --- a/src/types/models/heroModel.ts +++ b/src/types/models/heroModel.ts @@ -1,4 +1,4 @@ -export type HeroModel = { +export interface HeroModel { id: string firstName: string lastName: string diff --git a/src/types/models/requestOptions.ts b/src/types/models/requestOptions.ts index a6cd624..57b3da4 100644 --- a/src/types/models/requestOptions.ts +++ b/src/types/models/requestOptions.ts @@ -1,5 +1,5 @@ // Example API Request Options -export type RequestOptions = { +export interface RequestOptions { url: string data?: D params?: any diff --git a/src/types/models/responseModel.ts b/src/types/models/responseModel.ts index fd37b20..5f31b77 100644 --- a/src/types/models/responseModel.ts +++ b/src/types/models/responseModel.ts @@ -1,5 +1,5 @@ // Example API Response Model -export type ResponseModel = { +export interface ResponseModel { data?: any success?: boolean errorCode?: string