getting rid of basically all instances of bindActionCreators and mapDispatchToActions. hopefully never have to use these functions again

3 files changed, 10 insertions, 23 deletions

diff --git a/animism-align/frontend/app/views/editor/media/containers/media.edit.js b/animism-align/frontend/app/views/editor/media/containers/media.edit.js
index cf5f671..37a91ef 100644
--- a/animism-align/frontend/app/views/editor/media/containers/media.edit.js
+++ b/animism-align/frontend/app/views/editor/media/containers/media.edit.js
@@ -1,5 +1,4 @@
 import React, { Component } from 'react'
-import { Link } from 'react-router-dom'
 import { connect } from 'react-redux'
 
 import { history } from 'app/store'
@@ -21,7 +20,7 @@ class MediaEdit extends Component {
       .then(response => {
         // response
         console.log(response)
-        history.push('/media/')
+        history.push(`/editor/${this.state.episode_id}/media/`)
       })
   }
 
@@ -48,10 +47,7 @@ class MediaEdit extends Component {
 
 const mapStateToProps = state => ({
   media: state.media,
+  episode_id: state.site.episode.id,
 })
 
-const mapDispatchToProps = dispatch => ({
-  // mediaActions: bindActionCreators({ ...mediaActions }, dispatch),
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(MediaEdit)
+export default connect(mapStateToProps)(MediaEdit)
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 da94d3c..da467fb 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
@@ -1,6 +1,5 @@
 import React, { Component } from 'react'
 import { Link } from 'react-router-dom'
-import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 
 import { formatDateTime } from 'app/utils'
@@ -35,7 +34,6 @@ class MediaIndex extends Component {
   }
 
   render() {
-    const { mediaActions } = this.props
     const { options } = this.props.media
     const { loading, lookup, order } = this.props.media.index
     if (loading) {
@@ -95,7 +93,7 @@ const MediaItem = ({ data }) => {
   return (
     <div className='cell'>
       <div className='img'>
-        <Link to={"/media/" + data.id + "/edit/"}>
+        <Link to={`/editor/${data.episode_id}/media/${data.id}/edit/`}>
           <img src={thumbnailURL(data)} alt={data.title} />
         </Link>
       </div>
@@ -116,7 +114,7 @@ const GalleryItem = ({ data }) => {
     <div className='cell'>
       <div className='meta center'>
         <div className='img'>
-          <Link to={"/media/" + data.id + "/edit/"}>
+          <Link to={`/editor/${data.episode_id}/media/${data.id}/edit/`}>
             <img src={thumbnailURL(data)} alt={data.title} />
           </Link>
         </div>
@@ -137,7 +135,7 @@ const FileItem = ({ data }) => {
   return (
     <div className='cell'>
       <div className='meta center'>
-        <Link to={"/media/" + data.id + "/edit/"}>
+        <Link to={`/editor/${data.episode_id}/media/${data.id}/edit/`}>
           <div>
             <i>{data.title}</i><br />
             {data.settings.file.url}<br />
@@ -153,8 +151,4 @@ const mapStateToProps = state => ({
   media: state.media,
 })
 
-const mapDispatchToProps = dispatch => ({
-  // uploadActions: bindActionCreators({ ...uploadActions }, dispatch),
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(MediaIndex)
+export default connect(mapStateToProps)(MediaIndex)
diff --git a/animism-align/frontend/app/views/editor/media/containers/media.new.js b/animism-align/frontend/app/views/editor/media/containers/media.new.js
index c193c2f..1a41503 100644
--- a/animism-align/frontend/app/views/editor/media/containers/media.new.js
+++ b/animism-align/frontend/app/views/editor/media/containers/media.new.js
@@ -33,7 +33,7 @@ class MediaNew extends Component {
         })
       })
     } else {
-      this.setState({ loading: false })
+      this.setState({ loading: false, initialData: { episode_id: this.state.episode_id } })
     }
   }
 
@@ -72,10 +72,7 @@ class MediaNew extends Component {
 
 const mapStateToProps = state => ({
   media: state.media,
+  episode_id: state.site.episode.id,
 })
 
-const mapDispatchToProps = dispatch => ({
-  // uploadActions: bindActionCreators({ ...uploadActions }, dispatch),
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(MediaNew)
+export default connect(mapStateToProps)(MediaNew)