21386: search results good Arvados-DCO-1.1-Signed-off-by: Lisa Knox <lisa.knox@curii...

[arvados.git] / services / workbench2 / src / components / data-table / data-table.tsx

diff --git a/services/workbench2/src/components/data-table/data-table.tsx b/services/workbench2/src/components/data-table/data-table.tsx
index d1c7e1fc9d55758099fb96e18b678d3665b7f321..3e7c86459b1abe80beebba5c9754e05abe83413a 100644 (file)
--- a/services/workbench2/src/components/data-table/data-table.tsx
+++ b/services/workbench2/src/components/data-table/data-table.tsx
@@ -291,7 +291,7 @@ export const DataTable = withStyles(styles)(
         };
 
         render() {
-            const { items, classes, working, columns, is404 } = this.props;
+            const { items, classes, columns, is404 } = this.props;
             const { isLoaded } = this.state;
             if (columns[0].name === this.checkBoxColumn.name) columns.shift();
             columns.unshift(this.checkBoxColumn);
@@ -312,7 +312,7 @@ export const DataTable = withStyles(styles)(
 
         renderNoItemsPlaceholder = (columns: DataColumns<T, any>) => {
             const dirty = columns.some(column => getTreeDirty("")(column.filters));
-            if (this.state.isLoaded === false) {
+            if (this.state.isLoaded === false || this.props.working === true) {
                 return (
                     <DataTableDefaultView 
                         icon={this.props.defaultViewIcon} 
@@ -323,10 +323,11 @@ export const DataTable = withStyles(styles)(
                 return (
                     <DataTableDefaultView 
                         icon={this.props.defaultViewIcon} 
-                        messages={["Project not found"]} 
+                        messages={["Item not found"]} 
                     />
                 );
             } else {
+                //if (isLoaded && !working && !is404)
                 return (
                     <DataTableDefaultView
                         icon={this.props.defaultViewIcon}