[ARVADOS-WORKBENCH2] updated: 1.2.0-434-gc040719

[Git user]

Summary of changes:
 public/favicon.ico                               | Bin 3870 -> 24838 bytes
 public/index.html                                |   2 +-
 src/views-components/data-explorer/renderers.tsx |  29 +++++++++++++++++++++++
 src/views/workflow-panel/workflow-panel.tsx      |  29 ++++++++++++++++++-----
 4 files changed, 53 insertions(+), 7 deletions(-)

       via  c04071992d624a6aec1185898e58ce848086684f (commit)
       via  9ea087b587f8139416cea16fbe4caad0d6df90c4 (commit)
       via  4f6c18655492bb515db3202aa79627d7a4e4b19d (commit)
       via  130c1208fe24fbabe72e03a56933804d7b161729 (commit)
      from  6acebd8c63b066f86aa81fce3b8937609778031f (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 c04071992d624a6aec1185898e58ce848086684f
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Fri Sep 21 15:40:23 2018 +0200

    fixed-workflow-view-layout
    
    Feature #13857
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index b9475f5..b9d0bc8 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -16,6 +16,7 @@ import { GroupContentsResource } from '~/services/groups-service/groups-service'
 import { getProcess, Process, getProcessStatus, getProcessStatusColor } from '~/store/processes/process';
 import { ArvadosTheme } from '~/common/custom-theme';
 import { compose } from 'redux';
+import { WorkflowResource } from '~/models/workflow';
 
 export const renderName = (item: { name: string; uuid: string, kind: string }) =>
     <Grid container alignItems="center" wrap="nowrap" spacing={16}>
@@ -55,10 +56,38 @@ export const renderIcon = (item: { kind: string }) => {
     }
 };
 
+export const renderWorkflowName = (item: { name: string; uuid: string, kind: string }) =>
+    <Grid container alignItems="center" wrap="nowrap" spacing={16}>
+        <Grid item>
+            {renderIcon(item)}
+        </Grid>
+        <Grid item>
+            <Typography color="primary" style={{ width: '100px' }}>
+                {item.name}
+            </Typography>
+        </Grid>
+    </Grid>;
+
+export const RosurceWorkflowName = connect(
+    (state: RootState, props: { uuid: string }) => {
+        const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
+        return resource || { name: '', uuid: '', kind: '' };
+    })(renderWorkflowName);
+
 export const renderDate = (date?: string) => {
     return <Typography noWrap style={{ minWidth: '100px' }}>{formatDate(date)}</Typography>;
 };
 
+export const renderWorkflowStatus = () => {
+    return <Typography noWrap style={{ width: '60px' }}>{"Public"}</Typography>;
+};
+
+export const ResourceWorkflowStatus = connect(
+    (state: RootState, props: { uuid: string }) => {
+        const resource = getResource<WorkflowResource>(props.uuid)(state.resources);
+        return {};
+    })((props: { status?: string }) => renderWorkflowStatus());
+
 export const ResourceLastModifiedDate = connect(
     (state: RootState, props: { uuid: string }) => {
         const resource = getResource<GroupContentsResource>(props.uuid)(state.resources);
diff --git a/src/views/workflow-panel/workflow-panel.tsx b/src/views/workflow-panel/workflow-panel.tsx
index 92bbcad..ae058c3 100644
--- a/src/views/workflow-panel/workflow-panel.tsx
+++ b/src/views/workflow-panel/workflow-panel.tsx
@@ -6,7 +6,7 @@ import * as React from 'react';
 import { DataExplorer } from "~/views-components/data-explorer/data-explorer";
 import { connect, DispatchProp } from 'react-redux';
 import { RootState } from '~/store/store';
-import { WorkflowIcon } from '~/components/icon/icon';
+import { WorkflowIcon, ShareIcon } from '~/components/icon/icon';
 import { ResourcesState, getResource } from '~/store/resources/resources';
 import { navigateTo } from "~/store/navigation/navigation-action";
 import { loadDetailsPanel } from "~/store/details-panel/details-panel-action";
@@ -17,18 +17,20 @@ import { GroupResource } from '~/models/group';
 import { ContextMenuKind } from '~/views-components/context-menu/context-menu';
 import {
     ResourceLastModifiedDate,
-    ResourceName,
+    RosurceWorkflowName,
+    ResourceWorkflowStatus
 } from "~/views-components/data-explorer/renderers";
 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, Tooltip, IconButton } from '@material-ui/core';
 import { WorkflowDescriptionCard } from './workflow-description-card';
 
 export enum WorkflowPanelColumnNames {
     NAME = "Name",
     AUTHORISATION = "Authorisation",
     LAST_MODIFIED = "Last modified",
+    SHARE = 'Share'
 }
 
 interface WorkflowPanelDataProps {
@@ -54,6 +56,14 @@ const resourceStatus = (type: string) => {
     }
 };
 
+const ResourceShare = (props: { uuid: string }) => {
+    return <Tooltip title="Share">
+        <IconButton onClick={() => undefined}>
+            <ShareIcon />
+        </IconButton>
+    </Tooltip>;
+};
+
 export const workflowPanelColumns: DataColumns<string, DataTableFilterItem> = [
     {
         name: WorkflowPanelColumnNames.NAME,
@@ -61,7 +71,7 @@ export const workflowPanelColumns: DataColumns<string, DataTableFilterItem> = [
         configurable: true,
         sortDirection: SortDirection.ASC,
         filters: [],
-        render: (uuid: string) => <ResourceName uuid={uuid} />
+        render: (uuid: string) => <RosurceWorkflowName uuid={uuid} />
     },
     {
         name: WorkflowPanelColumnNames.AUTHORISATION,
@@ -82,8 +92,7 @@ export const workflowPanelColumns: DataColumns<string, DataTableFilterItem> = [
                 selected: true,
             }
         ],
-        // do zmiany na ResourceAuthorisation
-        render: (uuid: string) => <ResourceName uuid={uuid} />,
+        render: (uuid: string) => <ResourceWorkflowStatus uuid={uuid} />,
     },
     {
         name: WorkflowPanelColumnNames.LAST_MODIFIED,
@@ -92,6 +101,14 @@ export const workflowPanelColumns: DataColumns<string, DataTableFilterItem> = [
         sortDirection: SortDirection.NONE,
         filters: [],
         render: (uuid: string) => <ResourceLastModifiedDate uuid={uuid} />
+    },
+    {
+        name: '',
+        selected: true,
+        configurable: true,
+        sortDirection: SortDirection.NONE,
+        filters: [],
+        render: (uuid: string) => <ResourceShare uuid={uuid} />
     }
 ];
 

commit 9ea087b587f8139416cea16fbe4caad0d6df90c4
Merge: 6acebd8 4f6c186
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Fri Sep 21 14:04:51 2018 +0200

    Merge branch 'master' into 13857-workflow-view
    
    refs #13857
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>


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


hooks/post-receive
--