Move mercure module to shlink-web-component

src/container/index.ts

@@ -5,11 +5,11 @@ import { connect as reduxConnect } from 'react-redux';
 import { provideServices as provideApiServices } from '../api/services/provideServices';
 import { provideServices as provideAppServices } from '../app/services/provideServices';
 import { provideServices as provideCommonServices } from '../common/services/provideServices';
-import { provideServices as provideMercureServices } from '../mercure/services/provideServices';
 import { provideServices as provideServersServices } from '../servers/services/provideServices';
 import { provideServices as provideSettingsServices } from '../settings/services/provideServices';
 import { provideServices as provideWebComponentServices } from '../shlink-web-component/container/provideServices';
 import { provideServices as provideDomainsServices } from '../shlink-web-component/domains/services/provideServices';
+import { provideServices as provideMercureServices } from '../shlink-web-component/mercure/services/provideServices';
 import { provideServices as provideShortUrlsServices } from '../shlink-web-component/short-urls/services/provideServices';
 import { provideServices as provideTagsServices } from '../shlink-web-component/tags/services/provideServices';
 import { provideServices as provideVisitsServices } from '../shlink-web-component/visits/services/provideServices';

src/container/types.ts

@@ -1,8 +1,8 @@
 import type { Sidebar } from '../common/reducers/sidebar';
-import type { MercureInfo } from '../mercure/reducers/mercureInfo';
 import type { SelectedServer, ServersMap } from '../servers/data';
 import type { Settings } from '../settings/reducers/settings';
 import type { DomainsList } from '../shlink-web-component/domains/reducers/domainsList';
+import type { MercureInfo } from '../shlink-web-component/mercure/reducers/mercureInfo';
 import type { ShortUrlCreation } from '../shlink-web-component/short-urls/reducers/shortUrlCreation';
 import type { ShortUrlDeletion } from '../shlink-web-component/short-urls/reducers/shortUrlDeletion';
 import type { ShortUrlDetail } from '../shlink-web-component/short-urls/reducers/shortUrlDetail';

src/shlink-web-component/mercure/helpers/boundToMercureHub.tsx

@@ -2,7 +2,7 @@ import { pipe } from 'ramda';
 import type { FC } from 'react';
 import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';
-import type { CreateVisit } from '../../shlink-web-component/visits/types';
+import type { CreateVisit } from '../../visits/types';
 import type { MercureInfo } from '../reducers/mercureInfo';
 import { bindToMercureTopic } from './index';
 

src/shlink-web-component/mercure/reducers/mercureInfo.ts

@@ -1,7 +1,7 @@
 import { createSlice } from '@reduxjs/toolkit';
