From 8c6eaf2f1d09eaf74b505084adb4ccf9d6abbcc7 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 22 Dec 2020 09:49:13 +0100 Subject: [PATCH] Moved API types and type helpers to api module --- src/api/ShlinkApiError.tsx | 3 ++- .../services/types.ts => api/types/index.ts} | 19 ++++++------------- src/api/utils/index.ts | 8 +++++++- src/domains/reducers/domainsList.ts | 2 +- src/mercure/reducers/mercureInfo.ts | 2 +- src/servers/reducers/selectedServer.ts | 2 +- src/short-urls/Paginator.tsx | 2 +- .../helpers/DeleteShortUrlModal.tsx | 2 +- src/short-urls/reducers/shortUrlCreation.ts | 2 +- src/short-urls/reducers/shortUrlDeletion.ts | 2 +- src/short-urls/reducers/shortUrlEdition.ts | 2 +- src/short-urls/reducers/shortUrlMeta.ts | 2 +- src/short-urls/reducers/shortUrlTags.ts | 2 +- src/short-urls/reducers/shortUrlsList.ts | 2 +- src/tags/reducers/tagDelete.ts | 2 +- src/tags/reducers/tagEdit.ts | 2 +- src/tags/reducers/tagsList.ts | 2 +- src/utils/services/ShlinkApiClient.ts | 2 +- src/visits/ShortUrlVisits.tsx | 2 +- src/visits/TagVisits.tsx | 2 +- src/visits/VisitsStats.tsx | 2 +- src/visits/reducers/common.ts | 2 +- src/visits/reducers/visitsOverview.ts | 2 +- src/visits/types/index.ts | 2 +- test/domains/DomainSelector.test.tsx | 2 +- test/domains/reducers/domainsList.test.ts | 2 +- test/mercure/reducers/mercureInfo.test.ts | 2 +- .../helpers/DeleteShortUrlModal.test.tsx | 2 +- .../reducers/shortUrlDeletion.test.ts | 2 +- .../short-urls/reducers/shortUrlsList.test.ts | 2 +- test/utils/services/ShlinkApiClient.test.ts | 2 +- test/visits/reducers/shortUrlVisits.test.ts | 2 +- test/visits/reducers/tagVisits.test.ts | 2 +- test/visits/reducers/visitsOverview.test.ts | 2 +- 34 files changed, 46 insertions(+), 46 deletions(-) rename src/{utils/services/types.ts => api/types/index.ts} (68%) diff --git a/src/api/ShlinkApiError.tsx b/src/api/ShlinkApiError.tsx index 8c9e51f5..3719cbb5 100644 --- a/src/api/ShlinkApiError.tsx +++ b/src/api/ShlinkApiError.tsx @@ -1,4 +1,5 @@ -import { isInvalidArgumentError, ProblemDetailsError } from '../utils/services/types'; +import { ProblemDetailsError } from './types'; +import { isInvalidArgumentError } from './utils'; interface ShlinkApiErrorProps { errorData?: ProblemDetailsError; diff --git a/src/utils/services/types.ts b/src/api/types/index.ts similarity index 68% rename from src/utils/services/types.ts rename to src/api/types/index.ts index 36f2fe82..c5728797 100644 --- a/src/utils/services/types.ts +++ b/src/api/types/index.ts @@ -1,8 +1,6 @@ -import { Visit } from '../../visits/types'; // FIXME Should be defined as part of this module -import { ShortUrl, ShortUrlMeta } from '../../short-urls/data'; // FIXME Should be defined as part of this module -import { OptionalString } from '../utils'; - -// TODO Move this file to api module +import { Visit } from '../../visits/types'; +import { OptionalString } from '../../utils/utils'; +import { ShortUrl, ShortUrlMeta } from '../../short-urls/data'; export interface ShlinkShortUrlsResponse { data: ShortUrl[]; @@ -76,21 +74,16 @@ export interface ProblemDetailsError { detail: string; title: string; status: number; + [extraProps: string]: any; } -interface InvalidArgumentError extends ProblemDetailsError { +export interface InvalidArgumentError extends ProblemDetailsError { type: 'INVALID_ARGUMENT'; invalidElements: string[]; } -interface InvalidShortUrlDeletion extends ProblemDetailsError { +export interface InvalidShortUrlDeletion extends ProblemDetailsError { type: 'INVALID_SHORTCODE_DELETION'; threshold: number; } - -export const isInvalidArgumentError = (error?: ProblemDetailsError): error is InvalidArgumentError => - error?.type === 'INVALID_ARGUMENT'; - -export const isInvalidDeletionError = (error?: ProblemDetailsError): error is InvalidShortUrlDeletion => - error?.type === 'INVALID_SHORTCODE_DELETION'; diff --git a/src/api/utils/index.ts b/src/api/utils/index.ts index d13aded3..6de7681f 100644 --- a/src/api/utils/index.ts +++ b/src/api/utils/index.ts @@ -1,4 +1,10 @@ import { AxiosError } from 'axios'; -import { ProblemDetailsError } from '../../utils/services/types'; +import { InvalidArgumentError, InvalidShortUrlDeletion, ProblemDetailsError } from '../types'; export const parseApiError = (e: AxiosError) => e.response?.data; + +export const isInvalidArgumentError = (error?: ProblemDetailsError): error is InvalidArgumentError => + error?.type === 'INVALID_ARGUMENT'; + +export const isInvalidDeletionError = (error?: ProblemDetailsError): error is InvalidShortUrlDeletion => + error?.type === 'INVALID_SHORTCODE_DELETION'; diff --git a/src/domains/reducers/domainsList.ts b/src/domains/reducers/domainsList.ts index 4a51acab..63b39f37 100644 --- a/src/domains/reducers/domainsList.ts +++ b/src/domains/reducers/domainsList.ts @@ -1,5 +1,5 @@ import { Action, Dispatch } from 'redux'; -import { ShlinkDomain } from '../../utils/services/types'; +import { ShlinkDomain } from '../../api/types'; import { buildReducer } from '../../utils/helpers/redux'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; import { GetState } from '../../container/types'; diff --git a/src/mercure/reducers/mercureInfo.ts b/src/mercure/reducers/mercureInfo.ts index 36017c73..fbae9523 100644 --- a/src/mercure/reducers/mercureInfo.ts +++ b/src/mercure/reducers/mercureInfo.ts @@ -1,5 +1,5 @@ import { Action, Dispatch } from 'redux'; -import { ShlinkMercureInfo } from '../../utils/services/types'; +import { ShlinkMercureInfo } from '../../api/types'; import { GetState } from '../../container/types'; import { buildReducer } from '../../utils/helpers/redux'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; diff --git a/src/servers/reducers/selectedServer.ts b/src/servers/reducers/selectedServer.ts index 3579a00e..ba7db355 100644 --- a/src/servers/reducers/selectedServer.ts +++ b/src/servers/reducers/selectedServer.ts @@ -4,7 +4,7 @@ import { resetShortUrlParams } from '../../short-urls/reducers/shortUrlsListPara import { versionToPrintable, versionToSemVer as toSemVer } from '../../utils/helpers/version'; import { SelectedServer } from '../data'; import { GetState } from '../../container/types'; -import { ShlinkHealth } from '../../utils/services/types'; +import { ShlinkHealth } from '../../api/types'; import { buildActionCreator, buildReducer } from '../../utils/helpers/redux'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; diff --git a/src/short-urls/Paginator.tsx b/src/short-urls/Paginator.tsx index 30075da6..fff07aea 100644 --- a/src/short-urls/Paginator.tsx +++ b/src/short-urls/Paginator.tsx @@ -1,7 +1,7 @@ import { Link } from 'react-router-dom'; import { Pagination, PaginationItem, PaginationLink } from 'reactstrap'; import { pageIsEllipsis, keyForPage, progressivePagination, prettifyPageNumber } from '../utils/helpers/pagination'; -import { ShlinkPaginator } from '../utils/services/types'; +import { ShlinkPaginator } from '../api/types'; import './Paginator.scss'; interface PaginatorProps { diff --git a/src/short-urls/helpers/DeleteShortUrlModal.tsx b/src/short-urls/helpers/DeleteShortUrlModal.tsx index 119892d2..435b3318 100644 --- a/src/short-urls/helpers/DeleteShortUrlModal.tsx +++ b/src/short-urls/helpers/DeleteShortUrlModal.tsx @@ -5,7 +5,7 @@ import { ShortUrlDeletion } from '../reducers/shortUrlDeletion'; import { ShortUrlModalProps } from '../data'; import { handleEventPreventingDefault, OptionalString } from '../../utils/utils'; import { Result } from '../../utils/Result'; -import { isInvalidDeletionError } from '../../utils/services/types'; +import { isInvalidDeletionError } from '../../api/utils'; import { ShlinkApiError } from '../../api/ShlinkApiError'; interface DeleteShortUrlModalConnectProps extends ShortUrlModalProps { diff --git a/src/short-urls/reducers/shortUrlCreation.ts b/src/short-urls/reducers/shortUrlCreation.ts index 4d401ff8..5fc47b02 100644 --- a/src/short-urls/reducers/shortUrlCreation.ts +++ b/src/short-urls/reducers/shortUrlCreation.ts @@ -3,7 +3,7 @@ import { GetState } from '../../container/types'; import { ShortUrl, ShortUrlData } from '../data'; import { buildReducer, buildActionCreator } from '../../utils/helpers/redux'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; -import { ProblemDetailsError } from '../../utils/services/types'; +import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; /* eslint-disable padding-line-between-statements */ diff --git a/src/short-urls/reducers/shortUrlDeletion.ts b/src/short-urls/reducers/shortUrlDeletion.ts index bf458c1f..4420d929 100644 --- a/src/short-urls/reducers/shortUrlDeletion.ts +++ b/src/short-urls/reducers/shortUrlDeletion.ts @@ -1,6 +1,6 @@ import { Action, Dispatch } from 'redux'; import { buildActionCreator, buildReducer } from '../../utils/helpers/redux'; -import { ProblemDetailsError } from '../../utils/services/types'; +import { ProblemDetailsError } from '../../api/types'; import { GetState } from '../../container/types'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; import { parseApiError } from '../../api/utils'; diff --git a/src/short-urls/reducers/shortUrlEdition.ts b/src/short-urls/reducers/shortUrlEdition.ts index ed2f3a10..f0bed4ce 100644 --- a/src/short-urls/reducers/shortUrlEdition.ts +++ b/src/short-urls/reducers/shortUrlEdition.ts @@ -4,7 +4,7 @@ import { GetState } from '../../container/types'; import { OptionalString } from '../../utils/utils'; import { ShortUrlIdentifier } from '../data'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; -import { ProblemDetailsError } from '../../utils/services/types'; +import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; /* eslint-disable padding-line-between-statements */ diff --git a/src/short-urls/reducers/shortUrlMeta.ts b/src/short-urls/reducers/shortUrlMeta.ts index fa10cb1c..2f09ade7 100644 --- a/src/short-urls/reducers/shortUrlMeta.ts +++ b/src/short-urls/reducers/shortUrlMeta.ts @@ -4,7 +4,7 @@ import { GetState } from '../../container/types'; import { buildActionCreator, buildReducer } from '../../utils/helpers/redux'; import { OptionalString } from '../../utils/utils'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; -import { ProblemDetailsError } from '../../utils/services/types'; +import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; /* eslint-disable padding-line-between-statements */ diff --git a/src/short-urls/reducers/shortUrlTags.ts b/src/short-urls/reducers/shortUrlTags.ts index b2c9f704..eebe1e08 100644 --- a/src/short-urls/reducers/shortUrlTags.ts +++ b/src/short-urls/reducers/shortUrlTags.ts @@ -4,7 +4,7 @@ import { GetState } from '../../container/types'; import { OptionalString } from '../../utils/utils'; import { ShortUrlIdentifier } from '../data'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; -import { ProblemDetailsError } from '../../utils/services/types'; +import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; /* eslint-disable padding-line-between-statements */ diff --git a/src/short-urls/reducers/shortUrlsList.ts b/src/short-urls/reducers/shortUrlsList.ts index dfba771c..f4ba3f2a 100644 --- a/src/short-urls/reducers/shortUrlsList.ts +++ b/src/short-urls/reducers/shortUrlsList.ts @@ -6,7 +6,7 @@ import { ShortUrl, ShortUrlIdentifier } from '../data'; import { buildReducer } from '../../utils/helpers/redux'; import { GetState } from '../../container/types'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; -import { ShlinkShortUrlsResponse } from '../../utils/services/types'; +import { ShlinkShortUrlsResponse } from '../../api/types'; import { EditShortUrlTagsAction, SHORT_URL_TAGS_EDITED } from './shortUrlTags'; import { DeleteShortUrlAction, SHORT_URL_DELETED } from './shortUrlDeletion'; import { SHORT_URL_META_EDITED, ShortUrlMetaEditedAction } from './shortUrlMeta'; diff --git a/src/tags/reducers/tagDelete.ts b/src/tags/reducers/tagDelete.ts index 63756a45..2c4996f3 100644 --- a/src/tags/reducers/tagDelete.ts +++ b/src/tags/reducers/tagDelete.ts @@ -2,7 +2,7 @@ import { Action, Dispatch } from 'redux'; import { buildReducer } from '../../utils/helpers/redux'; import { GetState } from '../../container/types'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; -import { ProblemDetailsError } from '../../utils/services/types'; +import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; /* eslint-disable padding-line-between-statements */ diff --git a/src/tags/reducers/tagEdit.ts b/src/tags/reducers/tagEdit.ts index 15a4dae5..a02da813 100644 --- a/src/tags/reducers/tagEdit.ts +++ b/src/tags/reducers/tagEdit.ts @@ -4,7 +4,7 @@ import { buildReducer } from '../../utils/helpers/redux'; import { GetState } from '../../container/types'; import ColorGenerator from '../../utils/services/ColorGenerator'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; -import { ProblemDetailsError } from '../../utils/services/types'; +import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; /* eslint-disable padding-line-between-statements */ diff --git a/src/tags/reducers/tagsList.ts b/src/tags/reducers/tagsList.ts index 452d28c4..8217aac2 100644 --- a/src/tags/reducers/tagsList.ts +++ b/src/tags/reducers/tagsList.ts @@ -2,7 +2,7 @@ import { isEmpty, reject } from 'ramda'; import { Action, Dispatch } from 'redux'; import { CREATE_VISITS, CreateVisitsAction } from '../../visits/reducers/visitCreation'; import { buildReducer } from '../../utils/helpers/redux'; -import { ProblemDetailsError, ShlinkTags } from '../../utils/services/types'; +import { ProblemDetailsError, ShlinkTags } from '../../api/types'; import { GetState } from '../../container/types'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; import { TagStats } from '../data'; diff --git a/src/utils/services/ShlinkApiClient.ts b/src/utils/services/ShlinkApiClient.ts index b04b7738..9cdbb26a 100644 --- a/src/utils/services/ShlinkApiClient.ts +++ b/src/utils/services/ShlinkApiClient.ts @@ -16,7 +16,7 @@ import { ShlinkDomain, ShlinkDomainsResponse, ShlinkVisitsOverview, -} from './types'; +} from '../../api/types'; // TODO Move this file to api module diff --git a/src/visits/ShortUrlVisits.tsx b/src/visits/ShortUrlVisits.tsx index d7ceb2ef..a65df735 100644 --- a/src/visits/ShortUrlVisits.tsx +++ b/src/visits/ShortUrlVisits.tsx @@ -1,7 +1,7 @@ import { useEffect } from 'react'; import { RouteComponentProps } from 'react-router'; import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub'; -import { ShlinkVisitsParams } from '../utils/services/types'; +import { ShlinkVisitsParams } from '../api/types'; import { parseQuery } from '../utils/helpers/query'; import { ShortUrlVisits as ShortUrlVisitsState } from './reducers/shortUrlVisits'; import ShortUrlVisitsHeader from './ShortUrlVisitsHeader'; diff --git a/src/visits/TagVisits.tsx b/src/visits/TagVisits.tsx index b0701737..acf60a9e 100644 --- a/src/visits/TagVisits.tsx +++ b/src/visits/TagVisits.tsx @@ -1,7 +1,7 @@ import { RouteComponentProps } from 'react-router'; import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub'; import ColorGenerator from '../utils/services/ColorGenerator'; -import { ShlinkVisitsParams } from '../utils/services/types'; +import { ShlinkVisitsParams } from '../api/types'; import { TagVisits as TagVisitsState } from './reducers/tagVisits'; import TagVisitsHeader from './TagVisitsHeader'; import VisitsStats from './VisitsStats'; diff --git a/src/visits/VisitsStats.tsx b/src/visits/VisitsStats.tsx index ceb11522..76fe5492 100644 --- a/src/visits/VisitsStats.tsx +++ b/src/visits/VisitsStats.tsx @@ -9,7 +9,7 @@ import { Location } from 'history'; import { DateRangeSelector } from '../utils/dates/DateRangeSelector'; import Message from '../utils/Message'; import { formatIsoDate } from '../utils/helpers/date'; -import { ShlinkVisitsParams } from '../utils/services/types'; +import { ShlinkVisitsParams } from '../api/types'; import { DateInterval, DateRange, intervalToDateRange } from '../utils/dates/types'; import { Result } from '../utils/Result'; import { ShlinkApiError } from '../api/ShlinkApiError'; diff --git a/src/visits/reducers/common.ts b/src/visits/reducers/common.ts index 1bfa816a..666e4419 100644 --- a/src/visits/reducers/common.ts +++ b/src/visits/reducers/common.ts @@ -1,6 +1,6 @@ import { flatten, prop, range, splitEvery } from 'ramda'; import { Action, Dispatch } from 'redux'; -import { ShlinkPaginator, ShlinkVisits } from '../../utils/services/types'; +import { ShlinkPaginator, ShlinkVisits } from '../../api/types'; import { Visit, VisitsLoadFailedAction } from '../types'; import { parseApiError } from '../../api/utils'; diff --git a/src/visits/reducers/visitsOverview.ts b/src/visits/reducers/visitsOverview.ts index e37202d7..01a2eb7d 100644 --- a/src/visits/reducers/visitsOverview.ts +++ b/src/visits/reducers/visitsOverview.ts @@ -1,5 +1,5 @@ import { Action, Dispatch } from 'redux'; -import { ShlinkVisitsOverview } from '../../utils/services/types'; +import { ShlinkVisitsOverview } from '../../api/types'; import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; import { GetState } from '../../container/types'; import { buildReducer } from '../../utils/helpers/redux'; diff --git a/src/visits/types/index.ts b/src/visits/types/index.ts index 91540c4a..fa076916 100644 --- a/src/visits/types/index.ts +++ b/src/visits/types/index.ts @@ -1,6 +1,6 @@ import { Action } from 'redux'; import { ShortUrl } from '../../short-urls/data'; -import { ProblemDetailsError } from '../../utils/services/types'; +import { ProblemDetailsError } from '../../api/types'; export interface VisitsInfo { visits: Visit[]; diff --git a/test/domains/DomainSelector.test.tsx b/test/domains/DomainSelector.test.tsx index 2e7a3d2f..0c1ab22c 100644 --- a/test/domains/DomainSelector.test.tsx +++ b/test/domains/DomainSelector.test.tsx @@ -3,7 +3,7 @@ import { Mock } from 'ts-mockery'; import { DropdownItem, DropdownMenu, InputGroup } from 'reactstrap'; import { DomainSelector } from '../../src/domains/DomainSelector'; import { DomainsList } from '../../src/domains/reducers/domainsList'; -import { ShlinkDomain } from '../../src/utils/services/types'; +import { ShlinkDomain } from '../../src/api/types'; describe('', () => { let wrapper: ShallowWrapper; diff --git a/test/domains/reducers/domainsList.test.ts b/test/domains/reducers/domainsList.test.ts index 1e090770..215131af 100644 --- a/test/domains/reducers/domainsList.test.ts +++ b/test/domains/reducers/domainsList.test.ts @@ -6,7 +6,7 @@ import reducer, { ListDomainsAction, listDomains as listDomainsAction, } from '../../../src/domains/reducers/domainsList'; -import { ShlinkDomain } from '../../../src/utils/services/types'; +import { ShlinkDomain } from '../../../src/api/types'; import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; describe('domainsList', () => { diff --git a/test/mercure/reducers/mercureInfo.test.ts b/test/mercure/reducers/mercureInfo.test.ts index 50d7ba15..347bf907 100644 --- a/test/mercure/reducers/mercureInfo.test.ts +++ b/test/mercure/reducers/mercureInfo.test.ts @@ -6,7 +6,7 @@ import reducer, { loadMercureInfo, GetMercureInfoAction, } from '../../../src/mercure/reducers/mercureInfo'; -import { ShlinkMercureInfo } from '../../../src/utils/services/types'; +import { ShlinkMercureInfo } from '../../../src/api/types'; import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; import { GetState } from '../../../src/container/types'; diff --git a/test/short-urls/helpers/DeleteShortUrlModal.test.tsx b/test/short-urls/helpers/DeleteShortUrlModal.test.tsx index d39fdb27..0ee94da8 100644 --- a/test/short-urls/helpers/DeleteShortUrlModal.test.tsx +++ b/test/short-urls/helpers/DeleteShortUrlModal.test.tsx @@ -4,7 +4,7 @@ import { Mock } from 'ts-mockery'; import DeleteShortUrlModal from '../../../src/short-urls/helpers/DeleteShortUrlModal'; import { ShortUrl } from '../../../src/short-urls/data'; import { ShortUrlDeletion } from '../../../src/short-urls/reducers/shortUrlDeletion'; -import { ProblemDetailsError } from '../../../src/utils/services/types'; +import { ProblemDetailsError } from '../../../src/api/types'; import { Result } from '../../../src/utils/Result'; describe('', () => { diff --git a/test/short-urls/reducers/shortUrlDeletion.test.ts b/test/short-urls/reducers/shortUrlDeletion.test.ts index 5c68d2cd..04150566 100644 --- a/test/short-urls/reducers/shortUrlDeletion.test.ts +++ b/test/short-urls/reducers/shortUrlDeletion.test.ts @@ -7,7 +7,7 @@ import reducer, { resetDeleteShortUrl, deleteShortUrl, } from '../../../src/short-urls/reducers/shortUrlDeletion'; -import { ProblemDetailsError } from '../../../src/utils/services/types'; +import { ProblemDetailsError } from '../../../src/api/types'; import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; describe('shortUrlDeletionReducer', () => { diff --git a/test/short-urls/reducers/shortUrlsList.test.ts b/test/short-urls/reducers/shortUrlsList.test.ts index b9a6ed64..4ceaa7c8 100644 --- a/test/short-urls/reducers/shortUrlsList.test.ts +++ b/test/short-urls/reducers/shortUrlsList.test.ts @@ -11,7 +11,7 @@ import { SHORT_URL_META_EDITED } from '../../../src/short-urls/reducers/shortUrl import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { ShortUrl } from '../../../src/short-urls/data'; import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; -import { ShlinkPaginator, ShlinkShortUrlsResponse } from '../../../src/utils/services/types'; +import { ShlinkPaginator, ShlinkShortUrlsResponse } from '../../../src/api/types'; import { CREATE_SHORT_URL } from '../../../src/short-urls/reducers/shortUrlCreation'; import { SHORT_URL_EDITED } from '../../../src/short-urls/reducers/shortUrlEdition'; diff --git a/test/utils/services/ShlinkApiClient.test.ts b/test/utils/services/ShlinkApiClient.test.ts index 09ff6a90..d806cee5 100644 --- a/test/utils/services/ShlinkApiClient.test.ts +++ b/test/utils/services/ShlinkApiClient.test.ts @@ -2,7 +2,7 @@ import { AxiosInstance, AxiosRequestConfig } from 'axios'; import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; import { OptionalString } from '../../../src/utils/utils'; import { Mock } from 'ts-mockery'; -import { ShlinkDomain, ShlinkVisitsOverview } from '../../../src/utils/services/types'; +import { ShlinkDomain, ShlinkVisitsOverview } from '../../../src/api/types'; describe('ShlinkApiClient', () => { const createAxios = (data: AxiosRequestConfig) => (async () => Promise.resolve(data)) as unknown as AxiosInstance; diff --git a/test/visits/reducers/shortUrlVisits.test.ts b/test/visits/reducers/shortUrlVisits.test.ts index 3467290b..824f4ff8 100644 --- a/test/visits/reducers/shortUrlVisits.test.ts +++ b/test/visits/reducers/shortUrlVisits.test.ts @@ -13,7 +13,7 @@ import reducer, { import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { rangeOf } from '../../../src/utils/utils'; import { Visit } from '../../../src/visits/types'; -import { ShlinkVisits } from '../../../src/utils/services/types'; +import { ShlinkVisits } from '../../../src/api/types'; import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; diff --git a/test/visits/reducers/tagVisits.test.ts b/test/visits/reducers/tagVisits.test.ts index 2b419483..3b5437b7 100644 --- a/test/visits/reducers/tagVisits.test.ts +++ b/test/visits/reducers/tagVisits.test.ts @@ -13,7 +13,7 @@ import reducer, { import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { rangeOf } from '../../../src/utils/utils'; import { Visit } from '../../../src/visits/types'; -import { ShlinkVisits } from '../../../src/utils/services/types'; +import { ShlinkVisits } from '../../../src/api/types'; import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; diff --git a/test/visits/reducers/visitsOverview.test.ts b/test/visits/reducers/visitsOverview.test.ts index 09999d25..d159ab70 100644 --- a/test/visits/reducers/visitsOverview.test.ts +++ b/test/visits/reducers/visitsOverview.test.ts @@ -9,7 +9,7 @@ import reducer, { } from '../../../src/visits/reducers/visitsOverview'; import { CreateVisitsAction } from '../../../src/visits/reducers/visitCreation'; import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; -import { ShlinkVisitsOverview } from '../../../src/utils/services/types'; +import { ShlinkVisitsOverview } from '../../../src/api/types'; import { ShlinkState } from '../../../src/container/types'; describe('visitsOverview', () => {