projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19690-roject-column-options' closes #19690 Arvados-DCO-1.1-Signed-off...
[arvados-workbench2.git]
/
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 87b50bd2f97ff89f1a7d057e580aa3093a13bf80..0ca5d679c9caa14b0e2c2fe8847d56d57f61de29 100644
(file)
--- 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
//
// 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[];
export interface ProcessLogsPanel {
filters: string[];
@@
-19,8
+19,8
@@
export const getProcessPanelLogs = ({ selectedFilter, logs }: ProcessLogsPanel)
return logs[selectedFilter];
};
return logs[selectedFilter];
};
-export const getProcessLogsPanelCurrentUuid = (
{ router }: Root
State) => {
+export const getProcessLogsPanelCurrentUuid = (
router: Router
State) => {
const pathname = router.location ? router.location.pathname : '';
const pathname = router.location ? router.location.pathname : '';
- const match = matchProcess
LogRoute(pathname) || matchProcess
Route(pathname);
+ const match = matchProcessRoute(pathname);
return match ? match.params.id : undefined;
};
return match ? match.params.id : undefined;
};