-import type { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
+import type { ShlinkApiClientBuilder } from '../../../api/services/ShlinkApiClientBuilder';
-import type { ShlinkMercureInfo } from '../../api/types';
+import type { ShlinkMercureInfo } from '../../../api/types';
-import { createAsyncThunk } from '../../utils/helpers/redux';
+import { createAsyncThunk } from '../../../utils/helpers/redux';
 
 const REDUCER_PREFIX = 'shlink/mercure';
 

src/shlink-web-component/overview/Overview.tsx

@@ -3,14 +3,14 @@ import { useEffect } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { Card, CardBody, CardHeader, Row } from 'reactstrap';
 import type { ShlinkShortUrlsListParams } from '../../api/types';
-import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../../mercure/helpers/Topics';
 import type { SelectedServer } from '../../servers/data';
 import { getServerId } from '../../servers/data';
 import { HighlightCard } from '../../servers/helpers/HighlightCard';
 import { VisitsHighlightCard } from '../../servers/helpers/VisitsHighlightCard';
 import type { Settings } from '../../settings/reducers/settings';
 import { prettify } from '../../utils/helpers/numbers';
+import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { Topics } from '../mercure/helpers/Topics';
 import type { CreateShortUrlProps } from '../short-urls/CreateShortUrl';
 import type { ShortUrlsList as ShortUrlsListState } from '../short-urls/reducers/shortUrlsList';
 import { ITEMS_IN_OVERVIEW_PAGE } from '../short-urls/reducers/shortUrlsList';

src/shlink-web-component/short-urls/ShortUrlsList.tsx

@@ -3,8 +3,6 @@ import { useEffect, useState } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 import { Card } from 'reactstrap';
 import type { ShlinkShortUrlsListParams, ShlinkShortUrlsOrder } from '../../api/types';
-import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../../mercure/helpers/Topics';
 import type { SelectedServer } from '../../servers/data';
 import { getServerId } from '../../servers/data';
 import type { Settings } from '../../settings/reducers/settings';
@@ -12,6 +10,8 @@ import { DEFAULT_SHORT_URLS_ORDERING } from '../../settings/reducers/settings';
 import type { OrderDir } from '../../utils/helpers/ordering';
 import { determineOrderDir } from '../../utils/helpers/ordering';
 import { TableOrderIcon } from '../../utils/table/TableOrderIcon';
+import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { Topics } from '../mercure/helpers/Topics';
 import { useFeature } from '../utils/features';
 import type { ShortUrlsOrder, ShortUrlsOrderableFields } from './data';
 import { useShortUrlsQuery } from './helpers/hooks';

src/shlink-web-component/tags/TagsList.tsx

@@ -3,8 +3,6 @@ import type { FC } from 'react';
 import { useEffect, useState } from 'react';
 import { Row } from 'reactstrap';
 import { ShlinkApiError } from '../../api/ShlinkApiError';
-import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../../mercure/helpers/Topics';
 import type { SelectedServer } from '../../servers/data';
 import type { Settings } from '../../settings/reducers/settings';
 import { determineOrderDir, sortList } from '../../utils/helpers/ordering';
@@ -12,6 +10,8 @@ import { Message } from '../../utils/Message';
 import { OrderingDropdown } from '../../utils/OrderingDropdown';
 import { Result } from '../../utils/Result';
 import { SearchField } from '../../utils/SearchField';
+import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { Topics } from '../mercure/helpers/Topics';
 import type { SimplifiedTag } from './data';
 import type { TagsOrder, TagsOrderableFields } from './data/TagsListChildrenProps';
 import { TAGS_ORDERABLE_FIELDS } from './data/TagsListChildrenProps';

src/shlink-web-component/visits/DomainVisits.tsx

@@ -1,9 +1,9 @@
 import { useParams } from 'react-router-dom';
 import type { ShlinkVisitsParams } from '../../api/types';
 import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../../mercure/helpers/Topics';
 import { useGoBack } from '../../utils/helpers/hooks';
+import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { Topics } from '../mercure/helpers/Topics';
 import type { DomainVisits as DomainVisitsState, LoadDomainVisits } from './reducers/domainVisits';
 import type { NormalizedVisit } from './types';
 import type { CommonVisitsProps } from './types/CommonVisitsProps';

src/shlink-web-component/visits/NonOrphanVisits.tsx

@@ -1,7 +1,7 @@
 import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../../mercure/helpers/Topics';
 import { useGoBack } from '../../utils/helpers/hooks';
+import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { Topics } from '../mercure/helpers/Topics';
 import type { LoadVisits, VisitsInfo } from './reducers/types';
 import type { NormalizedVisit, VisitsParams } from './types';
 import type { CommonVisitsProps } from './types/CommonVisitsProps';

src/shlink-web-component/visits/OrphanVisits.tsx

@@ -1,7 +1,7 @@
 import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../../mercure/helpers/Topics';
 import { useGoBack } from '../../utils/helpers/hooks';
+import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { Topics } from '../mercure/helpers/Topics';
 import type { LoadOrphanVisits } from './reducers/orphanVisits';
 import type { VisitsInfo } from './reducers/types';
 import type { NormalizedVisit, VisitsParams } from './types';

src/shlink-web-component/visits/ShortUrlVisits.tsx

@@ -1,10 +1,10 @@
 import { useEffect } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../../mercure/helpers/Topics';
 import { useGoBack } from '../../utils/helpers/hooks';
 import { parseQuery } from '../../utils/helpers/query';
+import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { Topics } from '../mercure/helpers/Topics';
 import type { ShortUrlIdentifier } from '../short-urls/data';
 import { urlDecodeShortCode } from '../short-urls/helpers';
 import type { ShortUrlDetail } from '../short-urls/reducers/shortUrlDetail';

src/shlink-web-component/visits/TagVisits.tsx

@@ -1,10 +1,10 @@
 import { useParams } from 'react-router-dom';
 import type { ShlinkVisitsParams } from '../../api/types';
 import type { ReportExporter } from '../../common/services/ReportExporter';
-import { boundToMercureHub } from '../../mercure/helpers/boundToMercureHub';
-import { Topics } from '../../mercure/helpers/Topics';
 import { useGoBack } from '../../utils/helpers/hooks';
 import type { ColorGenerator } from '../../utils/services/ColorGenerator';
+import { boundToMercureHub } from '../mercure/helpers/boundToMercureHub';
+import { Topics } from '../mercure/helpers/Topics';
 import type { LoadTagVisits, TagVisits as TagVisitsState } from './reducers/tagVisits';
 import { TagVisitsHeader } from './TagVisitsHeader';
 import type { NormalizedVisit } from './types';

test/mercure/helpers/index.test.tsx

@@ -1,8 +1,8 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { EventSourcePolyfill } from 'event-source-polyfill';
 import { identity } from 'ramda';
-import { bindToMercureTopic } from '../../../src/mercure/helpers';
+import { bindToMercureTopic } from '../../../src/shlink-web-component/mercure/helpers';
-import type { MercureInfo } from '../../../src/mercure/reducers/mercureInfo';
+import type { MercureInfo } from '../../../src/shlink-web-component/mercure/reducers/mercureInfo';
 
 vi.mock('event-source-polyfill');
 

test/mercure/reducers/mercureInfo.test.ts

@@ -1,7 +1,7 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import type { ShlinkApiClient } from '../../../src/api/services/ShlinkApiClient';
 import type { GetState } from '../../../src/container/types';
-import { mercureInfoReducerCreator } from '../../../src/mercure/reducers/mercureInfo';
+import { mercureInfoReducerCreator } from '../../../src/shlink-web-component/mercure/reducers/mercureInfo';
 
 describe('mercureInfoReducer', () => {
   const mercureInfo = {

test/servers/Overview.test.tsx

@@ -1,7 +1,7 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureInfo } from '../../src/mercure/reducers/mercureInfo';
+import type { MercureInfo } from '../../src/shlink-web-component/mercure/reducers/mercureInfo';
 import { Overview as overviewCreator } from '../../src/shlink-web-component/overview/Overview';
 import { prettify } from '../../src/utils/helpers/numbers';
 import { renderWithEvents } from '../__helpers__/setUpTest';

test/short-urls/ShortUrlsList.test.tsx

@@ -1,8 +1,8 @@
 import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { MemoryRouter, useNavigate } from 'react-router-dom';
-import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
 import type { Settings } from '../../src/settings/reducers/settings';
+import type { MercureBoundProps } from '../../src/shlink-web-component/mercure/helpers/boundToMercureHub';
 import type { ShortUrlsOrder } from '../../src/shlink-web-component/short-urls/data';
 import type { ShortUrlsList as ShortUrlsListModel } from '../../src/shlink-web-component/short-urls/reducers/shortUrlsList';
 import { ShortUrlsList as createShortUrlsList } from '../../src/shlink-web-component/short-urls/ShortUrlsList';

test/tags/TagsList.test.tsx

@@ -1,7 +1,7 @@
 import { screen, waitFor } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { identity } from 'ramda';
-import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { MercureBoundProps } from '../../src/shlink-web-component/mercure/helpers/boundToMercureHub';
 import type { TagsList } from '../../src/shlink-web-component/tags/reducers/tagsList';
 import type { TagsListProps } from '../../src/shlink-web-component/tags/TagsList';
 import { TagsList as createTagsList } from '../../src/shlink-web-component/tags/TagsList';

test/visits/DomainVisits.test.tsx

@@ -2,7 +2,7 @@ import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { MercureBoundProps } from '../../src/shlink-web-component/mercure/helpers/boundToMercureHub';
 import { DomainVisits as createDomainVisits } from '../../src/shlink-web-component/visits/DomainVisits';
 import type { DomainVisits } from '../../src/shlink-web-component/visits/reducers/domainVisits';
 import { renderWithEvents } from '../__helpers__/setUpTest';

test/visits/NonOrphanVisits.test.tsx

@@ -2,7 +2,7 @@ import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { MercureBoundProps } from '../../src/shlink-web-component/mercure/helpers/boundToMercureHub';
 import { NonOrphanVisits as createNonOrphanVisits } from '../../src/shlink-web-component/visits/NonOrphanVisits';
 import type { VisitsInfo } from '../../src/shlink-web-component/visits/reducers/types';
 import { renderWithEvents } from '../__helpers__/setUpTest';

test/visits/OrphanVisits.test.tsx

@@ -2,7 +2,7 @@ import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { MercureBoundProps } from '../../src/shlink-web-component/mercure/helpers/boundToMercureHub';
 import { OrphanVisits as createOrphanVisits } from '../../src/shlink-web-component/visits/OrphanVisits';
 import type { VisitsInfo } from '../../src/shlink-web-component/visits/reducers/types';
 import { renderWithEvents } from '../__helpers__/setUpTest';

test/visits/ShortUrlVisits.test.tsx

@@ -3,7 +3,7 @@ import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { identity } from 'ramda';
 import { MemoryRouter } from 'react-router-dom';
-import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { MercureBoundProps } from '../../src/shlink-web-component/mercure/helpers/boundToMercureHub';
 import type { ShortUrlVisits as ShortUrlVisitsState } from '../../src/shlink-web-component/visits/reducers/shortUrlVisits';
 import type { ShortUrlVisitsProps } from '../../src/shlink-web-component/visits/ShortUrlVisits';
 import { ShortUrlVisits as createShortUrlVisits } from '../../src/shlink-web-component/visits/ShortUrlVisits';

test/visits/TagVisits.test.tsx

@@ -2,7 +2,7 @@ import { screen } from '@testing-library/react';
 import { fromPartial } from '@total-typescript/shoehorn';
 import { formatISO } from 'date-fns';
 import { MemoryRouter } from 'react-router';
-import type { MercureBoundProps } from '../../src/mercure/helpers/boundToMercureHub';
+import type { MercureBoundProps } from '../../src/shlink-web-component/mercure/helpers/boundToMercureHub';
 import type { TagVisits as TagVisitsStats } from '../../src/shlink-web-component/visits/reducers/tagVisits';
 import type { TagVisitsProps } from '../../src/shlink-web-component/visits/TagVisits';
 import { TagVisits as createTagVisits } from '../../src/shlink-web-component/visits/TagVisits';