From 56b3523c5b5ae9620b8acd2083aad5f8e14d7d98 Mon Sep 17 00:00:00 2001 From: Alejandro Celaya Date: Fri, 5 Mar 2021 16:04:02 +0100 Subject: [PATCH] Moved short URL detail reducer to short-urls module --- src/container/types.ts | 2 +- src/reducers/index.ts | 2 +- src/{visits => short-urls}/reducers/shortUrlDetail.ts | 2 +- src/visits/ShortUrlVisits.tsx | 2 +- src/visits/ShortUrlVisitsHeader.tsx | 2 +- src/visits/services/provideServices.ts | 2 +- test/{visits => short-urls}/reducers/shortUrlDetail.test.ts | 2 +- test/visits/ShortUrlVisits.test.tsx | 2 +- test/visits/ShortUrlVisitsHeader.test.tsx | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename src/{visits => short-urls}/reducers/shortUrlDetail.ts (97%) rename test/{visits => short-urls}/reducers/shortUrlDetail.test.ts (98%) diff --git a/src/container/types.ts b/src/container/types.ts index d51764c2..3b4fff27 100644 --- a/src/container/types.ts +++ b/src/container/types.ts @@ -11,7 +11,7 @@ import { ShortUrlsList } from '../short-urls/reducers/shortUrlsList'; import { TagDeletion } from '../tags/reducers/tagDelete'; import { TagEdition } from '../tags/reducers/tagEdit'; import { TagsList } from '../tags/reducers/tagsList'; -import { ShortUrlDetail } from '../visits/reducers/shortUrlDetail'; +import { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail'; import { ShortUrlVisits } from '../visits/reducers/shortUrlVisits'; import { TagVisits } from '../visits/reducers/tagVisits'; import { DomainsList } from '../domains/reducers/domainsList'; diff --git a/src/reducers/index.ts b/src/reducers/index.ts index 4efcf1c6..29311fa7 100644 --- a/src/reducers/index.ts +++ b/src/reducers/index.ts @@ -11,7 +11,7 @@ import shortUrlEditionReducer from '../short-urls/reducers/shortUrlEdition'; import shortUrlVisitsReducer from '../visits/reducers/shortUrlVisits'; import tagVisitsReducer from '../visits/reducers/tagVisits'; import orphanVisitsReducer from '../visits/reducers/orphanVisits'; -import shortUrlDetailReducer from '../visits/reducers/shortUrlDetail'; +import shortUrlDetailReducer from '../short-urls/reducers/shortUrlDetail'; import tagsListReducer from '../tags/reducers/tagsList'; import tagDeleteReducer from '../tags/reducers/tagDelete'; import tagEditReducer from '../tags/reducers/tagEdit'; diff --git a/src/visits/reducers/shortUrlDetail.ts b/src/short-urls/reducers/shortUrlDetail.ts similarity index 97% rename from src/visits/reducers/shortUrlDetail.ts rename to src/short-urls/reducers/shortUrlDetail.ts index c8fb5bea..4c611cca 100644 --- a/src/visits/reducers/shortUrlDetail.ts +++ b/src/short-urls/reducers/shortUrlDetail.ts @@ -1,5 +1,5 @@ import { Action, Dispatch } from 'redux'; -import { ShortUrl } from '../../short-urls/data'; +import { ShortUrl } from '../data'; import { buildReducer } from '../../utils/helpers/redux'; import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder'; import { OptionalString } from '../../utils/utils'; diff --git a/src/visits/ShortUrlVisits.tsx b/src/visits/ShortUrlVisits.tsx index 3d71b8cf..509e34ae 100644 --- a/src/visits/ShortUrlVisits.tsx +++ b/src/visits/ShortUrlVisits.tsx @@ -4,9 +4,9 @@ import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub'; import { ShlinkVisitsParams } from '../api/types'; import { parseQuery } from '../utils/helpers/query'; import { Topics } from '../mercure/helpers/Topics'; +import { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail'; import { ShortUrlVisits as ShortUrlVisitsState } from './reducers/shortUrlVisits'; import ShortUrlVisitsHeader from './ShortUrlVisitsHeader'; -import { ShortUrlDetail } from './reducers/shortUrlDetail'; import VisitsStats from './VisitsStats'; export interface ShortUrlVisitsProps extends RouteComponentProps<{ shortCode: string }> { diff --git a/src/visits/ShortUrlVisitsHeader.tsx b/src/visits/ShortUrlVisitsHeader.tsx index 38826b8e..c581f3ed 100644 --- a/src/visits/ShortUrlVisitsHeader.tsx +++ b/src/visits/ShortUrlVisitsHeader.tsx @@ -1,7 +1,7 @@ import { UncontrolledTooltip } from 'reactstrap'; import Moment from 'react-moment'; import { ExternalLink } from 'react-external-link'; -import { ShortUrlDetail } from './reducers/shortUrlDetail'; +import { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail'; import { ShortUrlVisits } from './reducers/shortUrlVisits'; import VisitsHeader from './VisitsHeader'; import './ShortUrlVisitsHeader.scss'; diff --git a/src/visits/services/provideServices.ts b/src/visits/services/provideServices.ts index f550b68f..5e7775f5 100644 --- a/src/visits/services/provideServices.ts +++ b/src/visits/services/provideServices.ts @@ -1,7 +1,7 @@ import Bottle from 'bottlejs'; import ShortUrlVisits from '../ShortUrlVisits'; import { cancelGetShortUrlVisits, getShortUrlVisits } from '../reducers/shortUrlVisits'; -import { getShortUrlDetail } from '../reducers/shortUrlDetail'; +import { getShortUrlDetail } from '../../short-urls/reducers/shortUrlDetail'; import MapModal from '../helpers/MapModal'; import { createNewVisits } from '../reducers/visitCreation'; import TagVisits from '../TagVisits'; diff --git a/test/visits/reducers/shortUrlDetail.test.ts b/test/short-urls/reducers/shortUrlDetail.test.ts similarity index 98% rename from test/visits/reducers/shortUrlDetail.test.ts rename to test/short-urls/reducers/shortUrlDetail.test.ts index 02d5bf39..4882fca8 100644 --- a/test/visits/reducers/shortUrlDetail.test.ts +++ b/test/short-urls/reducers/shortUrlDetail.test.ts @@ -5,7 +5,7 @@ import reducer, { GET_SHORT_URL_DETAIL_ERROR, GET_SHORT_URL_DETAIL, ShortUrlDetailAction, -} from '../../../src/visits/reducers/shortUrlDetail'; +} from '../../../src/short-urls/reducers/shortUrlDetail'; import { ShortUrl } from '../../../src/short-urls/data'; import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient'; import { ShlinkState } from '../../../src/container/types'; diff --git a/test/visits/ShortUrlVisits.test.tsx b/test/visits/ShortUrlVisits.test.tsx index 225c2711..2a3be38e 100644 --- a/test/visits/ShortUrlVisits.test.tsx +++ b/test/visits/ShortUrlVisits.test.tsx @@ -6,7 +6,7 @@ import { match } from 'react-router'; // eslint-disable-line @typescript-eslint/ import ShortUrlVisits, { ShortUrlVisitsProps } from '../../src/visits/ShortUrlVisits'; import ShortUrlVisitsHeader from '../../src/visits/ShortUrlVisitsHeader'; import { ShortUrlVisits as ShortUrlVisitsState } from '../../src/visits/reducers/shortUrlVisits'; -import { ShortUrlDetail } from '../../src/visits/reducers/shortUrlDetail'; +import { ShortUrlDetail } from '../../src/short-urls/reducers/shortUrlDetail'; import VisitsStats from '../../src/visits/VisitsStats'; import { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub'; diff --git a/test/visits/ShortUrlVisitsHeader.test.tsx b/test/visits/ShortUrlVisitsHeader.test.tsx index c2701eba..e6d4c43a 100644 --- a/test/visits/ShortUrlVisitsHeader.test.tsx +++ b/test/visits/ShortUrlVisitsHeader.test.tsx @@ -3,7 +3,7 @@ import Moment from 'react-moment'; import { ExternalLink } from 'react-external-link'; import { Mock } from 'ts-mockery'; import ShortUrlVisitsHeader from '../../src/visits/ShortUrlVisitsHeader'; -import { ShortUrlDetail } from '../../src/visits/reducers/shortUrlDetail'; +import { ShortUrlDetail } from '../../src/short-urls/reducers/shortUrlDetail'; import { ShortUrlVisits } from '../../src/visits/reducers/shortUrlVisits'; describe('', () => {