From b2abfd543e6b0930b22ddbe8d8c6cd9ec0b4c999 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Tue, 22 Dec 2020 09:55:39 +0100 Subject: [PATCH] Moved Shlink API services to api module --- src/{utils => api}/services/ShlinkApiClient.ts | 6 ++---- src/{utils => api}/services/ShlinkApiClientBuilder.ts | 2 -- src/api/services/provideServices.ts | 8 ++++++++ src/common/services/provideServices.ts | 2 ++ src/container/index.ts | 2 ++ src/domains/reducers/domainsList.ts | 2 +- src/mercure/reducers/mercureInfo.ts | 2 +- src/servers/reducers/selectedServer.ts | 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/provideServices.ts | 5 ----- src/visits/reducers/shortUrlDetail.ts | 2 +- src/visits/reducers/shortUrlVisits.ts | 2 +- src/visits/reducers/tagVisits.ts | 2 +- src/visits/reducers/visitsOverview.ts | 2 +- test/{utils => api}/services/ShlinkApiClient.test.ts | 2 +- .../services/ShlinkApiClientBuilder.test.ts | 2 +- test/domains/reducers/domainsList.test.ts | 2 +- test/mercure/reducers/mercureInfo.test.ts | 2 +- test/short-urls/reducers/shortUrlCreation.test.ts | 2 +- test/short-urls/reducers/shortUrlDeletion.test.ts | 2 +- test/short-urls/reducers/shortUrlsList.test.ts | 2 +- test/tags/reducers/tagDelete.test.ts | 2 +- test/tags/reducers/tagEdit.test.ts | 2 +- test/visits/reducers/shortUrlDetail.test.ts | 2 +- test/visits/reducers/shortUrlVisits.test.ts | 2 +- test/visits/reducers/tagVisits.test.ts | 2 +- test/visits/reducers/visitsOverview.test.ts | 2 +- 35 files changed, 43 insertions(+), 40 deletions(-) rename src/{utils => api}/services/ShlinkApiClient.ts (98%) rename src/{utils => api}/services/ShlinkApiClientBuilder.ts (97%) create mode 100644 src/api/services/provideServices.ts rename test/{utils => api}/services/ShlinkApiClient.test.ts (99%) rename test/{utils => api}/services/ShlinkApiClientBuilder.test.ts (95%) diff --git a/src/utils/services/ShlinkApiClient.ts b/src/api/services/ShlinkApiClient.ts similarity index 98% rename from src/utils/services/ShlinkApiClient.ts rename to src/api/services/ShlinkApiClient.ts index 9cdbb26a..f264d580 100644 --- a/src/utils/services/ShlinkApiClient.ts +++ b/src/api/services/ShlinkApiClient.ts @@ -3,7 +3,7 @@ import { isEmpty, isNil, reject } from 'ramda'; import { AxiosInstance, AxiosResponse, Method } from 'axios'; import { ShortUrlsListParams } from '../../short-urls/reducers/shortUrlsListParams'; import { ShortUrl, ShortUrlData } from '../../short-urls/data'; -import { OptionalString } from '../utils'; +import { OptionalString } from '../../utils/utils'; import { ShlinkHealth, ShlinkMercureInfo, @@ -16,9 +16,7 @@ import { ShlinkDomain, ShlinkDomainsResponse, ShlinkVisitsOverview, -} from '../../api/types'; - -// TODO Move this file to api module +} from '../types'; const buildShlinkBaseUrl = (url: string, apiVersion: number) => url ? `${url}/rest/v${apiVersion}` : ''; const rejectNilProps = reject(isNil); diff --git a/src/utils/services/ShlinkApiClientBuilder.ts b/src/api/services/ShlinkApiClientBuilder.ts similarity index 97% rename from src/utils/services/ShlinkApiClientBuilder.ts rename to src/api/services/ShlinkApiClientBuilder.ts index 328a1c8a..d2ba24cd 100644 --- a/src/utils/services/ShlinkApiClientBuilder.ts +++ b/src/api/services/ShlinkApiClientBuilder.ts @@ -4,8 +4,6 @@ import { hasServerData, SelectedServer, ServerWithId } from '../../servers/data' import { GetState } from '../../container/types'; import ShlinkApiClient from './ShlinkApiClient'; -// TODO Move this file to api module - const apiClients: Record = {}; const isGetState = (getStateOrSelectedServer: GetState | ServerWithId): getStateOrSelectedServer is GetState => diff --git a/src/api/services/provideServices.ts b/src/api/services/provideServices.ts new file mode 100644 index 00000000..2d0abf4e --- /dev/null +++ b/src/api/services/provideServices.ts @@ -0,0 +1,8 @@ +import Bottle from 'bottlejs'; +import buildShlinkApiClient from './ShlinkApiClientBuilder'; + +const provideServices = (bottle: Bottle) => { + bottle.serviceFactory('buildShlinkApiClient', buildShlinkApiClient, 'axios'); +}; + +export default provideServices; diff --git a/src/common/services/provideServices.ts b/src/common/services/provideServices.ts index fd631e10..af8f7417 100644 --- a/src/common/services/provideServices.ts +++ b/src/common/services/provideServices.ts @@ -1,3 +1,4 @@ +import axios from 'axios'; import Bottle, { Decorator } from 'bottlejs'; import ScrollToTop from '../ScrollToTop'; import MainHeader from '../MainHeader'; @@ -12,6 +13,7 @@ import { withoutSelectedServer } from '../../servers/helpers/withoutSelectedServ const provideServices = (bottle: Bottle, connect: ConnectDecorator, withRouter: Decorator) => { bottle.constant('window', (global as any).window); bottle.constant('console', global.console); + bottle.constant('axios', axios); bottle.serviceFactory('ScrollToTop', ScrollToTop); bottle.decorator('ScrollToTop', withRouter); diff --git a/src/container/index.ts b/src/container/index.ts index 5e746c62..f7a0d3cf 100644 --- a/src/container/index.ts +++ b/src/container/index.ts @@ -3,6 +3,7 @@ import { withRouter } from 'react-router-dom'; import { connect as reduxConnect } from 'react-redux'; import { pick } from 'ramda'; import App from '../App'; +import provideApiServices from '../api/services/provideServices'; import provideCommonServices from '../common/services/provideServices'; import provideShortUrlsServices from '../short-urls/services/provideServices'; import provideServersServices from '../servers/services/provideServices'; @@ -45,6 +46,7 @@ bottle.serviceFactory( bottle.decorator('App', connect([ 'servers' ], [ 'fetchServers' ])); provideCommonServices(bottle, connect, withRouter); +provideApiServices(bottle); provideShortUrlsServices(bottle, connect); provideServersServices(bottle, connect, withRouter); provideTagsServices(bottle, connect); diff --git a/src/domains/reducers/domainsList.ts b/src/domains/reducers/domainsList.ts index 63b39f37..751e2f4f 100644 --- a/src/domains/reducers/domainsList.ts +++ b/src/domains/reducers/domainsList.ts @@ -1,7 +1,7 @@ import { Action, Dispatch } from 'redux'; import { ShlinkDomain } from '../../api/types'; import { buildReducer } from '../../utils/helpers/redux'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { GetState } from '../../container/types'; /* eslint-disable padding-line-between-statements */ diff --git a/src/mercure/reducers/mercureInfo.ts b/src/mercure/reducers/mercureInfo.ts index fbae9523..5684b611 100644 --- a/src/mercure/reducers/mercureInfo.ts +++ b/src/mercure/reducers/mercureInfo.ts @@ -2,7 +2,7 @@ import { Action, Dispatch } from 'redux'; import { ShlinkMercureInfo } from '../../api/types'; import { GetState } from '../../container/types'; import { buildReducer } from '../../utils/helpers/redux'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; /* eslint-disable padding-line-between-statements */ export const GET_MERCURE_INFO_START = 'shlink/mercure/GET_MERCURE_INFO_START'; diff --git a/src/servers/reducers/selectedServer.ts b/src/servers/reducers/selectedServer.ts index ba7db355..38c7c133 100644 --- a/src/servers/reducers/selectedServer.ts +++ b/src/servers/reducers/selectedServer.ts @@ -6,7 +6,7 @@ import { SelectedServer } from '../data'; import { GetState } from '../../container/types'; import { ShlinkHealth } from '../../api/types'; import { buildActionCreator, buildReducer } from '../../utils/helpers/redux'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; /* eslint-disable padding-line-between-statements */ export const SELECT_SERVER = 'shlink/selectedServer/SELECT_SERVER'; diff --git a/src/short-urls/reducers/shortUrlCreation.ts b/src/short-urls/reducers/shortUrlCreation.ts index 5fc47b02..f1f6d900 100644 --- a/src/short-urls/reducers/shortUrlCreation.ts +++ b/src/short-urls/reducers/shortUrlCreation.ts @@ -2,7 +2,7 @@ import { Action, Dispatch } from 'redux'; import { GetState } from '../../container/types'; import { ShortUrl, ShortUrlData } from '../data'; import { buildReducer, buildActionCreator } from '../../utils/helpers/redux'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; diff --git a/src/short-urls/reducers/shortUrlDeletion.ts b/src/short-urls/reducers/shortUrlDeletion.ts index 4420d929..23561c18 100644 --- a/src/short-urls/reducers/shortUrlDeletion.ts +++ b/src/short-urls/reducers/shortUrlDeletion.ts @@ -2,7 +2,7 @@ import { Action, Dispatch } from 'redux'; import { buildActionCreator, buildReducer } from '../../utils/helpers/redux'; import { ProblemDetailsError } from '../../api/types'; import { GetState } from '../../container/types'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { parseApiError } from '../../api/utils'; /* eslint-disable padding-line-between-statements */ diff --git a/src/short-urls/reducers/shortUrlEdition.ts b/src/short-urls/reducers/shortUrlEdition.ts index f0bed4ce..246b2ae2 100644 --- a/src/short-urls/reducers/shortUrlEdition.ts +++ b/src/short-urls/reducers/shortUrlEdition.ts @@ -3,7 +3,7 @@ import { buildReducer } from '../../utils/helpers/redux'; import { GetState } from '../../container/types'; import { OptionalString } from '../../utils/utils'; import { ShortUrlIdentifier } from '../data'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; diff --git a/src/short-urls/reducers/shortUrlMeta.ts b/src/short-urls/reducers/shortUrlMeta.ts index 2f09ade7..a878058f 100644 --- a/src/short-urls/reducers/shortUrlMeta.ts +++ b/src/short-urls/reducers/shortUrlMeta.ts @@ -3,7 +3,7 @@ import { ShortUrlIdentifier, ShortUrlMeta } from '../data'; import { GetState } from '../../container/types'; import { buildActionCreator, buildReducer } from '../../utils/helpers/redux'; import { OptionalString } from '../../utils/utils'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; diff --git a/src/short-urls/reducers/shortUrlTags.ts b/src/short-urls/reducers/shortUrlTags.ts index eebe1e08..277386b2 100644 --- a/src/short-urls/reducers/shortUrlTags.ts +++ b/src/short-urls/reducers/shortUrlTags.ts @@ -3,7 +3,7 @@ import { buildActionCreator, buildReducer } from '../../utils/helpers/redux'; import { GetState } from '../../container/types'; import { OptionalString } from '../../utils/utils'; import { ShortUrlIdentifier } from '../data'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; diff --git a/src/short-urls/reducers/shortUrlsList.ts b/src/short-urls/reducers/shortUrlsList.ts index f4ba3f2a..1821643a 100644 --- a/src/short-urls/reducers/shortUrlsList.ts +++ b/src/short-urls/reducers/shortUrlsList.ts @@ -5,7 +5,7 @@ import { CREATE_VISITS, CreateVisitsAction } from '../../visits/reducers/visitCr import { ShortUrl, ShortUrlIdentifier } from '../data'; import { buildReducer } from '../../utils/helpers/redux'; import { GetState } from '../../container/types'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { ShlinkShortUrlsResponse } from '../../api/types'; import { EditShortUrlTagsAction, SHORT_URL_TAGS_EDITED } from './shortUrlTags'; import { DeleteShortUrlAction, SHORT_URL_DELETED } from './shortUrlDeletion'; diff --git a/src/tags/reducers/tagDelete.ts b/src/tags/reducers/tagDelete.ts index 2c4996f3..acdac7c2 100644 --- a/src/tags/reducers/tagDelete.ts +++ b/src/tags/reducers/tagDelete.ts @@ -1,7 +1,7 @@ import { Action, Dispatch } from 'redux'; import { buildReducer } from '../../utils/helpers/redux'; import { GetState } from '../../container/types'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; diff --git a/src/tags/reducers/tagEdit.ts b/src/tags/reducers/tagEdit.ts index a02da813..3bc85c88 100644 --- a/src/tags/reducers/tagEdit.ts +++ b/src/tags/reducers/tagEdit.ts @@ -3,7 +3,7 @@ import { Action, Dispatch } from 'redux'; import { buildReducer } from '../../utils/helpers/redux'; import { GetState } from '../../container/types'; import ColorGenerator from '../../utils/services/ColorGenerator'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { ProblemDetailsError } from '../../api/types'; import { parseApiError } from '../../api/utils'; diff --git a/src/tags/reducers/tagsList.ts b/src/tags/reducers/tagsList.ts index 8217aac2..3cfc778f 100644 --- a/src/tags/reducers/tagsList.ts +++ b/src/tags/reducers/tagsList.ts @@ -4,7 +4,7 @@ import { CREATE_VISITS, CreateVisitsAction } from '../../visits/reducers/visitCr import { buildReducer } from '../../utils/helpers/redux'; import { ProblemDetailsError, ShlinkTags } from '../../api/types'; import { GetState } from '../../container/types'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { TagStats } from '../data'; import { CreateVisit, Stats } from '../../visits/types'; import { DeleteTagAction, TAG_DELETED } from './tagDelete'; diff --git a/src/utils/services/provideServices.ts b/src/utils/services/provideServices.ts index 34574b6e..e0788915 100644 --- a/src/utils/services/provideServices.ts +++ b/src/utils/services/provideServices.ts @@ -1,18 +1,13 @@ -import axios from 'axios'; import Bottle from 'bottlejs'; import { useStateFlagTimeout } from '../helpers/hooks'; import LocalStorage from './LocalStorage'; import ColorGenerator from './ColorGenerator'; -import buildShlinkApiClient from './ShlinkApiClientBuilder'; const provideServices = (bottle: Bottle) => { bottle.constant('localStorage', (global as any).localStorage); bottle.service('Storage', LocalStorage, 'localStorage'); bottle.service('ColorGenerator', ColorGenerator, 'Storage'); - bottle.constant('axios', axios); - bottle.serviceFactory('buildShlinkApiClient', buildShlinkApiClient, 'axios'); - bottle.constant('setTimeout', global.setTimeout); bottle.constant('clearTimeout', global.clearTimeout); bottle.serviceFactory('useStateFlagTimeout', useStateFlagTimeout, 'setTimeout', 'clearTimeout'); diff --git a/src/visits/reducers/shortUrlDetail.ts b/src/visits/reducers/shortUrlDetail.ts index 07e27711..c8fb5bea 100644 --- a/src/visits/reducers/shortUrlDetail.ts +++ b/src/visits/reducers/shortUrlDetail.ts @@ -1,7 +1,7 @@ import { Action, Dispatch } from 'redux'; import { ShortUrl } from '../../short-urls/data'; import { buildReducer } from '../../utils/helpers/redux'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { OptionalString } from '../../utils/utils'; import { GetState } from '../../container/types'; diff --git a/src/visits/reducers/shortUrlVisits.ts b/src/visits/reducers/shortUrlVisits.ts index 2126513e..8901a724 100644 --- a/src/visits/reducers/shortUrlVisits.ts +++ b/src/visits/reducers/shortUrlVisits.ts @@ -3,7 +3,7 @@ import { shortUrlMatches } from '../../short-urls/helpers'; import { Visit, VisitsInfo, VisitsLoadFailedAction, VisitsLoadProgressChangedAction } from '../types'; import { ShortUrlIdentifier } from '../../short-urls/data'; import { buildActionCreator, buildReducer } from '../../utils/helpers/redux'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { GetState } from '../../container/types'; import { OptionalString } from '../../utils/utils'; import { getVisitsWithLoader } from './common'; diff --git a/src/visits/reducers/tagVisits.ts b/src/visits/reducers/tagVisits.ts index 3f361acb..c0c4106b 100644 --- a/src/visits/reducers/tagVisits.ts +++ b/src/visits/reducers/tagVisits.ts @@ -1,7 +1,7 @@ import { Action, Dispatch } from 'redux'; import { Visit, VisitsInfo, VisitsLoadFailedAction, VisitsLoadProgressChangedAction } from '../types'; import { buildActionCreator, buildReducer } from '../../utils/helpers/redux'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { GetState } from '../../container/types'; import { getVisitsWithLoader } from './common'; import { CREATE_VISITS, CreateVisitsAction } from './visitCreation'; diff --git a/src/visits/reducers/visitsOverview.ts b/src/visits/reducers/visitsOverview.ts index 01a2eb7d..e3f78e59 100644 --- a/src/visits/reducers/visitsOverview.ts +++ b/src/visits/reducers/visitsOverview.ts @@ -1,6 +1,6 @@ import { Action, Dispatch } from 'redux'; import { ShlinkVisitsOverview } from '../../api/types'; -import { ShlinkApiClientBuilder } from '../../utils/services/ShlinkApiClientBuilder'; +import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { GetState } from '../../container/types'; import { buildReducer } from '../../utils/helpers/redux'; import { CREATE_VISITS, CreateVisitsAction } from './visitCreation'; diff --git a/test/utils/services/ShlinkApiClient.test.ts b/test/api/services/ShlinkApiClient.test.ts similarity index 99% rename from test/utils/services/ShlinkApiClient.test.ts rename to test/api/services/ShlinkApiClient.test.ts index d806cee5..93a2d7dd 100644 --- a/test/utils/services/ShlinkApiClient.test.ts +++ b/test/api/services/ShlinkApiClient.test.ts @@ -1,5 +1,5 @@ import { AxiosInstance, AxiosRequestConfig } from 'axios'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import { OptionalString } from '../../../src/utils/utils'; import { Mock } from 'ts-mockery'; import { ShlinkDomain, ShlinkVisitsOverview } from '../../../src/api/types'; diff --git a/test/utils/services/ShlinkApiClientBuilder.test.ts b/test/api/services/ShlinkApiClientBuilder.test.ts similarity index 95% rename from test/utils/services/ShlinkApiClientBuilder.test.ts rename to test/api/services/ShlinkApiClientBuilder.test.ts index 0cd31204..cd6da949 100644 --- a/test/utils/services/ShlinkApiClientBuilder.test.ts +++ b/test/api/services/ShlinkApiClientBuilder.test.ts @@ -1,6 +1,6 @@ import { Mock } from 'ts-mockery'; import { AxiosInstance } from 'axios'; -import buildShlinkApiClient from '../../../src/utils/services/ShlinkApiClientBuilder'; +import buildShlinkApiClient from '../../../src/api/services/ShlinkApiClientBuilder'; import { ReachableServer, SelectedServer } from '../../../src/servers/data'; import { ShlinkState } from '../../../src/container/types'; diff --git a/test/domains/reducers/domainsList.test.ts b/test/domains/reducers/domainsList.test.ts index 215131af..585bb1da 100644 --- a/test/domains/reducers/domainsList.test.ts +++ b/test/domains/reducers/domainsList.test.ts @@ -7,7 +7,7 @@ import reducer, { listDomains as listDomainsAction, } from '../../../src/domains/reducers/domainsList'; import { ShlinkDomain } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; describe('domainsList', () => { const domains = [ Mock.all(), Mock.all(), Mock.all() ]; diff --git a/test/mercure/reducers/mercureInfo.test.ts b/test/mercure/reducers/mercureInfo.test.ts index 347bf907..239a9ba1 100644 --- a/test/mercure/reducers/mercureInfo.test.ts +++ b/test/mercure/reducers/mercureInfo.test.ts @@ -7,7 +7,7 @@ import reducer, { GetMercureInfoAction, } from '../../../src/mercure/reducers/mercureInfo'; import { ShlinkMercureInfo } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import { GetState } from '../../../src/container/types'; describe('mercureInfoReducer', () => { diff --git a/test/short-urls/reducers/shortUrlCreation.test.ts b/test/short-urls/reducers/shortUrlCreation.test.ts index 7347e5fb..002cb368 100644 --- a/test/short-urls/reducers/shortUrlCreation.test.ts +++ b/test/short-urls/reducers/shortUrlCreation.test.ts @@ -9,7 +9,7 @@ import reducer, { CreateShortUrlAction, } from '../../../src/short-urls/reducers/shortUrlCreation'; import { ShortUrl } from '../../../src/short-urls/data'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; describe('shortUrlCreationReducer', () => { diff --git a/test/short-urls/reducers/shortUrlDeletion.test.ts b/test/short-urls/reducers/shortUrlDeletion.test.ts index 04150566..e8a74df4 100644 --- a/test/short-urls/reducers/shortUrlDeletion.test.ts +++ b/test/short-urls/reducers/shortUrlDeletion.test.ts @@ -8,7 +8,7 @@ import reducer, { deleteShortUrl, } from '../../../src/short-urls/reducers/shortUrlDeletion'; import { ProblemDetailsError } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; describe('shortUrlDeletionReducer', () => { describe('reducer', () => { diff --git a/test/short-urls/reducers/shortUrlsList.test.ts b/test/short-urls/reducers/shortUrlsList.test.ts index 4ceaa7c8..da14fc13 100644 --- a/test/short-urls/reducers/shortUrlsList.test.ts +++ b/test/short-urls/reducers/shortUrlsList.test.ts @@ -10,7 +10,7 @@ import { SHORT_URL_DELETED } from '../../../src/short-urls/reducers/shortUrlDele import { SHORT_URL_META_EDITED } from '../../../src/short-urls/reducers/shortUrlMeta'; import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { ShortUrl } from '../../../src/short-urls/data'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; 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/tags/reducers/tagDelete.test.ts b/test/tags/reducers/tagDelete.test.ts index bc199d37..b51650d5 100644 --- a/test/tags/reducers/tagDelete.test.ts +++ b/test/tags/reducers/tagDelete.test.ts @@ -7,7 +7,7 @@ import reducer, { tagDeleted, deleteTag, } from '../../../src/tags/reducers/tagDelete'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; describe('tagDeleteReducer', () => { diff --git a/test/tags/reducers/tagEdit.test.ts b/test/tags/reducers/tagEdit.test.ts index 2bcfd3a6..08fbc1b9 100644 --- a/test/tags/reducers/tagEdit.test.ts +++ b/test/tags/reducers/tagEdit.test.ts @@ -8,7 +8,7 @@ import reducer, { editTag, EditTagAction, } from '../../../src/tags/reducers/tagEdit'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import ColorGenerator from '../../../src/utils/services/ColorGenerator'; import { ShlinkState } from '../../../src/container/types'; diff --git a/test/visits/reducers/shortUrlDetail.test.ts b/test/visits/reducers/shortUrlDetail.test.ts index 582dd2d1..02d5bf39 100644 --- a/test/visits/reducers/shortUrlDetail.test.ts +++ b/test/visits/reducers/shortUrlDetail.test.ts @@ -7,7 +7,7 @@ import reducer, { ShortUrlDetailAction, } from '../../../src/visits/reducers/shortUrlDetail'; import { ShortUrl } from '../../../src/short-urls/data'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; describe('shortUrlDetailReducer', () => { diff --git a/test/visits/reducers/shortUrlVisits.test.ts b/test/visits/reducers/shortUrlVisits.test.ts index 824f4ff8..ba6fe837 100644 --- a/test/visits/reducers/shortUrlVisits.test.ts +++ b/test/visits/reducers/shortUrlVisits.test.ts @@ -14,7 +14,7 @@ import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { rangeOf } from '../../../src/utils/utils'; import { Visit } from '../../../src/visits/types'; import { ShlinkVisits } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; describe('shortUrlVisitsReducer', () => { diff --git a/test/visits/reducers/tagVisits.test.ts b/test/visits/reducers/tagVisits.test.ts index 3b5437b7..cd687b55 100644 --- a/test/visits/reducers/tagVisits.test.ts +++ b/test/visits/reducers/tagVisits.test.ts @@ -14,7 +14,7 @@ import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation'; import { rangeOf } from '../../../src/utils/utils'; import { Visit } from '../../../src/visits/types'; import { ShlinkVisits } from '../../../src/api/types'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; describe('tagVisitsReducer', () => { diff --git a/test/visits/reducers/visitsOverview.test.ts b/test/visits/reducers/visitsOverview.test.ts index d159ab70..5e3369ce 100644 --- a/test/visits/reducers/visitsOverview.test.ts +++ b/test/visits/reducers/visitsOverview.test.ts @@ -8,7 +8,7 @@ import reducer, { loadVisitsOverview, } from '../../../src/visits/reducers/visitsOverview'; import { CreateVisitsAction } from '../../../src/visits/reducers/visitCreation'; -import ShlinkApiClient from '../../../src/utils/services/ShlinkApiClient'; +import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import { ShlinkVisitsOverview } from '../../../src/api/types'; import { ShlinkState } from '../../../src/container/types';