[ARVADOS-WORKBENCH2] updated: 1.2.0-277-g26e9e3a
Git user
git at public.curoverse.com
Tue Sep 4 08:51:38 EDT 2018
Summary of changes:
src/common/formatters.ts | 2 +-
src/store/process-panel/process-panel-actions.ts | 4 ++--
src/store/process-panel/process-panel-reducer.ts | 2 +-
src/views/process-panel/process-information-card.tsx | 13 ++++++++-----
src/views/process-panel/subprocesses-card.tsx | 7 ++-----
5 files changed, 14 insertions(+), 14 deletions(-)
via 26e9e3a95aa7e99c9b15a0181e972f75781169b9 (commit)
from 7f2055dd51e545eb9f9998d001ec6badfa9f0bb7 (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 26e9e3a95aa7e99c9b15a0181e972f75781169b9
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Sep 4 14:51:25 2018 +0200
cr changes
Feature #13860
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/common/formatters.ts b/src/common/formatters.ts
index 737ca96..e209787 100644
--- a/src/common/formatters.ts
+++ b/src/common/formatters.ts
@@ -2,7 +2,7 @@
//
// SPDX-License-Identifier: AGPL-3.0
-export const formatDate = (isoDate?: string | null) => {
+export const formatDate = (isoDate?: string) => {
if (isoDate) {
const date = new Date(isoDate);
const text = date.toLocaleString();
diff --git a/src/store/process-panel/process-panel-actions.ts b/src/store/process-panel/process-panel-actions.ts
index 85a7314..832d4d5 100644
--- a/src/store/process-panel/process-panel-actions.ts
+++ b/src/store/process-panel/process-panel-actions.ts
@@ -8,7 +8,7 @@ import { Dispatch } from 'redux';
import { ProcessStatus } from '~/store/processes/process';
export const procesPanelActions = unionize({
- INIT_PROCESS_PANEL_FILTERS: ofType<string[]>(),
+ SET_PROCESS_PANEL_FILTERS: ofType<string[]>(),
TOGGLE_PROCESS_PANEL_FILTER: ofType<string>(),
});
@@ -22,7 +22,7 @@ export const loadProcessPanel = (uuid: string) =>
dispatch(initProcessPanelFilters);
};
-export const initProcessPanelFilters = procesPanelActions.INIT_PROCESS_PANEL_FILTERS([
+export const initProcessPanelFilters = procesPanelActions.SET_PROCESS_PANEL_FILTERS([
ProcessStatus.QUEUED,
ProcessStatus.COMPLETED,
ProcessStatus.FAILED,
diff --git a/src/store/process-panel/process-panel-reducer.ts b/src/store/process-panel/process-panel-reducer.ts
index 487b092..3e31f56 100644
--- a/src/store/process-panel/process-panel-reducer.ts
+++ b/src/store/process-panel/process-panel-reducer.ts
@@ -11,7 +11,7 @@ const initialState: ProcessPanel = {
export const processPanelReducer = (state = initialState, action: ProcessPanelAction): ProcessPanel =>
procesPanelActions.match(action, {
- INIT_PROCESS_PANEL_FILTERS: statuses => {
+ SET_PROCESS_PANEL_FILTERS: statuses => {
const filters = statuses.reduce((filters, status) => ({ ...filters, [status]: true }), {});
return { filters };
},
diff --git a/src/views/process-panel/process-information-card.tsx b/src/views/process-panel/process-information-card.tsx
index 287b725..efabe22 100644
--- a/src/views/process-panel/process-information-card.tsx
+++ b/src/views/process-panel/process-information-card.tsx
@@ -101,18 +101,18 @@ export const ProcessInformationCard = withStyles(styles, { withTheme: true })(
</Tooltip>
}
subheader={
- <Tooltip title={process.containerRequest.description || '(no-description)'} placement="bottom-start">
+ <Tooltip title={getDescription(process)} placement="bottom-start">
<Typography noWrap variant="body2" color='inherit'>
- {process.containerRequest.description || '(no-description)'}
+ {getDescription(process)}
</Typography>
</Tooltip>} />
<CardContent className={classes.content}>
<Grid container>
<Grid item xs={6}>
<DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='From' value={process.container ? formatDate(process.container.startedAt) : 'N/A'} />
+ label='From' value={process.container ? formatDate(process.container.startedAt!) : 'N/A'} />
<DetailsAttribute classLabel={classes.label} classValue={classes.value}
- label='To' value={process.container ? formatDate(process.container.finishedAt) : 'N/A'} />
+ label='To' value={process.container ? formatDate(process.container.finishedAt!) : 'N/A'} />
<DetailsAttribute classLabel={classes.label} classValue={classes.link}
label='Workflow' value='???' />
</Grid>
@@ -123,4 +123,7 @@ export const ProcessInformationCard = withStyles(styles, { withTheme: true })(
</Grid>
</CardContent>
</Card>
-);
\ No newline at end of file
+);
+
+const getDescription = (process: Process) =>
+ process.containerRequest.description || '(no-description)';
diff --git a/src/views/process-panel/subprocesses-card.tsx b/src/views/process-panel/subprocesses-card.tsx
index 85de703..0607c47 100644
--- a/src/views/process-panel/subprocesses-card.tsx
+++ b/src/views/process-panel/subprocesses-card.tsx
@@ -8,16 +8,13 @@ import { StyleRulesCallback, withStyles, WithStyles, Card, CardHeader, CardConte
import { SubprocessFilter } from '~/components/subprocess-filter/subprocess-filter';
import { SubprocessFilterDataProps } from '~/components/subprocess-filter/subprocess-filter';
-type CssRules = 'root' | 'subtitle' | 'title' | 'gridFilter';
+type CssRules = 'root' | 'title' | 'gridFilter';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
root: {
fontSize: '0.875rem',
height: '100%'
},
- subtitle: {
- paddingBottom: '32px!important'
- },
title: {
color: theme.customs.colors.grey700
},
@@ -49,7 +46,7 @@ export const SubprocessesCard = withStyles(styles)(
<CardContent>
<Grid container direction="column" spacing={16}>
<Grid item xs={12} container spacing={16}>
- <Grid item md={12} lg={6} className={classes.subtitle}>
+ <Grid item md={12} lg={6}>
<SubprocessFilter label='Subprocesses' value={subprocessesAmount} />
</Grid>
<Grid item md={12} lg={6}/>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list