From: Stephen Smith <stephen@curii.com>
Date: Tue, 7 Jun 2022 21:37:00 +0000 (-0400)
Subject: Merge branch '18984-project-type-filters-2' into main. Closes #18984
X-Git-Tag: 2.5.0~53
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/9a59fad2b6a97af963728a5111395f9caa71802f?hp=-c

Merge branch '18984-project-type-filters-2' into main. Closes #18984

Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>
---

9a59fad2b6a97af963728a5111395f9caa71802f
diff --combined src/views/project-panel/project-panel.tsx
index a5594d8e,e0fcb48c..ccb40d53
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@@ -36,7 -36,6 +36,6 @@@ import 
  import { navigateTo } from 'store/navigation/navigation-action';
  import { getProperty } from 'store/properties/properties';
  import { PROJECT_PANEL_CURRENT_UUID } from 'store/project-panel/project-panel-action';
- import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view';
  import { ArvadosTheme } from "common/custom-theme";
  import { createTree } from 'models/tree';
  import {
@@@ -155,11 -154,9 +154,9 @@@ export const ProjectPanel = withStyles(
                          onRowDoubleClick={this.handleRowDoubleClick}
                          onContextMenu={this.handleContextMenu}
                          contextMenuColumn={true}
-                         dataTableDefaultView={
-                             <DataTableDefaultView
-                                 icon={ProjectIcon}
-                                 messages={DEFAULT_VIEW_MESSAGES} />
-                         } />
+                         defaultViewIcon={ProjectIcon}
+                         defaultViewMessages={DEFAULT_VIEW_MESSAGES}
+                     />
                  </div>;
              }
  
@@@ -183,7 -180,7 +180,7 @@@
                          name: resource.name,
                          uuid: resource.uuid,
                          ownerUuid: resource.ownerUuid,
 -                        isTrashed: ('isTrashed' in resource) ? resource.isTrashed: false,
 +                        isTrashed: ('isTrashed' in resource) ? resource.isTrashed : false,
                          kind: resource.kind,
                          menuKind,
                          description: resource.description,