[ARVADOS-WORKBENCH2] updated: 1.2.0-227-g08968ef
Git user
git at public.curoverse.com
Mon Sep 3 02:19:01 EDT 2018
Summary of changes:
src/common/api/common-resource-service.ts | 2 +-
src/components/code-snippet/code-snippet.tsx | 37 +++++++++++++++++
.../default-code-snippet/default-code-snippet.tsx | 31 ++++++++++++++
src/index.tsx | 9 +++--
src/store/processes/process.ts | 22 +++++-----
src/store/processes/processes-actions.ts | 9 +++--
.../process-log-panel/process-log-code-snippet.tsx | 31 ++++++++++++++
.../process-log-panel/process-log-main-card.tsx | 23 ++++++-----
.../process-log-panel/process-log-panel-root.tsx | 3 +-
src/views/process-log-panel/process-log-panel.tsx | 6 ++-
src/websocket/resource-event-message.ts | 23 +++++++++++
src/websocket/websocket-service.ts | 47 ++++++++++++++++++++++
src/websocket/websocket.ts | 35 ++++++++++++++++
13 files changed, 249 insertions(+), 29 deletions(-)
create mode 100644 src/components/code-snippet/code-snippet.tsx
create mode 100644 src/components/default-code-snippet/default-code-snippet.tsx
create mode 100644 src/views/process-log-panel/process-log-code-snippet.tsx
create mode 100644 src/websocket/resource-event-message.ts
create mode 100644 src/websocket/websocket-service.ts
create mode 100644 src/websocket/websocket.ts
via 08968efce07d609c16dd8a086bfd0a4d69ad6f3d (commit)
via f190422ae9778231d2a96649f0edb2ff4739b86a (commit)
via 1eb14d76b64f0dda0df6c2d7ca3092b102a5ffc6 (commit)
via 7ea39b36221b18b0243f10901c43e5fc8d41d88f (commit)
via c7f6c72066b4f334e43a2bd1c9a9dcf0e703d1f4 (commit)
via e602a1284fb49aa9f7e727e828e48638a657cebb (commit)
via 18e651dbee6e598bd79576b178fb4d755cd7a424 (commit)
via de93a71c82562f2fdedfd485c5d0164651300140 (commit)
from 8dc7e5fc6f2d2a7ce853f935a0a84dacb8c0585f (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 08968efce07d609c16dd8a086bfd0a4d69ad6f3d
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Mon Sep 3 08:18:48 2018 +0200
add process log code snippet, change default snippet,
Feature #14098
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
diff --git a/src/components/code-snippet/code-snippet.tsx b/src/components/code-snippet/code-snippet.tsx
index bf9b612..dda607c 100644
--- a/src/components/code-snippet/code-snippet.tsx
+++ b/src/components/code-snippet/code-snippet.tsx
@@ -12,7 +12,8 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
root: {
boxSizing: 'border-box',
width: '100%',
- height: '550px',
+ height: 'auto',
+ maxHeight: '550px',
overflow: 'scroll',
padding: theme.spacing.unit
}
diff --git a/src/components/default-code-snippet/default-code-snippet.tsx b/src/components/default-code-snippet/default-code-snippet.tsx
index 474c38a..541f390 100644
--- a/src/components/default-code-snippet/default-code-snippet.tsx
+++ b/src/components/default-code-snippet/default-code-snippet.tsx
@@ -11,10 +11,10 @@ const theme = createMuiTheme({
overrides: {
MuiTypography: {
body1: {
- color: grey["200"]
+ color: grey["900"]
},
root: {
- backgroundColor: '#000'
+ backgroundColor: grey["200"]
}
}
},
diff --git a/src/components/default-code-snippet/default-code-snippet.tsx b/src/views/process-log-panel/process-log-code-snippet.tsx
similarity index 83%
copy from src/components/default-code-snippet/default-code-snippet.tsx
copy to src/views/process-log-panel/process-log-code-snippet.tsx
index 474c38a..99388d6 100644
--- a/src/components/default-code-snippet/default-code-snippet.tsx
+++ b/src/views/process-log-panel/process-log-code-snippet.tsx
@@ -23,9 +23,9 @@ const theme = createMuiTheme({
}
});
-type DefaultCodeSnippet = CodeSnippetDataProps;
+type ProcessLogCodeSnippet = CodeSnippetDataProps;
-export const DefaultCodeSnippet = (props: DefaultCodeSnippet) =>
+export const ProcessLogCodeSnippet = (props: ProcessLogCodeSnippet) =>
<MuiThemeProvider theme={theme}>
<CodeSnippet lines={props.lines} />
</MuiThemeProvider>;
\ No newline at end of file
diff --git a/src/views/process-log-panel/process-log-main-card.tsx b/src/views/process-log-panel/process-log-main-card.tsx
index db451ab..effdd7a 100644
--- a/src/views/process-log-panel/process-log-main-card.tsx
+++ b/src/views/process-log-panel/process-log-main-card.tsx
@@ -8,22 +8,25 @@ import {
CardHeader, IconButton, CardContent, Grid, Typography, Tooltip
} from '@material-ui/core';
import { Process } from '~/store/processes/process';
+import { ProcessLogCodeSnippet } from '~/views/process-log-panel/process-log-code-snippet';
import { ProcessLogForm, ProcessLogFormDataProps, ProcessLogFormActionProps } from '~/views/process-log-panel/process-log-form';
import { MoreOptionsIcon, ProcessIcon } from '~/components/icon/icon';
import { ArvadosTheme } from '~/common/custom-theme';
+import { CodeSnippetDataProps } from '~/components/code-snippet/code-snippet';
-type CssRules = 'root' | 'card' | 'iconHeader';
+type CssRules = 'card' | 'iconHeader' | 'link';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
- root: {
-
- },
card: {
width: '100%'
},
iconHeader: {
fontSize: '1.875rem',
color: theme.customs.colors.green700
+ },
+ link: {
+ alignSelf: 'flex-end',
+ textAlign: 'right'
}
});
@@ -32,10 +35,10 @@ interface ProcessLogMainCardDataProps {
process: Process;
}
-export type ProcessLogMainCardProps = ProcessLogMainCardDataProps & ProcessLogFormDataProps & ProcessLogFormActionProps;
+export type ProcessLogMainCardProps = ProcessLogMainCardDataProps & CodeSnippetDataProps & ProcessLogFormDataProps & ProcessLogFormActionProps;
export const ProcessLogMainCard = withStyles(styles)(
- ({ classes, process, selectedFilter, filters, onChange }: ProcessLogMainCardProps & WithStyles<CssRules>) =>
+ ({ classes, process, selectedFilter, filters, onChange, lines }: ProcessLogMainCardProps & WithStyles<CssRules>) =>
<Card className={classes.card}>
<CardHeader
avatar={<ProcessIcon className={classes.iconHeader} />}
@@ -59,11 +62,13 @@ export const ProcessLogMainCard = withStyles(styles)(
<Grid item xs={6}>
<ProcessLogForm selectedFilter={selectedFilter} filters={filters} onChange={onChange} />
</Grid>
- <Grid item xs={6}>
- Container log for request ardev-xvhdp-q3uqbfxeb6w64pm
+ <Grid item xs={6} className={classes.link}>
+ <Typography component='div'>
+ Container log for request ardev-xvhdp-q3uqbfxeb6w64pm
+ </Typography>
</Grid>
<Grid item xs={12}>
- {/* add snippet */}
+ <ProcessLogCodeSnippet lines={lines}/>
</Grid>
</Grid>
</CardContent>
diff --git a/src/views/process-log-panel/process-log-panel-root.tsx b/src/views/process-log-panel/process-log-panel-root.tsx
index fe8a5b1..0845a41 100644
--- a/src/views/process-log-panel/process-log-panel-root.tsx
+++ b/src/views/process-log-panel/process-log-panel-root.tsx
@@ -9,10 +9,11 @@ import { ProcessLogMainCard } from '~/views/process-log-panel/process-log-main-c
import { ProcessLogFormDataProps, ProcessLogFormActionProps } from '~/views/process-log-panel/process-log-form';
import { DefaultView } from '~/components/default-view/default-view';
import { ProcessIcon } from '~/components/icon/icon';
+import { CodeSnippetDataProps } from '~/components/code-snippet/code-snippet';
export type ProcessLogPanelRootDataProps = {
process?: Process;
-} & ProcessLogFormDataProps;
+} & ProcessLogFormDataProps & CodeSnippetDataProps;
export type ProcessLogPanelRootActionProps = {
onContextMenu: (event: React.MouseEvent<HTMLElement>) => void;
diff --git a/src/views/process-log-panel/process-log-panel.tsx b/src/views/process-log-panel/process-log-panel.tsx
index 1ce06af..0936d3b 100644
--- a/src/views/process-log-panel/process-log-panel.tsx
+++ b/src/views/process-log-panel/process-log-panel.tsx
@@ -22,6 +22,8 @@ const SELECT_OPTIONS = [
{ label: 'Stderr', value: 'stderr' }
];
+const lines = ['Lorem Ipsum', 'Lorem Ipsum', 'Lorem Ipsum', 'Lorem Ipsum', 'Lorem Ipsum', 'Lorem Ipsum', 'Lorem Ipsum', 'Lorem Ipsum'];
+
export interface Log {
object_uuid: string;
event_at: string;
@@ -42,8 +44,8 @@ const mapStateToProps = ({ router, resources }: RootState): ProcessLogPanelRootD
return {
process: getProcess(uuid)(resources),
selectedFilter: SELECT_OPTIONS[0],
- filters: SELECT_OPTIONS
- // lines: string[]
+ filters: SELECT_OPTIONS,
+ lines
};
};
commit f190422ae9778231d2a96649f0edb2ff4739b86a
Merge: 8dc7e5f 1eb14d7
Author: Janicki Artur <artur.janicki at contractors.roche.com>
Date: Fri Aug 31 15:52:56 2018 +0200
Merge branch 'master' into 14098-log-view
refs #14098
Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki at contractors.roche.com>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list