forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-03-16 20:43:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed event source not being properly closed with new boundToMercureHub HOC

Browse Source
This commit is contained in:
Alejandro Celaya
2020-09-12 12:06:53 +02:00
parent cfb165d240
commit fe3e08de0f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mercure/helpers/boundToMercureHub.tsx
View File

@@ -1,4 +1,5 @@
import React, { FC, useEffect } from 'react'; import React, { FC, useEffect } from 'react';
import { pipe } from 'ramda';
import { CreateVisit } from '../../visits/types'; import { CreateVisit } from '../../visits/types';
import { MercureInfo } from '../reducers/mercureInfo'; import { MercureInfo } from '../reducers/mercureInfo';
import { bindToMercureTopic } from './index'; import { bindToMercureTopic } from './index';
@@ -21,11 +22,10 @@ export function boundToMercureHub<T = {}>(
useEffect(() => { useEffect(() => {
const onMessage = (visit: CreateVisit) => interval ? pendingUpdates.add(visit) : createNewVisits([ visit ]); const onMessage = (visit: CreateVisit) => interval ? pendingUpdates.add(visit) : createNewVisits([ visit ]);
const closeEventSource = bindToMercureTopic(mercureInfo, getTopicForProps(props), onMessage, loadMercureInfo);
bindToMercureTopic(mercureInfo, getTopicForProps(props), onMessage, loadMercureInfo);
if (!interval) { if (!interval) {
return undefined; return closeEventSource;
} }
const timer = setInterval(() => { const timer = setInterval(() => {
@@ -33,7 +33,7 @@ export function boundToMercureHub<T = {}>(
pendingUpdates.clear(); pendingUpdates.clear();
}, interval * 1000 * 60); }, interval * 1000 * 60);
return () => clearInterval(timer); return pipe(() => clearInterval(timer), () => closeEventSource?.());
}, [ mercureInfo ]); }, [ mercureInfo ]);
return <WrappedComponent {...props} />; return <WrappedComponent {...props} />;