Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>
return ['Details', 'Versions'];
}
return ['Details', 'Versions'];
}
- getDetails(tabNumber: number) {
- switch (tabNumber) {
+ getDetails({tabNr}) {
+ switch (tabNr) {
case 0:
return this.getCollectionInfo();
case 1:
case 0:
return this.getCollectionInfo();
case 1:
import React from 'react';
import { DetailsResource } from "models/details";
import React from 'react';
import { DetailsResource } from "models/details";
+interface GetDetailsParams {
+ tabNr?: number
+ showPreview?: boolean
+}
+
export abstract class DetailsData<T extends DetailsResource = DetailsResource> {
constructor(protected item: T) { }
export abstract class DetailsData<T extends DetailsResource = DetailsResource> {
constructor(protected item: T) { }
}
abstract getIcon(className?: string): React.ReactElement<any>;
}
abstract getIcon(className?: string): React.ReactElement<any>;
- abstract getDetails(tabNr?: number): React.ReactElement<any>;
+ abstract getDetails({tabNr, showPreview}: GetDetailsParams): React.ReactElement<any>;
import { EmptyDetails } from "./empty-details";
import { DetailsData } from "./details-data";
import { DetailsResource } from "models/details";
import { EmptyDetails } from "./empty-details";
import { DetailsData } from "./details-data";
import { DetailsResource } from "models/details";
+import { Config } from 'common/config';
+import { isInlineFileUrlSafe } from "../context-menu/actions/helpers";
import { getResource } from 'store/resources/resources';
import { toggleDetailsPanel, SLIDE_TIMEOUT, openDetailsPanel } from 'store/details-panel/details-panel-action';
import { FileDetails } from 'views-components/details-panel/file-details';
import { getResource } from 'store/resources/resources';
import { toggleDetailsPanel, SLIDE_TIMEOUT, openDetailsPanel } from 'store/details-panel/details-panel-action';
import { FileDetails } from 'views-components/details-panel/file-details';
-const mapStateToProps = ({ detailsPanel, resources, collectionPanelFiles }: RootState) => {
+const mapStateToProps = ({ auth, detailsPanel, resources, collectionPanelFiles }: RootState) => {
const resource = getResource(detailsPanel.resourceUuid)(resources) as DetailsResource | undefined;
const file = resource
? undefined
: getNode(detailsPanel.resourceUuid)(collectionPanelFiles);
return {
const resource = getResource(detailsPanel.resourceUuid)(resources) as DetailsResource | undefined;
const file = resource
? undefined
: getNode(detailsPanel.resourceUuid)(collectionPanelFiles);
return {
+ authConfig: auth.config,
isOpened: detailsPanel.isOpened,
tabNr: detailsPanel.tabNr,
res: resource || (file && file.value) || EMPTY_RESOURCE,
isOpened: detailsPanel.isOpened,
tabNr: detailsPanel.tabNr,
res: resource || (file && file.value) || EMPTY_RESOURCE,
export interface DetailsPanelDataProps {
onCloseDrawer: () => void;
setActiveTab: (tabNr: number) => void;
export interface DetailsPanelDataProps {
onCloseDrawer: () => void;
setActiveTab: (tabNr: number) => void;
isOpened: boolean;
tabNr: number;
res: DetailsResource;
isOpened: boolean;
tabNr: number;
res: DetailsResource;
- const { classes, onCloseDrawer, res, tabNr } = this.props;
+ const { classes, onCloseDrawer, res, tabNr, authConfig } = this.props;
+
+ let shouldShowInlinePreview = false;
+ if (!('kind' in res)) {
+ shouldShowInlinePreview = isInlineFileUrlSafe(
+ res ? res.url : "",
+ authConfig.keepWebServiceUrl,
+ authConfig.keepWebInlineServiceUrl
+ ) || authConfig.clusterConfig.Collections.TrustAllContent;
+ }
+
const item = getItem(res);
return <Grid
container
const item = getItem(res);
return <Grid
container
</Tabs>
</Grid>
<Grid item xs className={this.props.classes.tabContainer} >
</Tabs>
</Grid>
<Grid item xs className={this.props.classes.tabContainer} >
- {item.getDetails(tabNr)}
+ {item.getDetails({tabNr, showPreview: shouldShowInlinePreview})}
return <Icon className={className} />;
}
return <Icon className={className} />;
}
+ getDetails({showPreview}) {
const { item } = this;
return item.type === CollectionFileType.FILE
? <>
<DetailsAttribute label='Size' value={formatFileSize(item.size)} />
{
const { item } = this;
return item.type === CollectionFileType.FILE
? <>
<DetailsAttribute label='Size' value={formatFileSize(item.size)} />
{
- isImage(item.url) && <>
+ isImage(item.url) && showPreview && <>
<DetailsAttribute label='Preview' />
<FileThumbnail file={item} />
</>
<DetailsAttribute label='Preview' />
<FileThumbnail file={item} />
</>