Merge branch 'origin/master' into 13666-data-explorer-mapper

[arvados-workbench2.git] / src / views-components / project-explorer / project-explorer.tsx

diff --git a/src/views-components/project-explorer/project-explorer.tsx b/src/views-components/project-explorer/project-explorer.tsx
index 4931c09a5149b67c1b3f5b300a6bf3b8798da093..1018ef5e5fa428a351226ff8cf4efdc21b6d2412 100644 (file)
--- a/src/views-components/project-explorer/project-explorer.tsx
+++ b/src/views-components/project-explorer/project-explorer.tsx
@@ -10,6 +10,7 @@ import DataExplorer from '../../components/data-explorer/data-explorer';
 import { DataColumn, toggleSortDirection, resetSortDirection } from '../../components/data-table/data-column';
 import { DataTableFilterItem } from '../../components/data-table-filters/data-table-filters';
 import { ContextMenuAction } from '../../components/context-menu/context-menu';
+import { ResourceKind } from "../../models/resource";
 
 export interface ProjectExplorerContextActions {
     onAddToFavourite: (item: ProjectExplorerItem) => void;
@@ -23,6 +24,7 @@ export interface ProjectExplorerContextActions {
 
 interface ProjectExplorerProps {
     items: ProjectExplorerItem[];
+    onRowClick: (item: ProjectExplorerItem) => void;
 }
 
 interface ProjectExplorerState {
@@ -63,7 +65,7 @@ class ProjectExplorer extends React.Component<ProjectExplorerProps, ProjectExplo
                 name: "Group",
                 selected: true
             }],
-            render: item => renderType(item.type)
+            render: item => renderType(item.kind)
         }, {
             name: "Owner",
             selected: true,
@@ -114,7 +116,7 @@ class ProjectExplorer extends React.Component<ProjectExplorerProps, ProjectExplo
             rowsPerPage={this.state.rowsPerPage}
             onColumnToggle={this.toggleColumn}
             onFiltersChange={this.changeFilters}
-            onRowClick={console.log}
+            onRowClick={this.props.onRowClick}
             onSortToggle={this.toggleSort}
             onSearch={this.search}
             onContextAction={this.executeAction}
@@ -185,12 +187,15 @@ const renderName = (item: ProjectExplorerItem) =>
         </Grid>
     </Grid>;
 
+
 const renderIcon = (item: ProjectExplorerItem) => {
-    switch (item.type) {
-        case "arvados#group":
-            return <i className="fas fa-folder fa-lg" />;
-        case "arvados#groupList":
-            return <i className="fas fa-th fa-lg" />;
+    switch (item.kind) {
+        case ResourceKind.LEVEL_UP:
+            return <i className="icon-level-up" style={{fontSize: "1rem"}}/>;
+        case ResourceKind.PROJECT:
+            return <i className="fas fa-folder fa-lg"/>;
+        case ResourceKind.COLLECTION:
+            return <i className="fas fa-th fa-lg"/>;
         default:
             return <i />;
     }