Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mirador Video
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
IIIF
Mirador
Mirador Video
Commits
cb7f6108
Commit
cb7f6108
authored
6 years ago
by
Jack Reed
Browse files
Options
Downloads
Patches
Plain Diff
use container to select logo
parent
8dc112de
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/components/ManifestListItem.js
+2
-5
2 additions, 5 deletions
src/components/ManifestListItem.js
src/containers/ManifestListItem.js
+1
-2
1 addition, 2 deletions
src/containers/ManifestListItem.js
src/containers/WindowIcon.js
+3
-3
3 additions, 3 deletions
src/containers/WindowIcon.js
with
6 additions
and
10 deletions
src/components/ManifestListItem.js
+
2
−
5
View file @
cb7f6108
...
...
@@ -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
'
)}
manifest
Logo
=
{
logo
}
/
>
<
WindowIcon
className
=
{
ns
(
'
manifest-list-item-logo
'
)}
manifest
Id
=
{
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
:
{},
...
...
This diff is collapsed.
Click to expand it.
src/containers/ManifestListItem.js
+
1
−
2
View file @
cb7f6108
...
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
src/containers/WindowIcon.js
+
3
−
3
View file @
cb7f6108
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
,
{
window
Id
})
=>
({
manifestLogo
:
getManifestLogo
(
getWindowManifest
(
state
,
window
Id
)
),
const
mapStateToProps
=
(
state
,
{
manifest
Id
})
=>
({
manifestLogo
:
getManifestLogo
(
state
.
manifests
[
manifest
Id
]
),
});
const
styles
=
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment