From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Fri, 13 Jul 2018 09:20:42 +0000 (+0200)
Subject: Merge branch 'master'
X-Git-Tag: 1.2.0~47^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/a886877017be6744b38d84d52503d21892704139

Merge branch 'master'

Feature #13798

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

a886877017be6744b38d84d52503d21892704139
diff --cc src/common/labels.ts
index 00000000,8ca9e530..9567ce14
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 362bd31f,2ef584e8..1fa28919
--- 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 369e931f,370bc291..1ea34dee
--- 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 c4ccd2ad,02719f59..559816e1
--- 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 b902cd2f,00ac7297..e34ea1ec
--- 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";