X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/079923a5211b0a7a8c234657b6bb804ef52669a3..342f4ed11da7860e834928aa79974f096a8f6291:/src/store/process-logs-panel/process-logs-panel.ts diff --git a/src/store/process-logs-panel/process-logs-panel.ts b/src/store/process-logs-panel/process-logs-panel.ts index 87b50bd2..0ca5d679 100644 --- a/src/store/process-logs-panel/process-logs-panel.ts +++ b/src/store/process-logs-panel/process-logs-panel.ts @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { RootState } from '../store'; -import { matchProcessLogRoute, matchProcessRoute } from 'routes/routes'; +import { matchProcessRoute } from 'routes/routes'; +import { RouterState } from 'react-router-redux'; export interface ProcessLogsPanel { filters: string[]; @@ -19,8 +19,8 @@ export const getProcessPanelLogs = ({ selectedFilter, logs }: ProcessLogsPanel) return logs[selectedFilter]; }; -export const getProcessLogsPanelCurrentUuid = ({ router }: RootState) => { +export const getProcessLogsPanelCurrentUuid = (router: RouterState) => { const pathname = router.location ? router.location.pathname : ''; - const match = matchProcessLogRoute(pathname) || matchProcessRoute(pathname); + const match = matchProcessRoute(pathname); return match ? match.params.id : undefined; };