From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Tue, 2 Oct 2018 07:19:44 +0000 (+0200)
Subject: merge barnch 'master'
X-Git-Tag: 1.3.0~72^2~8
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/4c394b5b01622c72318fc194682077aa304417fa

merge barnch 'master'

Feature #13863

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
---

4c394b5b01622c72318fc194682077aa304417fa
diff --cc src/views/workflow-panel/workflow-description-card.tsx
index c297276e,72af6bc2..14623626
--- 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 c48f46ad,46b5c916..3202f096
--- 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 d7e88321,d9676b39..32c9d0e8
--- 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@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@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"