Fixed: Formatting empty size on disk values
This commit is contained in:
parent
363f8fc347
commit
cc03ce04f1
|
@ -21,7 +21,7 @@ interface RootFolderRowProps {
|
||||||
}
|
}
|
||||||
|
|
||||||
function RootFolderRow(props: RootFolderRowProps) {
|
function RootFolderRow(props: RootFolderRowProps) {
|
||||||
const { id, path, accessible, freeSpace, unmappedFolders = [] } = props;
|
const { id, path, accessible, freeSpace = 0, unmappedFolders = [] } = props;
|
||||||
|
|
||||||
const isUnavailable = !accessible;
|
const isUnavailable = !accessible;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import DescriptionList from 'Components/DescriptionList/DescriptionList';
|
import DescriptionList from 'Components/DescriptionList/DescriptionList';
|
||||||
import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
|
import DescriptionListItem from 'Components/DescriptionList/DescriptionListItem';
|
||||||
|
@ -6,14 +5,19 @@ import formatBytes from 'Utilities/Number/formatBytes';
|
||||||
import translate from 'Utilities/String/translate';
|
import translate from 'Utilities/String/translate';
|
||||||
import styles from './SeasonInfo.css';
|
import styles from './SeasonInfo.css';
|
||||||
|
|
||||||
function SeasonInfo(props) {
|
interface SeasonInfoProps {
|
||||||
const {
|
totalEpisodeCount: number;
|
||||||
|
monitoredEpisodeCount: number;
|
||||||
|
episodeFileCount: number;
|
||||||
|
sizeOnDisk: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
function SeasonInfo({
|
||||||
totalEpisodeCount,
|
totalEpisodeCount,
|
||||||
monitoredEpisodeCount,
|
monitoredEpisodeCount,
|
||||||
episodeFileCount,
|
episodeFileCount,
|
||||||
sizeOnDisk
|
sizeOnDisk,
|
||||||
} = props;
|
}: SeasonInfoProps) {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DescriptionList>
|
<DescriptionList>
|
||||||
<DescriptionListItem
|
<DescriptionListItem
|
||||||
|
@ -47,11 +51,4 @@ function SeasonInfo(props) {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
SeasonInfo.propTypes = {
|
|
||||||
totalEpisodeCount: PropTypes.number.isRequired,
|
|
||||||
monitoredEpisodeCount: PropTypes.number.isRequired,
|
|
||||||
episodeFileCount: PropTypes.number.isRequired,
|
|
||||||
sizeOnDisk: PropTypes.number.isRequired
|
|
||||||
};
|
|
||||||
|
|
||||||
export default SeasonInfo;
|
export default SeasonInfo;
|
|
@ -212,8 +212,8 @@ class SeriesDetails extends Component {
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
const {
|
const {
|
||||||
episodeFileCount,
|
episodeFileCount = 0,
|
||||||
sizeOnDisk
|
sizeOnDisk = 0
|
||||||
} = statistics;
|
} = statistics;
|
||||||
|
|
||||||
const {
|
const {
|
||||||
|
@ -454,10 +454,9 @@ class SeriesDetails extends Component {
|
||||||
name={icons.DRIVE}
|
name={icons.DRIVE}
|
||||||
size={17}
|
size={17}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<span className={styles.sizeOnDisk}>
|
<span className={styles.sizeOnDisk}>
|
||||||
{
|
{formatBytes(sizeOnDisk)}
|
||||||
formatBytes(sizeOnDisk || 0)
|
|
||||||
}
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</Label>
|
</Label>
|
||||||
|
|
|
@ -194,10 +194,12 @@ function getInfoRowProps(
|
||||||
}
|
}
|
||||||
|
|
||||||
if (name === 'sizeOnDisk') {
|
if (name === 'sizeOnDisk') {
|
||||||
|
const { sizeOnDisk = 0 } = props;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
title: translate('SizeOnDisk'),
|
title: translate('SizeOnDisk'),
|
||||||
iconName: icons.DRIVE,
|
iconName: icons.DRIVE,
|
||||||
label: formatBytes(props.sizeOnDisk),
|
label: formatBytes(sizeOnDisk),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ function SeriesIndexPosterInfo(props: SeriesIndexPosterInfoProps) {
|
||||||
added,
|
added,
|
||||||
seasonCount,
|
seasonCount,
|
||||||
path,
|
path,
|
||||||
sizeOnDisk,
|
sizeOnDisk = 0,
|
||||||
tags,
|
tags,
|
||||||
sortKey,
|
sortKey,
|
||||||
showRelativeDates,
|
showRelativeDates,
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
import { filesize } from 'filesize';
|
import { filesize } from 'filesize';
|
||||||
|
|
||||||
function formatBytes(input?: string | number) {
|
function formatBytes(input: string | number) {
|
||||||
if (!input) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
const size = Number(input);
|
const size = Number(input);
|
||||||
|
|
||||||
if (isNaN(size)) {
|
if (isNaN(size)) {
|
||||||
|
|
Loading…
Reference in New Issue