ResourceLastModifiedDate,
ProcessStatus,
ResourceType,
- ResourceOwner
+ ResourceOwnerWithName
} from 'views-components/data-explorer/renderers';
import { ProjectIcon } from 'components/icon/icon';
import { ResourceName } from 'views-components/data-explorer/renderers';
import { navigateTo } from 'store/navigation/navigation-action';
import { getProperty } from 'store/properties/properties';
import { PROJECT_PANEL_CURRENT_UUID } from 'store/project-panel/project-panel-action';
-import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view';
import { ArvadosTheme } from "common/custom-theme";
import { createTree } from 'models/tree';
import {
selected: false,
configurable: true,
filters: createTree(),
- render: uuid => <ResourceOwner uuid={uuid} />
+ render: uuid => <ResourceOwnerWithName uuid={uuid} />
},
{
name: ProjectPanelColumnNames.FILE_SIZE,
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,
+ userUuid: state.auth.user!.uuid
}))(
class extends React.Component<ProjectPanelProps> {
render() {
- 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;
- }
+ const { classes } = this.props;
return <div data-cy='project-panel' className={classes.root}>
<DataExplorer
- working={loading}
id={PROJECT_PANEL_ID}
onRowClick={this.handleRowClick}
onRowDoubleClick={this.handleRowDoubleClick}
onContextMenu={this.handleContextMenu}
contextMenuColumn={true}
- dataTableDefaultView={
- <DataTableDefaultView
- icon={ProjectIcon}
- messages={DEFAULT_VIEW_MESSAGES} />
- } />
+ defaultViewIcon={ProjectIcon}
+ defaultViewMessages={DEFAULT_VIEW_MESSAGES}
+ />
</div>;
}
name: resource.name,
uuid: resource.uuid,
ownerUuid: resource.ownerUuid,
- isTrashed: ('isTrashed' in resource) ? resource.isTrashed: false,
+ isTrashed: ('isTrashed' in resource) ? resource.isTrashed : false,
kind: resource.kind,
menuKind,
description: resource.description,