[ARVADOS-WORKBENCH2] updated: 1.2.0-510-g4c394b5

Git user git at public.curoverse.com
Tue Oct 2 03:34:31 EDT 2018


Summary of changes:
 .../run-process-panel/run-process-panel-actions.ts |   26 +-
 .../run-process-panel/run-process-panel-reducer.ts |    9 +-
 src/store/workbench/workbench-actions.ts           |    2 +-
 .../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   |   28 +-
 src/views/workflow-panel/workflow-panel-view.tsx   |    6 +-
 yarn.lock                                          | 1352 +-------------------
 11 files changed, 234 insertions(+), 1383 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  4c394b5b01622c72318fc194682077aa304417fa (commit)
       via  a92ac33f876a928d9542fe08f2a567ce86f3e890 (commit)
       via  20f7af812af9bd7094ae71d5a7571cfe556eb968 (commit)
       via  c2090176529ea4008a94c6bfc0a1c633a369e605 (commit)
       via  9f388c2e557c01b0380ffba01bc81dfdd18e8be2 (commit)
      from  28e674396a7933312d4af62b3ca6552d3e0855e8 (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 4c394b5b01622c72318fc194682077aa304417fa
Merge: 28e6743 a92ac33
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Oct 2 09:19:44 2018 +0200

    merge barnch 'master'
    
    Feature #13863
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --cc src/views/workflow-panel/workflow-description-card.tsx
index c297276,72af6bc..1462362
--- a/src/views/workflow-panel/workflow-description-card.tsx
+++ b/src/views/workflow-panel/workflow-description-card.tsx
@@@ -3,13 -3,11 +3,11 @@@
  // SPDX-License-Identifier: AGPL-3.0
  
  import * as React from 'react';
--import { StyleRulesCallback, WithStyles, withStyles, CardContent, Tab, Tabs, Paper } from '@material-ui/core';
++import { StyleRulesCallback, WithStyles, withStyles, CardContent, Tab, Tabs } from '@material-ui/core';
  import { ArvadosTheme } from '~/common/custom-theme';
  import { WorkflowIcon } from '~/components/icon/icon';
  import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view';
 -import { WorkflowResource } from '~/models/workflow';
 +import { WorkflowResource, parseWorkflowDefinition, getWorkflowInputs } from '~/models/workflow';
- import { WorkflowInput } from '~/components/workflow-inputs-form/workflow-input';
- import { RunProcessInputsForm } from '../run-process-panel/run-process-inputs-form';
  
  export type CssRules = 'root' | 'tab';
  
@@@ -47,29 -45,23 +45,33 @@@ export const WorkflowDetailsCard = with
                      <Tab className={classes.tab} label="Inputs" />
                  </Tabs>
                  {value === 0 && <CardContent>
-                     {workflow
-                         ? workflow.description
-                         : <DataTableDefaultView
+                     {workflow ? (
+                         workflow.description
+                     ) : (
+                         <DataTableDefaultView
                              icon={WorkflowIcon}
-                             messages={['Please select a workflow to see its description.']} />}
+                             messages={['Please select a workflow to see its description.']} />
+                     )}
                  </CardContent>}
                  {value === 1 && <CardContent>
-                     {workflow && this.inputs
-                         ? <RunProcessInputsForm inputs={this.inputs} />
-                         : <DataTableDefaultView
+                     {workflow ? (
+                         workflow.name
+                     ) : (
+                         <DataTableDefaultView
                              icon={WorkflowIcon}
-                             messages={['Please select a workflow to see its description.']} />}
+                             messages={['Please select a workflow to see its inputs.']} />
+                     )}
                  </CardContent>}
-             </Paper>;
+             </div>;
          }
 +
 +        get inputs() {
 +            if (this.props.workflow) {
 +                const definition = parseWorkflowDefinition(this.props.workflow);
 +                if (definition) {
 +                    return getWorkflowInputs(definition);
 +                }
 +            }
 +            return;
 +        }
      });
diff --cc src/views/workflow-panel/workflow-panel-view.tsx
index c48f46a,46b5c91..3202f09
--- a/src/views/workflow-panel/workflow-panel-view.tsx
+++ b/src/views/workflow-panel/workflow-panel-view.tsx
@@@ -16,9 -16,8 +16,9 @@@ import 
  import { SortDirection } from '~/components/data-table/data-column';
  import { DataColumns } from '~/components/data-table/data-table';
  import { DataTableFilterItem } from '~/components/data-table-filters/data-table-filters';
- import { Grid } from '@material-ui/core';
+ import { Grid, Paper } from '@material-ui/core';
  import { WorkflowDetailsCard } from './workflow-description-card';
 +import { WorkflowResource } from '../../models/workflow';
  
  export enum WorkflowPanelColumnNames {
      NAME = "Name",
diff --cc yarn.lock
index d7e8832,d9676b3..32c9d0e
--- a/yarn.lock
+++ b/yarn.lock
@@@ -104,12 -93,7 +93,11 @@@
  "@types/json5@^0.0.29":
    version "0.0.29"
    resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
  
 +"@types/js-yaml at 3.11.2":
 +  version "3.11.2"
 +  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.11.2.tgz#699ad86054cc20043c30d66a6fcde30bbf5d3d5e"
 +
  "@types/jss@^9.5.3":
    version "9.5.6"
    resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.6.tgz#96e1d246ddfbccc4867494077c714773cf29acde"
@@@ -5088,12 -4394,10 +4398,10 @@@ js-base64@^2.1.9
  js-tokens@^3.0.2:
    version "3.0.2"
    resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
  
 -js-yaml@^3.4.3, js-yaml@^3.7.0:
 +js-yaml at 3.12.0, js-yaml@^3.4.3, js-yaml@^3.7.0:
    version "3.12.0"
    resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-   integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
    dependencies:
      argparse "^1.0.7"
      esprima "^4.0.0"

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list