[ARVADOS-WORKBENCH2] updated: 1.3.0-239-g07dc691e

[Git user]

Summary of changes:
 src/views-components/data-explorer/renderers.tsx   | 24 +++++++++++++++++++++-
 .../search-results-panel-view.tsx                  | 12 +++++++++--
 src/views/workflow-panel/workflow-panel-view.tsx   |  4 ++--
 3 files changed, 35 insertions(+), 5 deletions(-)

       via  07dc691e4fecbf365d6edf26a569f3eaffca4a76 (commit)
       via  b3e7292409401b24f2455fde3d323eabf1e955cc (commit)
      from  52f6efaa4834fcbcb356c3509171f95d2f1af1c7 (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 07dc691e4fecbf365d6edf26a569f3eaffca4a76
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date:   Fri Dec 28 08:56:15 2018 +0100

    Add cluster render
    
    Feature #14348
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index 2f102a99..f90dac6b 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -203,6 +203,28 @@ const renderNodeInfo = (data: string) => {
     return <Typography>{JSON.stringify(data, null, 4)}</Typography>;
 };
 
+const clusterColors = [
+    ['#f44336', '#fff'],
+    ['#2196f3', '#fff'],
+    ['#009688', '#fff'],
+    ['#cddc39', '#fff'],
+    ['#ff9800', '#fff']
+];
+
+export const ResourceCluster = (props: { uuid: string }) => {
+    const p = props.uuid.indexOf('-');
+    const clusterId = p >= 5 ? props.uuid.substr(0, p) : '';
+    const ci = p >= 5 ? (props.uuid.charCodeAt(0) + props.uuid.charCodeAt(1)) % clusterColors.length : 0;
+    return <Typography>
+        <div style={{
+            backgroundColor: clusterColors[ci][0],
+            color: clusterColors[ci][1],
+            padding: "2px 7px",
+            borderRadius: 3
+        }}>{clusterId}</div>
+    </Typography>;
+};
+
 export const ComputeNodeInfo = withResourceData('info', renderNodeInfo);
 
 export const ComputeNodeUuid = withResourceData('uuid', renderNodeData);
diff --git a/src/views/search-results-panel/search-results-panel-view.tsx b/src/views/search-results-panel/search-results-panel-view.tsx
index 7bfc2bfe..6827a002 100644
--- a/src/views/search-results-panel/search-results-panel-view.tsx
+++ b/src/views/search-results-panel/search-results-panel-view.tsx
@@ -12,7 +12,7 @@ import { SearchBarAdvanceFormData } from '~/models/search-bar';
 import { SEARCH_RESULTS_PANEL_ID } from '~/store/search-results-panel/search-results-panel-actions';
 import { DataExplorer } from '~/views-components/data-explorer/data-explorer';
 import {
-    ProcessStatus,
+    ProcessStatus, ResourceCluster,
     ResourceFileSize,
     ResourceLastModifiedDate,
     ResourceName,
@@ -23,6 +23,7 @@ import { createTree } from '~/models/tree';
 import { getInitialResourceTypeFilters } from '~/store/resource-type-filters/resource-type-filters';
 
 export enum SearchResultsPanelColumnNames {
+    CLUSTER = "Cluster",
     NAME = "Name",
     PROJECT = "Project",
     STATUS = "Status",
@@ -51,6 +52,13 @@ export interface WorkflowPanelFilter extends DataTableFilterItem {
 
 export const searchResultsPanelColumns: DataColumns<string> = [
     {
+        name: SearchResultsPanelColumnNames.CLUSTER,
+        selected: true,
+        configurable: true,
+        filters: createTree(),
+        render: (uuid: string) => <ResourceCluster uuid={uuid} />
+    },
+    {
         name: SearchResultsPanelColumnNames.NAME,
         selected: true,
         configurable: true,
@@ -110,4 +118,4 @@ export const SearchResultsPanelView = (props: SearchResultsPanelProps) => {
         onRowDoubleClick={props.onItemDoubleClick}
         onContextMenu={props.onContextMenu}
         contextMenuColumn={true} />;
-};
\ No newline at end of file
+};

commit b3e7292409401b24f2455fde3d323eabf1e955cc
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date:   Thu Dec 27 23:49:43 2018 +0100

    Fix typo
    
    Feature #14348
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>

diff --git a/src/views-components/data-explorer/renderers.tsx b/src/views-components/data-explorer/renderers.tsx
index ce4d430f..2f102a99 100644
--- a/src/views-components/data-explorer/renderers.tsx
+++ b/src/views-components/data-explorer/renderers.tsx
@@ -81,7 +81,7 @@ const renderWorkflowName = (item: { name: string; uuid: string, kind: string, ow
         </Grid>
     </Grid>;
 
-export const RosurceWorkflowName = connect(
+export const ResourceWorkflowName = connect(
     (state: RootState, props: { uuid: string }) => {
         const resource = getResource<WorkflowResource>(props.uuid)(state.resources);
         return resource || { name: '', uuid: '', kind: '', ownerUuid: '' };
diff --git a/src/views/workflow-panel/workflow-panel-view.tsx b/src/views/workflow-panel/workflow-panel-view.tsx
index da8a0c4b..d8fa100e 100644
--- a/src/views/workflow-panel/workflow-panel-view.tsx
+++ b/src/views/workflow-panel/workflow-panel-view.tsx
@@ -9,7 +9,7 @@ import { DataTableDefaultView } from '~/components/data-table-default-view/data-
 import { WORKFLOW_PANEL_ID } from '~/store/workflow-panel/workflow-panel-actions';
 import {
     ResourceLastModifiedDate,
-    RosurceWorkflowName,
+    ResourceWorkflowName,
     ResourceWorkflowStatus,
     ResourceShare,
     ResourceRunProcess
@@ -70,7 +70,7 @@ export const workflowPanelColumns: DataColumns<string> = [
         configurable: true,
         sortDirection: SortDirection.ASC,
         filters: createTree(),
-        render: (uuid: string) => <RosurceWorkflowName uuid={uuid} />
+        render: (uuid: string) => <ResourceWorkflowName uuid={uuid} />
     },
     {
         name: WorkflowPanelColumnNames.AUTHORISATION,

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


hooks/post-receive
--