[ARVADOS-WORKBENCH2] updated: 1.2.0-275-g1703f15
Git user
git at public.curoverse.com
Tue Sep 4 08:16:56 EDT 2018
Summary of changes:
src/components/data-table/data-column.ts | 2 +-
.../subprocess-filter/subprocess-filter.tsx | 12 ++--
src/index.tsx | 2 +-
src/routes/route-change-handlers.ts | 37 +++++++++++
src/routes/routes.ts | 33 ----------
src/store/breadcrumbs/breadcrumbs-actions.ts | 9 +++
src/store/context-menu/context-menu-actions.ts | 12 ++--
.../favorite-panel-middleware-service.ts | 64 +++++++++---------
src/store/process-panel/process-panel-actions.ts | 11 ++--
src/store/processes/process.ts | 77 ++++++++++++++--------
.../project-panel-middleware-service.ts | 20 +++++-
src/store/workbench/workbench-actions.ts | 20 +++---
src/views-components/data-explorer/renderers.tsx | 31 +++++----
src/views/favorite-panel/favorite-panel.tsx | 22 +------
src/views/process-panel/process-panel-root.tsx | 2 +-
src/views/process-panel/subprocesses-card.tsx | 2 +-
src/views/project-panel/project-panel.tsx | 22 +------
17 files changed, 199 insertions(+), 179 deletions(-)
create mode 100644 src/routes/route-change-handlers.ts
via 1703f15adf9e3875ff0c78ce78117a87b70ca05c (commit)
via ab54fbc8f8934aab2b4a824bb2b71e354503c9ec (commit)
via 00bf04d74afad9970678b87c02942003e0712cd2 (commit)
via 5c6e7a1fcb3e951c09e4a794f92a80a35f4db2ee (commit)
from 013ec8ccb46d5438aca45dc5173f838ec863ca7b (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 1703f15adf9e3875ff0c78ce78117a87b70ca05c
Merge: 013ec8c ab54fbc
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Sep 4 14:16:44 2018 +0200
merge master
Feature #13860
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/components/subprocess-filter/subprocess-filter.tsx
index 23c1e65,58c33ee..36be50d
--- a/src/components/subprocess-filter/subprocess-filter.tsx
+++ b/src/components/subprocess-filter/subprocess-filter.tsx
@@@ -5,13 -5,13 +5,15 @@@
import * as React from 'react';
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
import { ArvadosTheme } from '~/common/custom-theme';
-import { Grid, Typography, Switch } from '@material-ui/core';
+import { Typography, Switch } from '@material-ui/core';
- type CssRules = 'container' | 'label' | 'value' | 'switch';
-type CssRules = 'grid' | 'label' | 'value' | 'switch';
++type CssRules = 'container' | 'label' | 'value';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
- grid: {
- display: 'flex'
+ container: {
+ display: 'flex',
++ alignItems: 'center',
++ height: '20px'
},
label: {
width: '86px',
@@@ -20,13 -20,12 +22,7 @@@
},
value: {
width: '24px',
- paddingLeft: theme.spacing.unit
- },
- switch: {
- '& span:first-child': {
- height: '18px'
- }
+ paddingLeft: theme.spacing.unit,
- },
- switch: {
- height: '20px',
- '& span:first-child': {
- height: '18px'
- }
}
});
@@@ -42,10 -41,10 +38,10 @@@ type SubprocessFilterProps = Subprocess
export const SubprocessFilter = withStyles(styles)(
({ classes, label, value, key, checked, onToggle }: SubprocessFilterProps) =>
- <Grid item className={classes.grid} md={12} lg={6} >
+ <div className={classes.container} >
<Typography component="span" className={classes.label}>{label}:</Typography>
<Typography component="span" className={classes.value}>{value}</Typography>
-- {onToggle && <Switch classes={{ root: classes.switch }}
++ {onToggle && <Switch
checked={checked}
onChange={onToggle}
value={key}
diff --cc src/store/process-panel/process-panel-actions.ts
index 902a5c9,0000000..85a7314
mode 100644,000000..100644
--- a/src/store/process-panel/process-panel-actions.ts
+++ b/src/store/process-panel/process-panel-actions.ts
@@@ -1,29 -1,0 +1,32 @@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import { unionize, ofType, UnionOf } from "~/common/unionize";
+import { loadProcess } from '~/store/processes/processes-actions';
+import { Dispatch } from 'redux';
++import { ProcessStatus } from '~/store/processes/process';
+
+export const procesPanelActions = unionize({
+ INIT_PROCESS_PANEL_FILTERS: ofType<string[]>(),
+ TOGGLE_PROCESS_PANEL_FILTER: ofType<string>(),
+});
+
+export type ProcessPanelAction = UnionOf<typeof procesPanelActions>;
+
+export const toggleProcessPanelFilter = procesPanelActions.TOGGLE_PROCESS_PANEL_FILTER;
+
+export const loadProcessPanel = (uuid: string) =>
+ (dispatch: Dispatch) => {
+ dispatch<any>(loadProcess(uuid));
+ dispatch(initProcessPanelFilters);
+ };
+
+export const initProcessPanelFilters = procesPanelActions.INIT_PROCESS_PANEL_FILTERS([
- 'Queued',
- 'Complete',
- 'Active',
- 'Failed'
++ ProcessStatus.QUEUED,
++ ProcessStatus.COMPLETED,
++ ProcessStatus.FAILED,
++ ProcessStatus.RUNNING,
++ ProcessStatus.LOCKED,
++ ProcessStatus.CANCELLED
+]);
diff --cc src/store/workbench/workbench-actions.ts
index 80f50fe,effac1d..7077f41
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@@ -32,7 -32,6 +32,7 @@@ import * as processesActions from '../p
import { trashPanelColumns } from "~/views/trash-panel/trash-panel";
import { loadTrashPanel, trashPanelActions } from "~/store/trash-panel/trash-panel-action";
import { initProcessLogsPanel } from '../process-logs-panel/process-logs-panel-actions';
++import { loadProcessPanel } from '~/store/process-panel/process-panel-actions';
export const loadWorkbench = () =>
@@@ -186,13 -185,10 +186,12 @@@ export const moveCollection = (data: Mo
export const loadProcess = (uuid: string) =>
async (dispatch: Dispatch, getState: () => RootState) => {
- await dispatch<any>(processesActions.loadProcess(uuid));
- const process = getProcess(uuid)(getState().resources);
- if (process) {
- await dispatch<any>(activateSidePanelTreeItem(process.containerRequest.ownerUuid));
- dispatch<any>(setCollectionBreadcrumbs(process.containerRequest.ownerUuid));
- dispatch(loadDetailsPanel(uuid));
- }
++ dispatch<any>(loadProcessPanel(uuid));
+ const process = await dispatch<any>(processesActions.loadProcess(uuid));
+ await dispatch<any>(activateSidePanelTreeItem(process.containerRequest.ownerUuid));
+ dispatch<any>(setProcessBreadcrumbs(uuid));
+ dispatch(loadDetailsPanel(uuid));
++
};
export const loadProcessLog = (uuid: string) =>
diff --cc src/views/process-panel/process-panel-root.tsx
index f76efe0,8e78f56..d12704b
--- a/src/views/process-panel/process-panel-root.tsx
+++ b/src/views/process-panel/process-panel-root.tsx
@@@ -28,8 -27,8 +28,8 @@@ export type ProcessPanelRootProps = Pro
export const ProcessPanelRoot = (props: ProcessPanelRootProps) =>
props.process
- ? <Grid container spacing={16}>
- <Grid item xs={7}>
+ ? <Grid container spacing={16} alignItems="stretch">
- <Grid item sm={12} md={7} alignItems="stretch">
++ <Grid item sm={12} md={7}>
<ProcessInformationCard
process={props.process}
onContextMenu={props.onContextMenu} />
diff --cc src/views/process-panel/subprocesses-card.tsx
index 6c5562d,ac60c9f..85de703
--- a/src/views/process-panel/subprocesses-card.tsx
+++ b/src/views/process-panel/subprocesses-card.tsx
@@@ -49,15 -31,12 +49,15 @@@ export const SubprocessesCard = withSty
<CardContent>
<Grid container direction="column" spacing={16}>
<Grid item xs={12} container spacing={16}>
- <SubprocessFilter label='Subprocesses' value={subprocesses} />
- </Grid>
- <Grid item xs={12} container spacing={16}>
+ <Grid item md={12} lg={6} className={classes.subtitle}>
+ <SubprocessFilter label='Subprocesses' value={subprocessesAmount} />
+ </Grid>
+ <Grid item md={12} lg={6}/>
{
- filters.map(filter =>
- <SubprocessFilter {...filter} key={filter.key} onToggle={() => onToggle(filter)} />
+ filters.map(filter =>
- <Grid item md={12} lg={6} key={filter.key} spacing={0} className={classes.gridFilter}>
++ <Grid item md={12} lg={6} key={filter.key} className={classes.gridFilter}>
+ <SubprocessFilter {...filter} onToggle={() => onToggle(filter.label)} />
+ </Grid>
)
}
</Grid>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list