github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-16 10:03:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Display of album release with many countries

Browse source
This commit is contained in:
ta264 2020-12-20 21:27:26 +00:00
parent 92aae86664
commit 879038ee0b
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/Components/Form/AlbumReleaseSelectInputConnector.js
View file

@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import shortenList from 'Utilities/String/shortenList';
import titleCase from 'Utilities/String/titleCase';
import SelectInput from './SelectInput';
@ -17,7 +18,7 @@ function createMapStateToProps() {
value: `${albumRelease.title}` +
`${albumRelease.disambiguation ? ' (' : ''}${titleCase(albumRelease.disambiguation)}${albumRelease.disambiguation ? ')' : ''}` +
`, ${albumRelease.mediumCount} med, ${albumRelease.trackCount} tracks` +
`${albumRelease.country.length > 0 ? ', ' : ''}${albumRelease.country}` +
`${albumRelease.country.length > 0 ? ', ' : ''}${shortenList(albumRelease.country)}` +
`${albumRelease.format ? ', [' : ''}${albumRelease.format}${albumRelease.format ? ']' : ''}`
};
});

3
frontend/src/InteractiveImport/AlbumRelease/SelectAlbumReleaseRow.js
View file

@ -5,6 +5,7 @@ import FormInputGroup from 'Components/Form/FormInputGroup';
import TableRowCell from 'Components/Table/Cells/TableRowCell';
import TableRow from 'Components/Table/TableRow';
import { inputTypes } from 'Helpers/Props';
import shortenList from 'Utilities/String/shortenList';
import titleCase from 'Utilities/String/titleCase';
class SelectAlbumReleaseRow extends Component {
@ -63,7 +64,7 @@ class SelectAlbumReleaseRow extends Component {
value: `${r.title}` +
`${r.disambiguation ? ' (' : ''}${titleCase(r.disambiguation)}${r.disambiguation ? ')' : ''}` +
`, ${r.mediumCount} med, ${r.trackCount} tracks` +
`${r.country.length > 0 ? ', ' : ''}${r.country}` +
`${r.country.length > 0 ? ', ' : ''}${shortenList(r.country)}` +
`${r.format ? ', [' : ''}${r.format}${r.format ? ']' : ''}` +
`${r.monitored ? ', Monitored' : ''}`
}))}

7
frontend/src/Utilities/String/shortenList.js Normal file
View file

@ -0,0 +1,7 @@
export default function shortenList(input, startCount = 3, endCount = 1, separator = ', ') {
const sorted = [...input].sort();
if (sorted.length <= startCount + endCount) {
return sorted.join(separator);
}
return [...sorted.slice(0, startCount), '...', sorted.slice(-endCount)].join(separator);
}