secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Tidying up load checkers

Browse Source
This commit is contained in:
James Barnsley
2021-02-01 11:16:31 +13:00
parent 1c6426d568
commit a58d4ba56e
18 changed files with 2151 additions and 1124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/views/Artist.js
View File

@ -486,9 +486,10 @@ class Artist extends React.Component {
history,
} = this.props;
if (loading) {
return <Loader body loading />;
} else if (!artist) {
if (!artist) {
if (loading) {
return <Loader body loading />;
}
return (
<ErrorMessage type="not-found" title="Not found">
<p>
@ -604,7 +605,7 @@ class Artist extends React.Component {
const mapStateToProps = (state, ownProps) => {
const uri = decodeURIComponent(ownProps.match.params.uri);
const loadingSelector = makeLoadingSelector([`(.*)${uri}(.*)`, '^((?!contains).)*$', '^((?!/albums).)*$', '^((?!related-artists).)*$', '^((?!top-tracks).)*$']);
const loadingSelector = makeLoadingSelector([`(.*)${uri}(.*)`, '^((?!contains).)*$', '^((?!albums).)*$', '^((?!related-artists).)*$', '^((?!top-tracks).)*$']);
const artistSelector = makeItemSelector(uri);
const artist = artistSelector(state);
let albums = null;