[UI Work] Artist Detail Page, Album Studio, Wanted, NavSearch, Rename

This commit is contained in:
Qstick 2017-09-11 23:11:32 -04:00
parent 456ead09da
commit 0054226307
93 changed files with 590 additions and 603 deletions

View file

@ -3,7 +3,7 @@
font-weight: bold;
}
.episodeFormat {
.trackFormat {
margin-left: 5px;
font-family: $monoSpaceFontFamily;
}

View file

@ -75,7 +75,7 @@ class OrganizePreviewModalContent extends Component {
error,
items,
renameTracks,
episodeFormat,
trackFormat,
path,
onModalClose
} = this.props;
@ -129,8 +129,8 @@ class OrganizePreviewModalContent extends Component {
<div>
Naming pattern:
<span className={styles.episodeFormat}>
{episodeFormat}
<span className={styles.trackFormat}>
{trackFormat}
</span>
</div>
</Alert>
@ -140,11 +140,11 @@ class OrganizePreviewModalContent extends Component {
items.map((item) => {
return (
<OrganizePreviewRow
key={item.episodeFileId}
id={item.episodeFileId}
key={item.trackFileId}
id={item.trackFileId}
existingPath={item.existingPath}
newPath={item.newPath}
isSelected={selectedState[item.episodeFileId]}
isSelected={selectedState[item.trackFileId]}
onSelectedChange={this.onSelectedChange}
/>
);
@ -192,7 +192,7 @@ OrganizePreviewModalContent.propTypes = {
items: PropTypes.arrayOf(PropTypes.object).isRequired,
path: PropTypes.string.isRequired,
renameTracks: PropTypes.bool,
episodeFormat: PropTypes.string,
trackFormat: PropTypes.string,
onOrganizePress: PropTypes.func.isRequired,
onModalClose: PropTypes.func.isRequired
};

View file

@ -20,7 +20,7 @@ function createMapStateToProps() {
props.isPopulated = organizePreview.isPopulated && naming.isPopulated;
props.error = organizePreview.error || naming.error;
props.renameTracks = naming.item.renameTracks;
props.episodeFormat = naming.item[`${series.seriesType}EpisodeFormat`];
props.trackFormat = naming.item['standardTrackFormat'];
props.path = series.path;
return props;
@ -41,13 +41,13 @@ class OrganizePreviewModalContentConnector extends Component {
componentDidMount() {
const {
seriesId,
seasonNumber
artistId,
albumId
} = this.props;
this.props.fetchOrganizePreview({
seriesId,
seasonNumber
artistId,
albumId
});
this.props.fetchNamingSettings();
@ -59,7 +59,7 @@ class OrganizePreviewModalContentConnector extends Component {
onOrganizePress = (files) => {
this.props.executeCommand({
name: commandNames.RENAME_FILES,
seriesId: this.props.seriesId,
artistId: this.props.artistId,
files
});
@ -80,8 +80,8 @@ class OrganizePreviewModalContentConnector extends Component {
}
OrganizePreviewModalContentConnector.propTypes = {
seriesId: PropTypes.number.isRequired,
seasonNumber: PropTypes.number,
artistId: PropTypes.number.isRequired,
albumId: PropTypes.number,
fetchOrganizePreview: PropTypes.func.isRequired,
fetchNamingSettings: PropTypes.func.isRequired,
executeCommand: PropTypes.func.isRequired,