[ARVADOS-WORKBENCH2] updated: 2.3.0-210-g29df452f
Git user
git at public.arvados.org
Tue Mar 22 14:28:41 UTC 2022
Summary of changes:
src/components/code-snippet/code-snippet.tsx | 16 ++--
.../multi-panel-view/multi-panel-view.tsx | 9 +--
src/models/log.ts | 1 +
.../process-logs-panel-actions.ts | 16 ++--
src/store/process-panel/process-panel-actions.ts | 7 +-
src/store/workbench/workbench-actions.ts | 10 ---
src/views/process-panel/process-log-card.tsx | 15 +++-
.../process-panel/process-log-code-snippet.tsx | 92 ++++++++++++++++++----
src/views/process-panel/process-panel-root.tsx | 4 +-
src/views/process-panel/process-panel.tsx | 8 ++
10 files changed, 124 insertions(+), 54 deletions(-)
via 29df452fb7b578582f82f613205942422043801f (commit)
via db060133f80efd397803a845034f3c5f9856c4bd (commit)
via 164a919cf2709e151ab20d04a2ed849f2ec32a7e (commit)
via 056f527dda48c4919e616d0b5fc2f19e385447b1 (commit)
via d0820ce7e4ff1d89bce02919371a78268ce85cbf (commit)
via 8f71d20050b06b87181187dcbbfb46218e468239 (commit)
from 0b2a5b15b1a2159591d50a683864a76f6fc58a00 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 29df452fb7b578582f82f613205942422043801f
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Mar 22 11:27:35 2022 -0300
16672: Avoids log panel "blinking" when changing process view.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/src/store/process-panel/process-panel-actions.ts b/src/store/process-panel/process-panel-actions.ts
index d2921d73..962f5dfc 100644
--- a/src/store/process-panel/process-panel-actions.ts
+++ b/src/store/process-panel/process-panel-actions.ts
@@ -13,7 +13,7 @@ import { snackbarActions } from 'store/snackbar/snackbar-actions';
import { SnackbarKind } from '../snackbar/snackbar-actions';
import { showWorkflowDetails } from 'store/workflow-panel/workflow-panel-actions';
import { loadSubprocessPanel } from "../subprocess-panel/subprocess-panel-actions";
-import { initProcessLogsPanel } from "store/process-logs-panel/process-logs-panel-actions";
+import { initProcessLogsPanel, processLogsPanelActions } from "store/process-logs-panel/process-logs-panel-actions";
export const processPanelActions = unionize({
SET_PROCESS_PANEL_CONTAINER_REQUEST_UUID: ofType<string>(),
@@ -27,6 +27,7 @@ export const toggleProcessPanelFilter = processPanelActions.TOGGLE_PROCESS_PANEL
export const loadProcessPanel = (uuid: string) =>
async (dispatch: Dispatch) => {
+ dispatch(processLogsPanelActions.RESET_PROCESS_LOGS_PANEL());
dispatch<ProcessPanelAction>(processPanelActions.SET_PROCESS_PANEL_CONTAINER_REQUEST_UUID(uuid));
await dispatch<any>(loadProcess(uuid));
dispatch(initProcessPanelFilters);
commit db060133f80efd397803a845034f3c5f9856c4bd
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Mar 22 11:19:26 2022 -0300
16672: Adds 'copy to clipboard' feature.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/src/views/process-panel/process-log-card.tsx b/src/views/process-panel/process-log-card.tsx
index 56ac4d92..ac409ec1 100644
--- a/src/views/process-panel/process-log-card.tsx
+++ b/src/views/process-panel/process-log-card.tsx
@@ -19,6 +19,7 @@ import { ArvadosTheme } from 'common/custom-theme';
import {
CloseIcon,
CollectionIcon,
+ CopyIcon,
LogIcon,
MaximizeIcon,
TextDecreaseIcon,
@@ -34,6 +35,7 @@ import {
import { ProcessLogCodeSnippet } from 'views/process-panel/process-log-code-snippet';
import { DefaultView } from 'components/default-view/default-view';
import { CodeSnippetDataProps } from 'components/code-snippet/code-snippet';
+import CopyToClipboard from 'react-copy-to-clipboard';
type CssRules = 'card' | 'content' | 'title' | 'iconHeader' | 'header' | 'root' | 'logViewer' | 'logViewerContainer';
@@ -77,6 +79,7 @@ export interface ProcessLogsCardDataProps {
export interface ProcessLogsCardActionProps {
onLogFilterChange: (filter: FilterOption) => void;
navigateToLog: (uuid: string) => void;
+ onCopy: (text: string) => void;
}
type ProcessLogsCardProps = ProcessLogsCardDataProps
@@ -86,7 +89,8 @@ type ProcessLogsCardProps = ProcessLogsCardDataProps
& MPVPanelProps;
export const ProcessLogsCard = withStyles(styles)(
- ({ classes, process, filters, selectedFilter, lines, onLogFilterChange, navigateToLog,
+ ({ classes, process, filters, selectedFilter, lines,
+ onLogFilterChange, navigateToLog, onCopy,
doHidePanel, doMaximizePanel, panelMaximized, panelName }: ProcessLogsCardProps) => {
const [wordWrapToggle, setWordWrapToggle] = useState<boolean>(true);
const [fontSize, setFontSize] = useState<number>(3);
@@ -116,6 +120,15 @@ export const ProcessLogsCard = withStyles(styles)(
</IconButton>
</Tooltip>
</Grid>
+ <Grid item>
+ <Tooltip title="Copy to clipboard" disableFocusListener>
+ <IconButton>
+ <CopyToClipboard text={lines.join()} onCopy={() => onCopy("Log copied to clipboard")}>
+ <CopyIcon />
+ </CopyToClipboard>
+ </IconButton>
+ </Tooltip>
+ </Grid>
<Grid item>
<Tooltip title="Toggle word wrapping" disableFocusListener>
<IconButton onClick={() => setWordWrapToggle(!wordWrapToggle)}>
diff --git a/src/views/process-panel/process-panel-root.tsx b/src/views/process-panel/process-panel-root.tsx
index 862dbd68..3e695a2f 100644
--- a/src/views/process-panel/process-panel-root.tsx
+++ b/src/views/process-panel/process-panel-root.tsx
@@ -42,6 +42,7 @@ export interface ProcessPanelRootActionProps {
cancelProcess: (uuid: string) => void;
onLogFilterChange: (filter: FilterOption) => void;
navigateToLog: (uuid: string) => void;
+ onLogCopyToClipboard: (uuid: string) => void;
}
export type ProcessPanelRootProps = ProcessPanelRootDataProps & ProcessPanelRootActionProps & WithStyles<CssRules>;
@@ -72,6 +73,7 @@ export const ProcessPanelRoot = withStyles(styles)(
</MPVPanelContent>
<MPVPanelContent forwardProps xs maxHeight='50%'>
<ProcessLogsCard
+ onCopy={props.onLogCopyToClipboard}
process={process}
lines={getProcessPanelLogs(processLogsPanel)}
selectedFilter={{
diff --git a/src/views/process-panel/process-panel.tsx b/src/views/process-panel/process-panel.tsx
index 6dd02c9b..e0460292 100644
--- a/src/views/process-panel/process-panel.tsx
+++ b/src/views/process-panel/process-panel.tsx
@@ -25,6 +25,7 @@ import {
import { openProcessInputDialog } from 'store/processes/process-input-actions';
import { cancelRunningWorkflow } from 'store/processes/processes-actions';
import { navigateToLogCollection, setProcessLogsPanelFilter } from 'store/process-logs-panel/process-logs-panel-actions';
+import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
const mapStateToProps = ({ router, resources, processPanel, processLogsPanel }: RootState): ProcessPanelRootDataProps => {
const uuid = getProcessPanelCurrentUuid(router) || '';
@@ -38,6 +39,13 @@ const mapStateToProps = ({ router, resources, processPanel, processLogsPanel }:
};
const mapDispatchToProps = (dispatch: Dispatch): ProcessPanelRootActionProps => ({
+ onLogCopyToClipboard: (message: string) => {
+ dispatch<any>(snackbarActions.OPEN_SNACKBAR({
+ message,
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS,
+ }));
+ },
onContextMenu: (event, process) => {
dispatch<any>(openProcessContextMenu(event, process));
},
commit 164a919cf2709e151ab20d04a2ed849f2ec32a7e
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Mar 22 10:59:27 2022 -0300
16672: Implements 'auto-follow' mode when log view is scrolled all the way down
Restored the CodeSnippet component as it was needing too much customization
for the log viewer use case.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/src/components/code-snippet/code-snippet.tsx b/src/components/code-snippet/code-snippet.tsx
index fd44b5fc..f0a2b213 100644
--- a/src/components/code-snippet/code-snippet.tsx
+++ b/src/components/code-snippet/code-snippet.tsx
@@ -24,24 +24,19 @@ export interface CodeSnippetDataProps {
lines: string[];
className?: string;
apiResponse?: boolean;
- containerClassName?: string;
- fontSize?: number;
- customRenderer?: (line: string) => React.ReactNode;
}
type CodeSnippetProps = CodeSnippetDataProps & WithStyles<CssRules>;
export const CodeSnippet = withStyles(styles)(
- ({ classes, lines, className, containerClassName,
- apiResponse, fontSize, customRenderer }: CodeSnippetProps) =>
- <Typography component="div"
- className={classNames(classes.root, containerClassName, className)}>
- { lines.map((line: string, index: number) => {
- return <Typography key={index} style={{ fontSize: fontSize }}
- className={apiResponse ? classes.space : className}
- component="pre">
- {customRenderer ? customRenderer(line) : line}
- </Typography>;
- }) }
+ ({ classes, lines, className, apiResponse }: CodeSnippetProps) =>
+ <Typography
+ component="div"
+ className={classNames(classes.root, className)}>
+ {
+ lines.map((line: string, index: number) => {
+ return <Typography key={index} className={apiResponse ? classes.space : className} component="pre">{line}</Typography>;
+ })
+ }
</Typography>
);
\ No newline at end of file
diff --git a/src/views/process-panel/process-log-code-snippet.tsx b/src/views/process-panel/process-log-code-snippet.tsx
index 4f19f917..6ea628e6 100644
--- a/src/views/process-panel/process-log-code-snippet.tsx
+++ b/src/views/process-panel/process-log-code-snippet.tsx
@@ -2,25 +2,37 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import React from 'react';
-import { MuiThemeProvider, createMuiTheme, StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core/styles';
-import { CodeSnippet } from 'components/code-snippet/code-snippet';
+import React, { useEffect, useRef, useState } from 'react';
+import {
+ MuiThemeProvider,
+ createMuiTheme,
+ StyleRulesCallback,
+ withStyles,
+ WithStyles
+} from '@material-ui/core/styles';
import grey from '@material-ui/core/colors/grey';
import { ArvadosTheme } from 'common/custom-theme';
import { Link, Typography } from '@material-ui/core';
import { navigateTo } from 'store/navigation/navigation-action';
import { Dispatch } from 'redux';
import { connect, DispatchProp } from 'react-redux';
+import classNames from 'classnames';
-type CssRules = 'wordWrap' | 'codeSnippetContainer';
+type CssRules = 'root' | 'wordWrap' | 'logText';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+ root: {
+ boxSizing: 'border-box',
+ overflow: 'auto',
+ backgroundColor: '#000',
+ height: `calc(100% - ${theme.spacing.unit * 4}px)`, // so that horizontal scollbar is visible
+ },
+ logText: {
+ padding: theme.spacing.unit * 0.5,
+ },
wordWrap: {
whiteSpace: 'pre-wrap',
},
- codeSnippetContainer: {
- height: `calc(100% - ${theme.spacing.unit * 4}px)`, // so that horizontal scollbar is visible
- },
});
const theme = createMuiTheme({
@@ -28,9 +40,6 @@ const theme = createMuiTheme({
MuiTypography: {
body2: {
color: grey["200"]
- },
- root: {
- backgroundColor: '#000'
}
}
},
@@ -68,10 +77,33 @@ const renderLinks = (fontSize: number, dispatch: Dispatch) => (text: string) =>
};
export const ProcessLogCodeSnippet = withStyles(styles)(connect()(
- (props: ProcessLogCodeSnippetProps & WithStyles<CssRules> & DispatchProp) =>
- <MuiThemeProvider theme={theme}>
- <CodeSnippet lines={props.lines} fontSize={props.fontSize}
- customRenderer={renderLinks(props.fontSize, props.dispatch)}
- className={props.wordWrap ? props.classes.wordWrap : undefined}
- containerClassName={props.classes.codeSnippetContainer} />
- </MuiThemeProvider>));
\ No newline at end of file
+ ({classes, lines, fontSize, dispatch, wordWrap}: ProcessLogCodeSnippetProps & WithStyles<CssRules> & DispatchProp) => {
+ const [followMode, setFollowMode] = useState<boolean>(false);
+ const scrollRef = useRef<HTMLDivElement>(null);
+
+ useEffect(() => {
+ if (followMode && scrollRef.current && lines.length > 0) {
+ // Scroll to bottom
+ scrollRef.current.scrollTop = scrollRef.current.scrollHeight;
+ }
+ }, [followMode, lines, scrollRef]);
+
+ return <MuiThemeProvider theme={theme}>
+ <div ref={scrollRef} className={classes.root}
+ onScroll={(e) => {
+ const elem = e.target as HTMLDivElement;
+ if (elem.scrollTop + elem.clientHeight >= elem.scrollHeight) {
+ setFollowMode(true);
+ } else {
+ setFollowMode(false);
+ }
+ }}>
+ { lines.map((line: string, index: number) =>
+ <Typography key={index} component="pre"
+ className={classNames(classes.logText, wordWrap ? classes.wordWrap : undefined)}>
+ {renderLinks(fontSize, dispatch)(line)}
+ </Typography>
+ ) }
+ </div>
+ </MuiThemeProvider>
+ }));
\ No newline at end of file
commit 056f527dda48c4919e616d0b5fc2f19e385447b1
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Mon Mar 21 16:37:33 2022 -0300
16672: Adds renderer for UUID & PDH links on the log viewer.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/src/components/code-snippet/code-snippet.tsx b/src/components/code-snippet/code-snippet.tsx
index 6dc12401..fd44b5fc 100644
--- a/src/components/code-snippet/code-snippet.tsx
+++ b/src/components/code-snippet/code-snippet.tsx
@@ -26,17 +26,22 @@ export interface CodeSnippetDataProps {
apiResponse?: boolean;
containerClassName?: string;
fontSize?: number;
+ customRenderer?: (line: string) => React.ReactNode;
}
type CodeSnippetProps = CodeSnippetDataProps & WithStyles<CssRules>;
export const CodeSnippet = withStyles(styles)(
- ({ classes, lines, className, containerClassName, apiResponse, fontSize }: CodeSnippetProps) =>
- <Typography
- component="div"
+ ({ classes, lines, className, containerClassName,
+ apiResponse, fontSize, customRenderer }: CodeSnippetProps) =>
+ <Typography component="div"
className={classNames(classes.root, containerClassName, className)}>
- { lines.map((line: string, index: number) => {
- return <Typography key={index} style={{ fontSize: fontSize }} className={apiResponse ? classes.space : className} component="pre">{line}</Typography>;
- }) }
+ { lines.map((line: string, index: number) => {
+ return <Typography key={index} style={{ fontSize: fontSize }}
+ className={apiResponse ? classes.space : className}
+ component="pre">
+ {customRenderer ? customRenderer(line) : line}
+ </Typography>;
+ }) }
</Typography>
);
\ No newline at end of file
diff --git a/src/components/multi-panel-view/multi-panel-view.tsx b/src/components/multi-panel-view/multi-panel-view.tsx
index 48241c0b..de824990 100644
--- a/src/components/multi-panel-view/multi-panel-view.tsx
+++ b/src/components/multi-panel-view/multi-panel-view.tsx
@@ -88,12 +88,9 @@ export const MPVPanelContent = ({doHidePanel, doMaximizePanel, panelName,
}
}, [panelRef]);
- // If maxHeight is set, only apply it when not maximized
- const mh = maxHeight
- ? panelMaximized
- ? '100%'
- : maxHeight
- : undefined;
+ const mh = panelMaximized
+ ? '100%'
+ : maxHeight;
return <Grid item style={{maxHeight: mh}} {...props}>
<span ref={panelRef} /> {/* Element to scroll to when the panel is selected */}
diff --git a/src/views/process-panel/process-log-code-snippet.tsx b/src/views/process-panel/process-log-code-snippet.tsx
index 1ea83912..4f19f917 100644
--- a/src/views/process-panel/process-log-code-snippet.tsx
+++ b/src/views/process-panel/process-log-code-snippet.tsx
@@ -7,6 +7,10 @@ import { MuiThemeProvider, createMuiTheme, StyleRulesCallback, withStyles, WithS
import { CodeSnippet } from 'components/code-snippet/code-snippet';
import grey from '@material-ui/core/colors/grey';
import { ArvadosTheme } from 'common/custom-theme';
+import { Link, Typography } from '@material-ui/core';
+import { navigateTo } from 'store/navigation/navigation-action';
+import { Dispatch } from 'redux';
+import { connect, DispatchProp } from 'react-redux';
type CssRules = 'wordWrap' | 'codeSnippetContainer';
@@ -42,10 +46,32 @@ interface ProcessLogCodeSnippetProps {
wordWrap?: boolean;
}
-export const ProcessLogCodeSnippet = withStyles(styles)(
- (props: ProcessLogCodeSnippetProps & WithStyles<CssRules>) =>
+const renderLinks = (fontSize: number, dispatch: Dispatch) => (text: string) => {
+ // Matches UUIDs & PDHs
+ const REGEX = /[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}|[0-9a-f]{32}\+\d+/g;
+ const links = text.match(REGEX);
+ if (!links) {
+ return <Typography style={{ fontSize: fontSize }}>{text}</Typography>;
+ }
+ return <Typography style={{ fontSize: fontSize }}>
+ {text.split(REGEX).map((part, index) =>
+ <React.Fragment key={index}>
+ {part}
+ {links[index] &&
+ <Link onClick={() => dispatch<any>(navigateTo(links[index]))}
+ style={ {cursor: 'pointer'} }>
+ {links[index]}
+ </Link>}
+ </React.Fragment>
+ )}
+ </Typography>;
+};
+
+export const ProcessLogCodeSnippet = withStyles(styles)(connect()(
+ (props: ProcessLogCodeSnippetProps & WithStyles<CssRules> & DispatchProp) =>
<MuiThemeProvider theme={theme}>
<CodeSnippet lines={props.lines} fontSize={props.fontSize}
+ customRenderer={renderLinks(props.fontSize, props.dispatch)}
className={props.wordWrap ? props.classes.wordWrap : undefined}
containerClassName={props.classes.codeSnippetContainer} />
- </MuiThemeProvider>);
\ No newline at end of file
+ </MuiThemeProvider>));
\ No newline at end of file
diff --git a/src/views/process-panel/process-panel-root.tsx b/src/views/process-panel/process-panel-root.tsx
index 78c79f8f..862dbd68 100644
--- a/src/views/process-panel/process-panel-root.tsx
+++ b/src/views/process-panel/process-panel-root.tsx
@@ -85,7 +85,7 @@ export const ProcessPanelRoot = withStyles(styles)(
navigateToLog={props.navigateToLog}
/>
</MPVPanelContent>
- <MPVPanelContent forwardProps xs>
+ <MPVPanelContent forwardProps xs maxHeight='50%'>
<SubprocessPanel />
</MPVPanelContent>
</MPVContainer>
commit d0820ce7e4ff1d89bce02919371a78268ce85cbf
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Mon Mar 21 11:11:56 2022 -0300
16672: Adds 'container' type event to the logs viewer.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/src/models/log.ts b/src/models/log.ts
index 3397993b..20060f88 100644
--- a/src/models/log.ts
+++ b/src/models/log.ts
@@ -16,6 +16,7 @@ export enum LogEventType {
ARV_MOUNT = 'arv-mount',
STDOUT = 'stdout',
STDERR = 'stderr',
+ CONTAINER = 'container',
}
export interface LogResource extends Resource, ResourceWithProperties {
diff --git a/src/store/process-logs-panel/process-logs-panel-actions.ts b/src/store/process-logs-panel/process-logs-panel-actions.ts
index a14437aa..b0ddd7ee 100644
--- a/src/store/process-logs-panel/process-logs-panel-actions.ts
+++ b/src/store/process-logs-panel/process-logs-panel-actions.ts
@@ -122,4 +122,5 @@ const PROCESS_PANEL_LOG_EVENT_TYPES = [
LogEventType.NODE_INFO,
LogEventType.STDERR,
LogEventType.STDOUT,
+ LogEventType.CONTAINER,
];
commit 8f71d20050b06b87181187dcbbfb46218e468239
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Mon Mar 21 10:46:06 2022 -0300
16672: Removes unused code, avoids requesting the CR twice.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/src/store/process-logs-panel/process-logs-panel-actions.ts b/src/store/process-logs-panel/process-logs-panel-actions.ts
index f0caf052..a14437aa 100644
--- a/src/store/process-logs-panel/process-logs-panel-actions.ts
+++ b/src/store/process-logs-panel/process-logs-panel-actions.ts
@@ -9,7 +9,6 @@ import { RootState } from 'store/store';
import { ServiceRepository } from 'services/services';
import { Dispatch } from 'redux';
import { groupBy } from 'lodash';
-import { loadProcess } from 'store/processes/processes-actions';
import { LogResource } from 'models/log';
import { LogService } from 'services/log-service/log-service';
import { ResourceEventMessage } from 'websocket/resource-event-message';
@@ -34,8 +33,8 @@ export const setProcessLogsPanelFilter = (filter: string) =>
export const initProcessLogsPanel = (processUuid: string) =>
async (dispatch: Dispatch, getState: () => RootState, { logService }: ServiceRepository) => {
dispatch(processLogsPanelActions.RESET_PROCESS_LOGS_PANEL());
- const process = await dispatch<any>(loadProcess(processUuid));
- if (process.container) {
+ const process = getProcess(processUuid)(getState().resources);
+ if (process && process.container) {
const logResources = await loadContainerLogs(process.container.uuid, logService);
const initialState = createInitialLogPanelState(logResources);
dispatch(processLogsPanelActions.INIT_PROCESS_LOGS_PANEL(initialState));
@@ -53,7 +52,7 @@ export const addProcessLogsPanelItem = (message: ResourceEventMessage<{ text: st
if (message.objectUuid === containerRequest.uuid
|| (container && message.objectUuid === container.uuid)) {
dispatch(processLogsPanelActions.ADD_PROCESS_LOGS_PANEL_ITEM({
- logType: SUMMARIZED_FILTER_TYPE,
+ logType: COMBINED_FILTER_TYPE,
log: message.properties.text
}));
dispatch(processLogsPanelActions.ADD_PROCESS_LOGS_PANEL_ITEM({
@@ -92,8 +91,8 @@ const createInitialLogPanelState = (logResources: LogResource[]) => {
...grouped,
[key]: logsToLines(groupedLogResources[key])
}), {});
- const filters = [SUMMARIZED_FILTER_TYPE, ...Object.keys(groupedLogs)];
- const logs = { [SUMMARIZED_FILTER_TYPE]: allLogs, ...groupedLogs };
+ const filters = [COMBINED_FILTER_TYPE, ...Object.keys(groupedLogs)];
+ const logs = { [COMBINED_FILTER_TYPE]: allLogs, ...groupedLogs };
return { filters, logs };
};
@@ -106,13 +105,13 @@ export const navigateToLogCollection = (uuid: string) =>
await services.collectionService.get(uuid);
dispatch<any>(navigateTo(uuid));
} catch {
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'This collection does not exists!', hideDuration: 2000, kind: SnackbarKind.ERROR }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Could not request collection', hideDuration: 2000, kind: SnackbarKind.ERROR }));
}
};
const MAX_AMOUNT_OF_LOGS = 10000;
-const SUMMARIZED_FILTER_TYPE = 'Summarized';
+const COMBINED_FILTER_TYPE = 'All logs';
const PROCESS_PANEL_LOG_EVENT_TYPES = [
LogEventType.ARV_MOUNT,
diff --git a/src/store/process-panel/process-panel-actions.ts b/src/store/process-panel/process-panel-actions.ts
index 2e5fb6b9..d2921d73 100644
--- a/src/store/process-panel/process-panel-actions.ts
+++ b/src/store/process-panel/process-panel-actions.ts
@@ -26,9 +26,9 @@ export type ProcessPanelAction = UnionOf<typeof processPanelActions>;
export const toggleProcessPanelFilter = processPanelActions.TOGGLE_PROCESS_PANEL_FILTER;
export const loadProcessPanel = (uuid: string) =>
- (dispatch: Dispatch) => {
+ async (dispatch: Dispatch) => {
dispatch<ProcessPanelAction>(processPanelActions.SET_PROCESS_PANEL_CONTAINER_REQUEST_UUID(uuid));
- dispatch<any>(loadProcess(uuid));
+ await dispatch<any>(loadProcess(uuid));
dispatch(initProcessPanelFilters);
dispatch<any>(initProcessLogsPanel(uuid));
dispatch<any>(loadSubprocessPanel());
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index 98508f75..7958463a 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -49,7 +49,6 @@ import * as processUpdateActions from 'store/processes/process-update-actions';
import * as processCopyActions from 'store/processes/process-copy-actions';
import { trashPanelColumns } from "views/trash-panel/trash-panel";
import { loadTrashPanel, trashPanelActions } from "store/trash-panel/trash-panel-action";
-import { initProcessLogsPanel } from 'store/process-logs-panel/process-logs-panel-actions';
import { loadProcessPanel } from 'store/process-panel/process-panel-actions';
import {
loadSharedWithMePanel,
@@ -417,15 +416,6 @@ export const copyProcess = (data: CopyFormDialogData) =>
}
};
-export const loadProcessLog = (uuid: string) =>
- handleFirstTimeLoad(
- async (dispatch: Dispatch) => {
- const process = await dispatch<any>(processesActions.loadProcess(uuid));
- dispatch<any>(setProcessBreadcrumbs(uuid));
- dispatch<any>(initProcessLogsPanel(uuid));
- await dispatch<any>(activateSidePanelTreeItem(process.containerRequest.ownerUuid));
- });
-
export const resourceIsNotLoaded = (uuid: string) =>
snackbarActions.OPEN_SNACKBAR({
message: `Resource identified by ${uuid} is not loaded.`,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list