diff options
Diffstat (limited to 'animism-align/frontend/app/views/editor/media')
4 files changed, 13 insertions, 13 deletions
diff --git a/animism-align/frontend/app/views/editor/media/components/media.form.js b/animism-align/frontend/app/views/editor/media/components/media.form.js index 2d21838..2c89fcd 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.form.js +++ b/animism-align/frontend/app/views/editor/media/components/media.form.js @@ -124,8 +124,8 @@ export default class MediaForm extends Component { } const { isNew, onSubmit } = this.props const { data } = this.state - const requiredKeys = "author title date".split(" ") - const validKeys = "type tag url title author pre_title post_title translated_title date source medium start_ts settings".split(" ") + const requiredKeys = "episode_id author title date".split(" ") + const validKeys = "episode_id type tag url title author pre_title post_title translated_title date source medium start_ts settings".split(" ") const validData = validKeys.reduce((a,b) => { a[b] = data[b]; return a }, {}) const errorFields = requiredKeys.filter(key => !validData[key]) if (errorFields.length) { diff --git a/animism-align/frontend/app/views/editor/media/components/media.indexOptions.js b/animism-align/frontend/app/views/editor/media/components/media.indexOptions.js index beb9517..a3b763b 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.indexOptions.js +++ b/animism-align/frontend/app/views/editor/media/components/media.indexOptions.js @@ -14,8 +14,8 @@ const thumbnailOptions = [ ] const sortOptions = [ - { name: 'id-asc', label: 'Most recent' }, - { name: 'id-desc', label: 'Oldest first' }, + { name: 'id-desc', label: 'Most recent' }, + { name: 'id-asc', label: 'Oldest first' }, // { name: 'username-asc', label: 'Username (A-Z)' }, // { name: 'username-desc', label: 'Username (Z-A)' }, { name: 'author-asc', label: 'Author (A-Z)' }, @@ -40,7 +40,7 @@ class IndexOptions extends Component { name={'sort'} options={sortOptions} selected={options.sort} - onChange={actions.upload.updateOption} + onChange={actions.media.updateOption} /> </div> ) @@ -48,7 +48,7 @@ class IndexOptions extends Component { } const mapStateToProps = state => ({ - options: state.upload.options, + options: state.media.options, }) export default connect(mapStateToProps)(IndexOptions) diff --git a/animism-align/frontend/app/views/editor/media/containers/media.index.js b/animism-align/frontend/app/views/editor/media/containers/media.index.js index da467fb..0fe47ef 100644 --- a/animism-align/frontend/app/views/editor/media/containers/media.index.js +++ b/animism-align/frontend/app/views/editor/media/containers/media.index.js @@ -25,12 +25,12 @@ class MediaIndex extends Component { } fetch(load_more) { - const { options, index } = this.props.media - const { order: index_order } = index - const [ sort, order ] = options.sort.split(' ') + const { options } = this.props.media + const [ sort, order ] = options.sort.split('-') actions.media.index({ - sort, order, limit: 5000, // offset: load_more ? index_order.length : 0, - }, load_more) + episode_id: this.props.episode_id, + sort, order, + }) } render() { @@ -82,7 +82,6 @@ class MediaIndex extends Component { {order.filter(id => lookup[id].type === 'file').map(id => <FileItem key={id} data={lookup[id]} />)} </div> </div> - {order.length >= 50 && <button className='loadMore' onClick={() => this.fetch(true)}>Load More</button>} </section> ) } @@ -149,6 +148,7 @@ const FileItem = ({ data }) => { const mapStateToProps = state => ({ media: state.media, + episode_id: state.site.episode.id, }) export default connect(mapStateToProps)(MediaIndex) diff --git a/animism-align/frontend/app/views/editor/media/media.reducer.js b/animism-align/frontend/app/views/editor/media/media.reducer.js index f13f9de..a4fe645 100644 --- a/animism-align/frontend/app/views/editor/media/media.reducer.js +++ b/animism-align/frontend/app/views/editor/media/media.reducer.js @@ -5,7 +5,7 @@ import { crudState, crudReducer } from 'app/api/crud.reducer' const initialState = crudState('media', { options: { - sort: 'author asc', + sort: 'id-desc', thumbnailSize: getDefault('upload.thumbnailSize', 'small'), } }) |