[ARVADOS-WORKBENCH2] updated: 1.2.0-218-gcba0f40
Git user
git at public.curoverse.com
Thu Aug 30 04:48:17 EDT 2018
Summary of changes:
.../details-attribute/details-attribute.tsx | 2 +-
src/models/container-request.ts | 19 +++---
src/models/container.ts | 38 +++++++++++
src/models/mount-types.ts | 56 +++++++++++++++
src/models/resource.ts | 13 +++-
src/models/runtime-constraints.ts | 10 +++
src/models/scheduling-parameters.ts | 9 +++
src/routes/routes.ts | 25 ++++---
.../container-request-service.ts} | 26 +++----
.../container-service.ts} | 26 +++----
src/services/services.ts | 35 ++++++----
src/store/navigation/navigation-action.ts | 6 +-
src/store/processes/process.ts | 47 +++++++++++++
src/store/processes/processes-actions.ts | 52 ++++++++++++++
src/store/resources/resources.ts | 10 ++-
src/store/workbench/workbench-actions.ts | 13 ++++
.../details-panel/process-details.tsx | 4 +-
.../process-information-card.ts | 24 -------
.../process-panel/process-information-card.tsx | 20 +++---
src/views/process-panel/process-panel-root.tsx | 69 +++++++++++++++++++
src/views/process-panel/process-panel.tsx | 79 ++++++----------------
src/views/workbench/workbench.tsx | 2 +-
22 files changed, 423 insertions(+), 162 deletions(-)
create mode 100644 src/models/container.ts
create mode 100644 src/models/mount-types.ts
create mode 100644 src/models/runtime-constraints.ts
create mode 100644 src/models/scheduling-parameters.ts
copy src/services/{keep-service/keep-service.ts => container-request-service/container-request-service.ts} (55%)
copy src/services/{keep-service/keep-service.ts => container-service/container-service.ts} (59%)
create mode 100644 src/store/processes/process.ts
create mode 100644 src/store/processes/processes-actions.ts
delete mode 100644 src/views-components/process-information-card/process-information-card.ts
create mode 100644 src/views/process-panel/process-panel-root.tsx
via cba0f400f56889778321bdc0fdcf6cee236f6a79 (commit)
via 9b28d6d29d9609adc86e3fdc136873c3cf6114ed (commit)
via 9ccc7e8ebe82b97e219d65adeea8b03b2c9ed71a (commit)
via 21ee15421471ce0f0aa4a1241cab3498c335d682 (commit)
via 6149700b801fc2cdb83b0e700bbb319850ed471d (commit)
via 2d887860caa003ddaf69d1f85ebdaf208e0b74c1 (commit)
via 5163a70c5624a52c802a37d66b806b5e718c4151 (commit)
via c798ba784db88b406d27f3783501ab2800f5719a (commit)
via 3bf48201c92fcb9827d134a96671f02035f544a6 (commit)
via 4221f6e12bfbbf56ab8848e9c6c1b6b9eacbec64 (commit)
via 78969103183f03a23557aa0b4d1739a0ff12dcb2 (commit)
via 6a5c0fe0cd12635698d2b5a6df27b4291e5b0ecb (commit)
via a6af19c842e41469fb832dff58d5a23747394a1c (commit)
from f53d651573ef8c358cbdf38c7a56c6aed8178b61 (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 cba0f400f56889778321bdc0fdcf6cee236f6a79
Merge: f53d651 9b28d6d
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Aug 30 10:47:59 2018 +0200
Merge branch '14099-process-service'
refs #14099
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
commit 9b28d6d29d9609adc86e3fdc136873c3cf6114ed
Merge: 9ccc7e8 f53d651
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Thu Aug 30 10:47:24 2018 +0200
Merge branch 'master'
Feature #14099
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --cc src/views/process-panel/process-panel-root.tsx
index c7ac938,0000000..feada3a
mode 100644,000000..100644
--- a/src/views/process-panel/process-panel-root.tsx
+++ b/src/views/process-panel/process-panel-root.tsx
@@@ -1,37 -1,0 +1,69 @@@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from 'react';
+import { Grid } from '@material-ui/core';
+import { ProcessInformationCard } from './process-information-card';
+import { DefaultView } from '~/components/default-view/default-view';
+import { ProcessIcon } from '~/components/icon/icon';
+import { Process } from '~/store/processes/process';
++import { SubprocessesCard } from './subprocesses-card';
+
+export interface ProcessPanelRootDataProps {
+ process?: Process;
+}
+
+export interface ProcessPanelRootActionProps {
+ onContextMenu: (event: React.MouseEvent<HTMLElement>) => void;
+}
+
+export type ProcessPanelRootProps = ProcessPanelRootDataProps & ProcessPanelRootActionProps;
+
+export const ProcessPanelRoot = (props: ProcessPanelRootProps) =>
+ props.process
- ? <Grid container>
++ ? <Grid container spacing={16}>
+ <Grid item xs={7}>
+ <ProcessInformationCard
+ process={props.process}
+ onContextMenu={props.onContextMenu} />
+ </Grid>
++ <Grid item xs={5}>
++ <SubprocessesCard
++ subprocesses={4}
++ filters={[
++ {
++ key: 'queued',
++ value: 1,
++ label: 'Queued',
++ checked: true
++ }, {
++ key: 'active',
++ value: 2,
++ label: 'Active',
++ checked: true
++ },
++ {
++ key: 'completed',
++ value: 2,
++ label: 'Completed',
++ checked: true
++ },
++ {
++ key: 'failed',
++ value: 2,
++ label: 'Failed',
++ checked: true
++ }
++ ]}
++ onToggle={() => { return; }}
++ />
++ </Grid>
+ </Grid>
+ : <Grid container
+ alignItems='center'
+ justify='center'>
+ <DefaultView
+ icon={ProcessIcon}
+ messages={['Process not found']} />
+ </Grid>;
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list