Add AlbumCutoffService and Refactor UI

This commit is contained in:
Qstick 2017-10-17 00:05:03 -04:00
parent 8683c92de6
commit eaba78ad4a
6 changed files with 192 additions and 61 deletions

View file

@ -76,19 +76,19 @@ export const defaultState = {
isSortable: true,
isVisible: true
},
// {
// name: 'episode',
// label: 'Episode',
// isVisible: true
// },
{
name: 'episode',
label: 'Episode',
name: 'albumTitle',
label: 'Album Title',
isVisible: true
},
{
name: 'episodeTitle',
label: 'Episode Title',
isVisible: true
},
{
name: 'airDateUtc',
label: 'Air Date',
name: 'releaseDate',
label: 'Release Date',
isSortable: true,
isVisible: true
},
@ -97,11 +97,11 @@ export const defaultState = {
label: 'Language',
isVisible: false
},
{
name: 'status',
label: 'Status',
isVisible: true
},
// {
// name: 'status',
// label: 'Status',
// isVisible: true
// },
{
name: 'actions',
columnLabel: 'Actions',

View file

@ -3,7 +3,6 @@ import React from 'react';
import episodeEntities from 'Episode/episodeEntities';
import EpisodeTitleLink from 'Episode/EpisodeTitleLink';
import EpisodeStatusConnector from 'Episode/EpisodeStatusConnector';
import SeasonEpisodeNumber from 'Episode/SeasonEpisodeNumber';
import EpisodeSearchCellConnector from 'Episode/EpisodeSearchCellConnector';
import TrackFileLanguageConnector from 'TrackFile/TrackFileLanguageConnector';
import ArtistNameLink from 'Artist/ArtistNameLink';
@ -18,13 +17,7 @@ function CutoffUnmetRow(props) {
id,
trackFileId,
artist,
seasonNumber,
episodeNumber,
absoluteEpisodeNumber,
sceneSeasonNumber,
sceneEpisodeNumber,
sceneAbsoluteEpisodeNumber,
airDateUtc,
releaseDate,
title,
isSelected,
columns,
@ -54,33 +47,14 @@ function CutoffUnmetRow(props) {
return (
<TableRowCell key={name}>
<ArtistNameLink
titleSlug={artist.titleSlug}
title={artist.title}
nameSlug={artist.nameSlug}
artistName={artist.artistName}
/>
</TableRowCell>
);
}
if (name === 'episode') {
return (
<TableRowCell
key={name}
className={styles.episode}
>
<SeasonEpisodeNumber
seasonNumber={seasonNumber}
episodeNumber={episodeNumber}
absoluteEpisodeNumber={absoluteEpisodeNumber}
artistType={artist.artistType}
sceneSeasonNumber={sceneSeasonNumber}
sceneEpisodeNumber={sceneEpisodeNumber}
sceneAbsoluteEpisodeNumber={sceneAbsoluteEpisodeNumber}
/>
</TableRowCell>
);
}
if (name === 'episodeTitle') {
if (name === 'albumTitle') {
return (
<TableRowCell key={name}>
<EpisodeTitleLink
@ -94,11 +68,11 @@ function CutoffUnmetRow(props) {
);
}
if (name === 'airDateUtc') {
if (name === 'releaseDate') {
return (
<RelativeDateCellConnector
key={name}
date={airDateUtc}
date={releaseDate}
/>
);
}
@ -155,13 +129,7 @@ CutoffUnmetRow.propTypes = {
id: PropTypes.number.isRequired,
trackFileId: PropTypes.number,
artist: PropTypes.object.isRequired,
seasonNumber: PropTypes.number.isRequired,
episodeNumber: PropTypes.number.isRequired,
absoluteEpisodeNumber: PropTypes.number,
sceneSeasonNumber: PropTypes.number,
sceneEpisodeNumber: PropTypes.number,
sceneAbsoluteEpisodeNumber: PropTypes.number,
airDateUtc: PropTypes.string.isRequired,
releaseDate: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
isSelected: PropTypes.bool,
columns: PropTypes.arrayOf(PropTypes.object).isRequired,