[ARVADOS-WORKBENCH2] updated: 1.2.0-497-g2fb4478
Git user
git at public.curoverse.com
Tue Oct 2 04:57:23 EDT 2018
Summary of changes:
src/store/collections/collection-move-actions.ts | 7 +-
.../run-process-panel/run-process-panel-actions.ts | 26 +-
.../run-process-panel/run-process-panel-reducer.ts | 9 +-
src/store/workbench/workbench-actions.ts | 5 +-
.../workflow-tree-picker/workflow-tree-picker.tsx | 8 +-
.../run-process-panel/run-process-first-step.tsx | 83 ++
.../run-process-panel/run-process-panel-root.tsx | 30 +-
src/views/run-process-panel/run-process-panel.tsx | 17 +-
.../run-process-panel/run-process-second-step.tsx | 62 +
src/views/workbench/workbench.tsx | 2 +-
.../workflow-panel/workflow-description-card.tsx | 25 +-
src/views/workflow-panel/workflow-panel-view.tsx | 6 +-
yarn.lock | 1352 +-------------------
13 files changed, 243 insertions(+), 1389 deletions(-)
create mode 100644 src/views/run-process-panel/run-process-first-step.tsx
create mode 100644 src/views/run-process-panel/run-process-second-step.tsx
via 2fb4478d11d805b9a5654f5656f74d3a0e0da46b (commit)
via 196524296dd9ddc5558c6296f0d7b69ae66f155d (commit)
via a92ac33f876a928d9542fe08f2a567ce86f3e890 (commit)
via 20f7af812af9bd7094ae71d5a7571cfe556eb968 (commit)
via c2090176529ea4008a94c6bfc0a1c633a369e605 (commit)
via 9f388c2e557c01b0380ffba01bc81dfdd18e8be2 (commit)
via 39f1477d9f0592a3d847eb3181c9b814a3b7b153 (commit)
from 876f422044cb7235edbb19dbfa2a516e5dc86f5a (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 2fb4478d11d805b9a5654f5656f74d3a0e0da46b
Merge: 1965242 a92ac33
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Oct 2 10:57:04 2018 +0200
merge master
Feature #14231
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --cc src/views/run-process-panel/run-process-second-step.tsx
index 0000000,6582710..76ebea3
mode 000000,100644..100644
--- a/src/views/run-process-panel/run-process-second-step.tsx
+++ b/src/views/run-process-panel/run-process-second-step.tsx
@@@ -1,0 -1,62 +1,62 @@@
+ // Copyright (C) The Arvados Authors. All rights reserved.
+ //
+ // SPDX-License-Identifier: AGPL-3.0
+
+ import * as React from 'react';
+ import { withStyles, WithStyles, StyleRulesCallback, Grid, Button } from '@material-ui/core';
+ import { ArvadosTheme } from '~/common/custom-theme';
+ import { Field, reduxForm, InjectedFormProps } from 'redux-form';
+ import { TextField } from '~/components/text-field/text-field';
+ import { RunProcessSecondStepDataFormProps, RUN_PROCESS_SECOND_STEP_FORM_NAME } from '~/store/run-process-panel/run-process-panel-actions';
+
+ type CssRules = 'root';
+
+ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
+ root: {
+
+ }
+ });
+
+ export interface RunProcessSecondStepDataProps {
+
+ }
+
+ export interface RunProcessSecondStepActionProps {
+ onSetStep: (step: number) => void;
+ onRunProcess: (data: RunProcessSecondStepDataFormProps) => void;
+ }
+
-type RunProcessSecondStepProps = RunProcessSecondStepDataProps
- & RunProcessSecondStepActionProps
- & WithStyles<CssRules>
++type RunProcessSecondStepProps = RunProcessSecondStepDataProps
++ & RunProcessSecondStepActionProps
++ & WithStyles<CssRules>
+ & InjectedFormProps<RunProcessSecondStepDataFormProps>;
+
+ const RunProcessSecondStep = withStyles(styles)(
+ ({ onSetStep, classes }: RunProcessSecondStepProps) =>
+ <Grid container spacing={16}>
+ <Grid item xs={12}>
+ <form>
+ <Field
+ name='name'
+ component={TextField}
+ label="Enter a new name for run process" />
+ <Field
+ name='description'
+ component={TextField}
+ label="Enter a description for run process" />
+ </form>
+ </Grid>
+ <Grid item xs={12}>
+ <Button color="primary" onClick={() => onSetStep(0)}>
+ Back
+ </Button>
+ <Button variant="contained" color="primary">
+ Run Process
+ </Button>
+ </Grid>
+ </Grid>
+ );
+
+ export const RunProcessSecondStepForm = reduxForm<RunProcessSecondStepDataFormProps>({
+ form: RUN_PROCESS_SECOND_STEP_FORM_NAME
+ })(RunProcessSecondStep);
commit 196524296dd9ddc5558c6296f0d7b69ae66f155d
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Tue Oct 2 10:23:20 2018 +0200
small-snackbar-fix
Feature #14231
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/collections/collection-move-actions.ts b/src/store/collections/collection-move-actions.ts
index 9bdc552..54508e1 100644
--- a/src/store/collections/collection-move-actions.ts
+++ b/src/store/collections/collection-move-actions.ts
@@ -8,7 +8,7 @@ import { startSubmit, stopSubmit, initialize } from 'redux-form';
import { ServiceRepository } from '~/services/services';
import { RootState } from '~/store/store';
import { getCommonResourceServiceError, CommonResourceServiceError } from "~/services/common-service/common-resource-service";
-import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
+import { snackbarActions } from '~/store/snackbar/snackbar-actions';
import { projectPanelActions } from '~/store/project-panel/project-panel-action';
import { MoveToFormDialogData } from '~/store/move-to-dialog/move-to-dialog';
import { resetPickerProjectTree } from '~/store/project-tree-picker/project-tree-picker-actions';
@@ -32,11 +32,6 @@ export const moveCollection = (resource: MoveToFormDialogData) =>
await services.collectionService.update(resource.uuid, { ...collection, ownerUuid: resource.ownerUuid });
dispatch(projectPanelActions.REQUEST_ITEMS());
dispatch(dialogActions.CLOSE_DIALOG({ id: COLLECTION_MOVE_FORM_NAME }));
- dispatch(snackbarActions.OPEN_SNACKBAR({
- message: 'Collection has been moved',
- hideDuration: 2000,
- kind: SnackbarKind.SUCCESS
- }));
dispatch(progressIndicatorActions.STOP_WORKING(COLLECTION_MOVE_FORM_NAME));
return collection;
} catch (e) {
diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts
index bd480bd..62fca46 100644
--- a/src/store/workbench/workbench-actions.ts
+++ b/src/store/workbench/workbench-actions.ts
@@ -48,6 +48,7 @@ import { GroupContentsResource } from '~/services/groups-service/groups-service'
import { unionize, ofType, UnionOf, MatchCases } from '~/common/unionize';
import { loadRunProcessPanel } from '~/store/run-process-panel/run-process-panel-actions';
import { loadCollectionFiles } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions';
+import { SnackbarKind } from '~/store/snackbar/snackbar-actions';
export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';
@@ -262,7 +263,7 @@ export const moveCollection = (data: MoveToFormDialogData) =>
const collection = await dispatch<any>(collectionMoveActions.moveCollection(data));
dispatch<any>(updateResources([collection]));
dispatch<any>(reloadProjectMatchingUuid([collection.ownerUuid]));
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved.', hideDuration: 2000 }));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Collection has been moved.', hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
} catch (e) {
dispatch(snackbarActions.OPEN_SNACKBAR({ message: e.message, hideDuration: 2000 }));
}
diff --git a/src/views-components/workflow-tree-picker/workflow-tree-picker.tsx b/src/views-components/workflow-tree-picker/workflow-tree-picker.tsx
index 3f97172..a765f81 100644
--- a/src/views-components/workflow-tree-picker/workflow-tree-picker.tsx
+++ b/src/views-components/workflow-tree-picker/workflow-tree-picker.tsx
@@ -64,9 +64,6 @@ enum TreePickerId {
export const WorkflowTreePicker = connect(undefined, mapDispatchToProps)((props: WorkflowTreePickerProps) =>
<div style={{ display: 'flex', flexDirection: 'column' }}>
- <Typography variant='caption' style={{ flexShrink: 0 }}>
- Select a project
- </Typography>
<div style={{ flexGrow: 1, overflow: 'auto' }}>
<MainWorkflowTreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.PROJECTS} />
<MainWorkflowTreePicker {...props} render={renderTreeItem} pickerId={TreePickerId.SHARED_WITH_ME} />
@@ -109,7 +106,10 @@ export const loadFavoriteTreePicker = (nodeId: string) =>
.addEqual('ownerUuid', nodeId)
.getFilters();
- const { items } = await services.groupsService.contents(parentId, { filters });
+ const { items } = (extractUuidKind(nodeId) === ResourceKind.COLLECTION)
+ ? dispatch<any>(loadCollectionFiles(nodeId))
+ : await services.groupsService.contents(parentId, { filters });
+
dispatch<any>(receiveTreePickerData(nodeId, items, TreePickerId.FAVORITES));
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list