diff --git a/src/components/ManifestListItem.js b/src/components/ManifestListItem.js index 8e64be531fb9c9eb4dfd4fb7bc0f5a0513da01c2..348d3959e0670204651a81345d40f430fdb3124f 100644 --- a/src/components/ManifestListItem.js +++ b/src/components/ManifestListItem.js @@ -7,7 +7,7 @@ import Typography from '@material-ui/core/Typography'; import ReactPlaceholder from 'react-placeholder'; import { TextBlock, TextRow, RectShape } from 'react-placeholder/lib/placeholders'; import ManifestListItemError from '../containers/ManifestListItemError'; -import WindowIcon from './WindowIcon'; +import WindowIcon from '../containers/WindowIcon'; import ns from '../config/css-ns'; import 'react-placeholder/lib/reactPlaceholder.css'; @@ -41,7 +41,6 @@ export class ManifestListItem extends React.Component { ready, title, thumbnail, - logo, addWindow, handleClose, size, @@ -120,7 +119,7 @@ export class ManifestListItem extends React.Component { </Grid> <Grid item xs={4} sm={2}> - <WindowIcon className={ns('manifest-list-item-logo')} manifestLogo={logo} /> + <WindowIcon className={ns('manifest-list-item-logo')} manifestId={manifestId} /> </Grid> </Grid> </ReactPlaceholder> @@ -136,7 +135,6 @@ ManifestListItem.propTypes = { ready: PropTypes.bool, title: PropTypes.string, thumbnail: PropTypes.string, - logo: PropTypes.string, size: PropTypes.number, classes: PropTypes.object, // eslint-disable-line react/forbid-prop-types provider: PropTypes.string, @@ -149,7 +147,6 @@ ManifestListItem.propTypes = { ManifestListItem.defaultProps = { handleClose: () => {}, ready: false, - logo: null, thumbnail: null, title: null, classes: {}, diff --git a/src/containers/ManifestListItem.js b/src/containers/ManifestListItem.js index f8c032e9435f4a1d2e10b08e0760ae0fceaef7d0..fc21a882ec8c51137d5f6da69e20c6469a9d7cab 100644 --- a/src/containers/ManifestListItem.js +++ b/src/containers/ManifestListItem.js @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import { withNamespaces } from 'react-i18next'; import { withStyles } from '@material-ui/core'; import { - getManifestTitle, getManifestLogo, getManifestThumbnail, getManifestCanvases, getManifestProvider, + getManifestTitle, getManifestThumbnail, getManifestCanvases, getManifestProvider, } from '../state/selectors'; import * as actions from '../state/actions'; import { ManifestListItem } from '../components/ManifestListItem'; @@ -17,7 +17,6 @@ const mapStateToProps = (state, { manifestId }) => { error: manifest.error, isFetching: manifest.isFetching, title: getManifestTitle(manifest), - logo: getManifestLogo(manifest), thumbnail: getManifestThumbnail(manifest), provider: getManifestProvider(manifest), size: getManifestCanvases(manifest).length, diff --git a/src/containers/WindowIcon.js b/src/containers/WindowIcon.js index ac57448d9bb87019cd99d603ec6616c4c3fdf00c..fb31d154ac8992891d6997a332c3f3075b85f0a4 100644 --- a/src/containers/WindowIcon.js +++ b/src/containers/WindowIcon.js @@ -1,12 +1,12 @@ import { connect } from 'react-redux'; import { withStyles } from '@material-ui/core'; import { compose } from 'redux'; -import { getWindowManifest, getManifestLogo } from '../state/selectors'; +import { getManifestLogo } from '../state/selectors'; import WindowIcon from '../components/WindowIcon'; /** */ -const mapStateToProps = (state, { windowId }) => ({ - manifestLogo: getManifestLogo(getWindowManifest(state, windowId)), +const mapStateToProps = (state, { manifestId }) => ({ + manifestLogo: getManifestLogo(state.manifests[manifestId]), }); const styles = {