refs #14186 Merge branch 'origin/14186-progress-indicator-store'

Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos@contractors.roche.com>

diff --combined src/components/data-explorer/data-explorer.tsx
index d63d1ccce519b69b825594ec6a05d4f7f5339397,66b9c35b7d8941d6c59185a918f4e8ec2eb77651..59f4dbebb47832ff4ec5a827c44eb1a434db61ac
--- 1/src/components/data-explorer/data-explorer.tsx
--- 2/src/components/data-explorer/data-explorer.tsx
+++ b/src/components/data-explorer/data-explorer.tsx
@@@ -33,6 -33,7 +33,7 @@@ interface DataExplorerDataProps<T> 
      page: number;
      contextMenuColumn: boolean;
      dataTableDefaultView?: React.ReactNode;
+     working?: boolean;
  }
  
  interface DataExplorerActionProps<T> {
@@@ -60,7 -61,7 +61,7 @@@ export const DataExplorer = withStyles(
          }
          render() {
              const {
-                 columns, onContextMenu, onFiltersChange, onSortToggle, extractKey,
+                 columns, onContextMenu, onFiltersChange, onSortToggle, working, extractKey,
                  rowsPerPage, rowsPerPageOptions, onColumnToggle, searchValue, onSearch,
                  items, itemsAvailable, onRowClick, onRowDoubleClick, classes,
                  dataTableDefaultView
@@@ -87,6 -88,7 +88,7 @@@
                      onFiltersChange={onFiltersChange}
                      onSortToggle={onSortToggle}
                      extractKey={extractKey}
+                     working={working}
                      defaultView={dataTableDefaultView}
                  />
                  <Toolbar>
@@@ -114,11 -116,11 +116,11 @@@
  
          renderContextMenuTrigger = (item: T) =>
              <Grid container justify="flex-end">
 -                <IconButton onClick={event => this.props.onContextMenu(event, item)}>
 -                    <Tooltip title="More options">
 +                <Tooltip title="More options">
 +                    <IconButton onClick={event => this.props.onContextMenu(event, item)}>
                          <MoreVertIcon />
 -                    </Tooltip>
 -                </IconButton>
 +                    </IconButton>
 +                </Tooltip>
              </Grid>
  
          contextMenuColumn: DataColumn<any> = {

diff --combined src/views/trash-panel/trash-panel.tsx
index e627f4f26bcddbd32117934f93c08fd9fa80128f,04c1335446ba8898a6a3b18cb7df02595e241048..92febd8acf55467f960eb234ac1ecee99c6ea28a
--- 1/src/views/trash-panel/trash-panel.tsx
--- 2/src/views/trash-panel/trash-panel.tsx
+++ b/src/views/trash-panel/trash-panel.tsx
@@@ -63,20 -63,20 +63,20 @@@ export const ResourceRestore 
          const resource = getResource<TrashableResource>(props.uuid)(state.resources);
          return { resource, dispatch: props.dispatch };
      })((props: { resource?: TrashableResource, dispatch?: Dispatch<any> }) =>
 -        <IconButton onClick={() => {
 -            if (props.resource && props.dispatch) {
 -                props.dispatch(toggleTrashed(
 -                    props.resource.kind,
 -                    props.resource.uuid,
 -                    props.resource.ownerUuid,
 -                    props.resource.isTrashed
 -                ));
 -            }
 -        }}>
 -            <Tooltip title="Restore">
 +        <Tooltip title="Restore">
 +            <IconButton onClick={() => {
 +                if (props.resource && props.dispatch) {
 +                    props.dispatch(toggleTrashed(
 +                        props.resource.kind,
 +                        props.resource.uuid,
 +                        props.resource.ownerUuid,
 +                        props.resource.isTrashed
 +                    ));
 +                }
 +            }}>
                  <RestoreFromTrashIcon />
 -            </Tooltip>
 -        </IconButton>
 +            </IconButton>
 +        </Tooltip>
      );
  
  export const trashPanelColumns: DataColumns<string, TrashPanelFilter> = [
@@@ -155,23 -155,17 +155,17 @@@ export const TrashPanel = withStyles(st
      }))(
          class extends React.Component<TrashPanelProps> {
              render() {
-                 return this.hasAnyTrashedResources()
-                     ? <DataExplorer
-                         id={TRASH_PANEL_ID}
-                         onRowClick={this.handleRowClick}
-                         onRowDoubleClick={this.handleRowDoubleClick}
-                         onContextMenu={this.handleContextMenu}
-                         contextMenuColumn={false}
-                         dataTableDefaultView={<DataTableDefaultView icon={TrashIcon} />} />
-                     : <PanelDefaultView
-                         icon={TrashIcon}
-                         messages={['Your trash list is empty.']} />;
-             }
- 
-             hasAnyTrashedResources = () => {
-                 // TODO: implement check if there is anything in the trash,
-                 //       without taking pagination into the account
-                 return true;
+                 return <DataExplorer
+                     id={TRASH_PANEL_ID}
+                     onRowClick={this.handleRowClick}
+                     onRowDoubleClick={this.handleRowDoubleClick}
+                     onContextMenu={this.handleContextMenu}
+                     contextMenuColumn={false}
+                     dataTableDefaultView={
+                         <DataTableDefaultView
+                             icon={TrashIcon}
+                             messages={['Your trash list is empty.']}/>
+                     } />;
              }
  
              handleContextMenu = (event: React.MouseEvent<HTMLElement>, resourceUuid: string) => {