From: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
Date: Wed, 12 Jan 2022 20:52:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/main' into 18207-Workbench2-is-not-clearing... 
X-Git-Tag: 2.4.0~17^2~3
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/c952afae1af2fb31b68be04f70bd7ae6f9d52aba?hp=-c

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>
---

c952afae1af2fb31b68be04f70bd7ae6f9d52aba
diff --combined src/views/project-panel/project-panel.tsx
index ab11593d,e08aea32..892d2819
--- a/src/views/project-panel/project-panel.tsx
+++ b/src/views/project-panel/project-panel.tsx
@@@ -131,37 -131,22 +131,37 @@@ interface ProjectPanelDataProps 
      resources: ResourcesState;
      isAdmin: boolean;
      userUuid: string;
 +    dataExplorerItems: any;
  }
  
  type ProjectPanelProps = ProjectPanelDataProps & DispatchProp
      & WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
  
 +let data: any[] = [];
 +let href: string = '';
 +
  export const ProjectPanel = withStyles(styles)(
      connect((state: RootState) => ({
          currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties),
          resources: state.resources,
          userUuid: state.auth.user!.uuid,
 +        dataExplorerItems: state.dataExplorer?.projectPanel.items,
      }))(
          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 data-cy='project-panel' className={classes.root}>
                      <DataExplorer
 +                        working={loading}
                          id={PROJECT_PANEL_ID}
                          onRowClick={this.handleRowClick}
                          onRowDoubleClick={this.handleRowDoubleClick}
@@@ -200,6 -185,7 +200,7 @@@
                          menuKind,
                          description: resource.description,
                          storageClassesDesired: (resource as CollectionResource).storageClassesDesired,
+                         properties: ('properties' in resource) ? resource.properties : {},
                      }));
                  }
                  this.props.dispatch<any>(loadDetailsPanel(resourceUuid));