Merge remote-tracking branch 'origin/main' into 18207-Workbench2-is-not-clearing...

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>

diff --cc src/components/data-table/data-table.tsx
Simple merge

diff --cc src/views-components/context-menu/action-sets/collection-files-action-set.ts
index 3aeec4c09c08ed854612ebdc3aeb55c248f406f9,59a5f368af40db783e489bd79d8543d77c66f7d9..7e08eef0ca14d6bb9e9374843a3d5f7c323e20f2
--- 1/src/views-components/context-menu/action-sets/collection-files-action-set.ts
--- 2/src/views-components/context-menu/action-sets/collection-files-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-action-set.ts
@@@ -4,7 -4,7 +4,7 @@@
  
  import { ContextMenuActionSet } from "views-components/context-menu/context-menu-action-set";
  import { collectionPanelFilesAction, openMultipleFilesRemoveDialog } from "store/collection-panel/collection-panel-files/collection-panel-files-actions";
--import { openCollectionPartialCopyDialog, openCollectionPartialCopyToSelectedCollectionDialog } from 'store/collections/collection-partial-copy-actions';
++import { openCollectionPartialCopyDialog } from 'store/collections/collection-partial-copy-actions';
  
  // These action sets are used on the multi-select actions button.
  export const readOnlyCollectionFilesActionSet: ContextMenuActionSet = [[

diff --cc src/views/project-panel/project-panel.tsx
index 80663330cc1f3ffefdf33e90937242cb0fd38533,4a3f60a619badef42c72e3b5ed5a56ba97868f3a..ab11593dd1a1f0d7da9447d49b0067c156ed5266
--- 1/src/views/project-panel/project-panel.tsx
--- 2/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@@ -151,19 -144,9 +149,19 @@@ export const ProjectPanel = withStyles(
      }))(
          class extends React.Component<ProjectPanelProps> {
              render() {
 -                const { classes } = this.props;
 +                const { classes, dataExplorerItems } = this.props;
 +                let loading = false;
 +
 +                if (dataExplorerItems.length > 0 && data === dataExplorerItems && href !== window.location.href) {
 +                    loading = true
 +                } else {
 +                    href = window.location.href;
 +                    data = dataExplorerItems;
 +                }
 +
-                 return <div className={classes.root}>
+                 return <div data-cy='project-panel' className={classes.root}>
                      <DataExplorer
 +                        working={loading}
                          id={PROJECT_PANEL_ID}
                          onRowClick={this.handleRowClick}
                          onRowDoubleClick={this.handleRowDoubleClick}