Merge branch 'master'

Feature #13798

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

diff --cc src/common/labels.ts
index 0000000000000000000000000000000000000000,8ca9e530f4b7e71f8504cd70d21b57975caa4e7c..9567ce14936b7d880ea06a42069feb85b9ab16d3
mode 000000,100644..100644
--- /dev/null
--- 2/src/common/labels.ts
+++ b/src/common/labels.ts
@@@ -1,0 -1,18 +1,18 @@@
 -import { ResourceKind } from "../models/kinds";
+ // Copyright (C) The Arvados Authors. All rights reserved.
+ //
+ // SPDX-License-Identifier: AGPL-3.0
+ 
++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/abstract-item.tsx
Simple merge

diff --cc src/components/details-panel-factory/items/collection-item.tsx
index 362bd31f5e31534c2bf84f2e1476bbc284c4d537,2ef584e89d271f7bccf9d894973251db3ddb8f90..1fa2891932ed4acc44d709074b463ed13c12f71b
--- 1/src/components/details-panel-factory/items/collection-item.tsx
--- 2/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 369e931ffae6975e8a29bd08dac7a8a1caac61c9,370bc291777f31990646fd493759a4ac7200d782..1ea34deef3dade992bbbfa008c4d235603c29afd
--- 1/src/components/details-panel-factory/items/process-item.tsx
--- 2/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 c4ccd2add7410db389f6f9c331cc967b23b79baa,02719f59bc639e7a2e0a6019a24782b4ae5723cf..559816e12fc36e288c226bfe5bd01f55036b6e8c
--- 1/src/components/details-panel-factory/items/project-item.tsx
--- 2/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-components/details-panel/details-panel.tsx
Simple merge

diff --cc src/views/project-panel/project-panel.tsx
index b902cd2f79d2b0fa376579f500a727861f1909da,00ac729705e9306158a9bdaf4f2c1c5e9e91115f..e34ea1ecda6c72c6bc124ab4113376733d288872
--- 1/src/views/project-panel/project-panel.tsx
--- 2/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";