[ARVADOS-WORKBENCH2] updated: 1.1.4-289-ga886877

[Git user]

Summary of changes:
 src/common/labels.ts                               | 18 +++++++++++
 src/components/attribute/attribute.tsx             | 11 +++----
 .../details-panel-factory/items/abstract-item.tsx  |  2 +-
 .../items/collection-item.tsx                      | 21 ++++++-------
 .../details-panel-factory/items/process-item.tsx   | 35 +++++++++++++---------
 .../details-panel-factory/items/project-item.tsx   | 20 ++++++-------
 src/index.tsx                                      | 12 ++++++++
 .../details-panel/details-panel.tsx                |  4 +--
 src/views/project-panel/project-panel.tsx          | 24 ++++-----------
 9 files changed, 84 insertions(+), 63 deletions(-)
 create mode 100644 src/common/labels.ts

       via  a886877017be6744b38d84d52503d21892704139 (commit)
       via  a2a93caf3e8c78fc93d47eec249086e26124a0be (commit)
       via  99baf25913557ccaa4503dd7a7891f33e009e4ac (commit)
      from  c85c82198aad38669c509db09f7efc133196eb00 (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 a886877017be6744b38d84d52503d21892704139
Merge: c85c821 a2a93ca
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Fri Jul 13 11:20:42 2018 +0200

    Merge branch 'master'
    
    Feature #13798
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --cc src/common/labels.ts
index 0000000,8ca9e53..9567ce1
mode 000000,100644..100644
--- a/src/common/labels.ts
+++ b/src/common/labels.ts
@@@ -1,0 -1,18 +1,18 @@@
+ // Copyright (C) The Arvados Authors. All rights reserved.
+ //
+ // SPDX-License-Identifier: AGPL-3.0
+ 
 -import { ResourceKind } from "../models/kinds";
++import { ResourceKind } from "../models/resource";
+ 
+ export const resourceLabel = (type: string) => {
+     switch (type) {
+         case ResourceKind.Collection:
+             return "Data collection";
+         case ResourceKind.Project:
+             return "Project";
+         case ResourceKind.Process:
+             return "Process";
+         default:
+             return "Unknown";
+     }
+ };
diff --cc src/components/details-panel-factory/items/collection-item.tsx
index 362bd31,2ef584e..1fa2891
--- a/src/components/details-panel-factory/items/collection-item.tsx
+++ b/src/components/details-panel-factory/items/collection-item.tsx
@@@ -3,12 -3,18 +3,13 @@@
  // SPDX-License-Identifier: AGPL-3.0
  
  import * as React from 'react';
--import IconBase, { IconTypes } from '../../icon/icon';
++import { IconTypes } from '../../icon/icon';
  import Attribute from '../../attribute/attribute';
  import AbstractItem from './abstract-item';
  import { CollectionResource } from '../../../models/collection';
+ import { formatDate } from '../../../common/formatters';
  
  export default class CollectionItem extends AbstractItem<CollectionResource> {
 -    
 -    constructor(item: CollectionResource) {
 -        super(item);
 -        console.log('Collection item: ', this.item);
 -    }
  
      getIcon(): IconTypes {
          return IconTypes.COLLECTION;
diff --cc src/components/details-panel-factory/items/process-item.tsx
index 369e931,370bc29..1ea34de
--- a/src/components/details-panel-factory/items/process-item.tsx
+++ b/src/components/details-panel-factory/items/process-item.tsx
@@@ -7,8 -7,14 +7,9 @@@ import IconBase, { IconTypes } from '..
  import Attribute from '../../attribute/attribute';
  import AbstractItem from './abstract-item';
  import { ProcessResource } from '../../../models/process';
+ import { formatDate } from '../../../common/formatters';
  
  export default class ProcessItem extends AbstractItem<ProcessResource> {
 -    
 -    constructor(item: ProcessResource) {
 -        super(item);
 -        console.log('Process item: ', this.item);
 -    }
  
      getIcon(): IconTypes {
          return IconTypes.PROCESS;
diff --cc src/components/details-panel-factory/items/project-item.tsx
index c4ccd2a,02719f5..559816e
--- a/src/components/details-panel-factory/items/project-item.tsx
+++ b/src/components/details-panel-factory/items/project-item.tsx
@@@ -10,8 -11,13 +11,8 @@@ import { formatDate } from '../../../co
  
  export default class ProjectItem extends AbstractItem<ProjectResource> {
  
 -    constructor(item: ProjectResource) {
 -        super(item);
 -        console.log('item: ', this.item);
 -    }
 -
      getIcon(): IconTypes {
-         return IconTypes.PROJECT;
+         return IconTypes.FOLDER;
      }
  
      buildDetails(): React.ReactElement<any> {
diff --cc src/views/project-panel/project-panel.tsx
index b902cd2,00ac729..e34ea1e
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@@ -14,7 -14,8 +14,8 @@@ import { RootState } from '../../store/
  import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
  import { ContainerRequestState } from '../../models/container-request';
  import { SortDirection } from '../../components/data-table/data-column';
 +import { ResourceKind } from '../../models/resource';
+ import { resourceLabel } from '../../common/labels';
  
  export const PROJECT_PANEL_ID = "projectPanel";
  

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


hooks/post-receive
--