From: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
Date: Fri, 17 Dec 2021 23:09:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/main' into 18207-Workbench2-is-not-clearing... 
X-Git-Tag: 2.4.0~17^2~4
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/394ebdfd13fe40a7096f484c46a353d2537f4c9a

Merge remote-tracking branch 'origin/main' into 18207-Workbench2-is-not-clearing-the-project-content-when-switching

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

394ebdfd13fe40a7096f484c46a353d2537f4c9a
diff --cc src/views-components/context-menu/action-sets/collection-files-action-set.ts
index 3aeec4c0,59a5f368..7e08eef0
--- a/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 80663330,4a3f60a6..ab11593d
--- a/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}