X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/877ce2a1b858c685eec0e8f47652ebb8a271195e..20663c8f01b2f8b5d211bf070809c5f994c301bb:/src/views/project-panel/project-panel.tsx diff --git a/src/views/project-panel/project-panel.tsx b/src/views/project-panel/project-panel.tsx index 2557939616..1221d0d1fb 100644 --- a/src/views/project-panel/project-panel.tsx +++ b/src/views/project-panel/project-panel.tsx @@ -23,9 +23,23 @@ import { ProjectResource } from '~/models/project'; 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 { filterResources } from '~/store/resources/resources'; -import { PanelDefaultView } from '~/components/panel-default-view/panel-default-view'; import { DataTableDefaultView } from '~/components/data-table-default-view/data-table-default-view'; +import { StyleRulesCallback, WithStyles } from "@material-ui/core"; +import { ArvadosTheme } from "~/common/custom-theme"; +import withStyles from "@material-ui/core/styles/withStyles"; + +type CssRules = 'root' | "button"; + +const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ + root: { + position: 'relative', + width: '100%', + height: '100%' + }, + button: { + marginLeft: theme.spacing.unit + }, +}); export enum ProjectPanelColumnNames { NAME = "Name", @@ -110,30 +124,33 @@ interface ProjectPanelDataProps { resources: ResourcesState; } -type ProjectPanelProps = ProjectPanelDataProps & DispatchProp & RouteComponentProps<{ id: string }>; +type ProjectPanelProps = ProjectPanelDataProps & DispatchProp + & WithStyles & RouteComponentProps<{ id: string }>; -export const ProjectPanel = connect((state: RootState) => ({ +export const ProjectPanel = withStyles(styles)( + connect((state: RootState) => ({ currentItemId: getProperty(PROJECT_PANEL_CURRENT_UUID)(state.properties), resources: state.resources }))( class extends React.Component { render() { - return this.hasAnyItems() - ? + } /> - : ; - } - - hasAnyItems = () => { - const resources = filterResources(this.isCurrentItemChild)(this.props.resources); - return resources.length > 0; + dataTableDefaultView={ + + }/> + ; } isCurrentItemChild = (resource: Resource) => { @@ -153,6 +170,7 @@ export const ProjectPanel = connect((state: RootState) => ({ menuKind })); } + this.props.dispatch(loadDetailsPanel(resourceUuid)); } handleRowDoubleClick = (uuid: string) => { @@ -164,4 +182,5 @@ export const ProjectPanel = connect((state: RootState) => ({ } } - ); + ) +);