From 25e7ad1a0828c2860761dcf840970fdca994ba81 Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Thu, 26 May 2022 22:33:59 +0200 Subject: [PATCH] redirect to version page on download --- .../available-versions-array.component.tsx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/renderer/components/available-versions-array.component.tsx b/src/renderer/components/available-versions-array.component.tsx index 7287bef5..ce880e59 100644 --- a/src/renderer/components/available-versions-array.component.tsx +++ b/src/renderer/components/available-versions-array.component.tsx @@ -1,19 +1,29 @@ import { BSVersion } from "../../main/services/bs-version-manager.service" import { useEffect, useState } from "react" import { BSVersionManagerService } from "renderer/services/bs-version-manager.service"; +import { BsDownloaderService } from "renderer/services/bs-downloader.service"; +import { filter, take } from "rxjs"; +import { useNavigate } from 'react-router-dom' export function AvailableVersionsArray({setSelectedVersion}: {setSelectedVersion: Function}) { const [versionsMap, setVersionsMap] = useState(new Map()); const [versions, setVersions] = useState([] as BSVersion[]); - console.log(setSelectedVersion); + const navigate = useNavigate(); + + const versionManagerService = BSVersionManagerService.getInstance(); + const downloaderService = BsDownloaderService.getInstance(); useEffect(() => { - BSVersionManagerService.getInstance().availableVersions$.subscribe(versions => { + versionManagerService.availableVersions$.subscribe(versions => { organiseVersions(versions); setVersions(versions); }); + + downloaderService.currentBsVersionDownload$.pipe(filter(v => !!v), take(1)).subscribe(version => { + navigate(`/bs-version/${version.BSVersion}`, {state: version}); + }); }, []) @@ -26,8 +36,6 @@ export function AvailableVersionsArray({setSelectedVersion}: {setSelectedVersion setVersionsMap(newMap); } - console.log(versionsMap); - return (
{ versions.map((v, index) => ) }