Moved API types and type helpers to api module

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;

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';

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<ProblemDetailsError>) => 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';

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';

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';

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';
 

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 {

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 {

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 */

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';

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 */

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 */

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 */

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';

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 */

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 */

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';

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
 

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';

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';

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';

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';
 

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';

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[];

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('<DomainSelector />', () => {
   let wrapper: ShallowWrapper;

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', () => {

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';
 

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('<DeleteShortUrlModal />', () => {

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', () => {

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';
 

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;

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';
 

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';
 

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', () => {