X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1a59e5dcc15a9a1aebfd15a08903fcb75efd2aac..a48138fa7227595bba0db267a4c37832cba9afa2:/src/views-components/details-panel/details-panel.tsx diff --git a/src/views-components/details-panel/details-panel.tsx b/src/views-components/details-panel/details-panel.tsx index fe434b6c73..f4aaa8436f 100644 --- a/src/views-components/details-panel/details-panel.tsx +++ b/src/views-components/details-panel/details-panel.tsx @@ -24,6 +24,8 @@ import { getResource } from '~/store/resources/resources'; import { ResourceData } from "~/store/resources-data/resources-data-reducer"; import { getResourceData } from "~/store/resources-data/resources-data"; import { toggleDetailsPanel, SLIDE_TIMEOUT } from '~/store/details-panel/details-panel-action'; +import { FileDetails } from '~/views-components/details-panel/file-details'; +import { getNode } from '~/models/tree'; type CssRules = 'root' | 'container' | 'opened' | 'headerContainer' | 'headerIcon' | 'tabContainer'; @@ -54,30 +56,36 @@ const styles: StyleRulesCallback = (theme: ArvadosTheme) => ({ }, tabContainer: { overflow: 'auto', - padding: theme.spacing.unit * 3, + padding: theme.spacing.unit * 1, }, }); -const getItem = (resource: DetailsResource, resourceData?: ResourceData): DetailsData => { - const res = resource || { kind: undefined, name: 'Projects' }; - switch (res.kind) { - case ResourceKind.PROJECT: - return new ProjectDetails(res); - case ResourceKind.COLLECTION: - return new CollectionDetails(res, resourceData); - case ResourceKind.PROCESS: - return new ProcessDetails(res); - default: - return new EmptyDetails(res as EmptyResource); +const EMPTY_RESOURCE: EmptyResource = { kind: undefined, name: 'Projects' }; + +const getItem = (res: DetailsResource, resourceData?: ResourceData): DetailsData => { + if ('kind' in res) { + switch (res.kind) { + case ResourceKind.PROJECT: + return new ProjectDetails(res); + case ResourceKind.COLLECTION: + return new CollectionDetails(res, resourceData); + case ResourceKind.PROCESS: + return new ProcessDetails(res); + default: + return new EmptyDetails(res); + } + } else { + return new FileDetails(res); } }; -const mapStateToProps = ({ detailsPanel, resources, resourcesData }: RootState) => { - const resource = getResource(detailsPanel.resourceUuid)(resources) as DetailsResource; +const mapStateToProps = ({ detailsPanel, resources, resourcesData, collectionPanelFiles }: RootState) => { + const resource = getResource(detailsPanel.resourceUuid)(resources) as DetailsResource | undefined; + const file = getNode(detailsPanel.resourceUuid)(collectionPanelFiles); const resourceData = getResourceData(detailsPanel.resourceUuid)(resourcesData); return { isOpened: detailsPanel.isOpened, - item: getItem(resource, resourceData) + item: getItem(resource || (file && file.value) || EMPTY_RESOURCE, resourceData), }; }; @@ -144,7 +152,7 @@ export const DetailsPanel = withStyles(styles)( - + {item.getTitle()}