From c84a675c07fd1997588794a26bf41c04f23c121e Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Wed, 10 Mar 2021 14:46:15 +0100
Subject: getting rid of basically all instances of bindActionCreators and
 mapDispatchToActions. hopefully never have to use these functions again

---
 .../media/components/media.formImageSelection.js   |  1 -
 .../editor/media/components/media.indexOptions.js  | 11 ++-----
 .../views/editor/media/components/media.menu.js    | 34 ++++++++++++----------
 .../views/editor/media/containers/media.edit.js    | 10 ++-----
 .../views/editor/media/containers/media.index.js   | 14 +++------
 .../app/views/editor/media/containers/media.new.js |  9 ++----
 .../app/views/editor/media/media.container.js      | 19 ++++--------
 7 files changed, 37 insertions(+), 61 deletions(-)

(limited to 'animism-align/frontend/app/views/editor/media')

diff --git a/animism-align/frontend/app/views/editor/media/components/media.formImageSelection.js b/animism-align/frontend/app/views/editor/media/components/media.formImageSelection.js
index 966eb58..b601304 100644
--- a/animism-align/frontend/app/views/editor/media/components/media.formImageSelection.js
+++ b/animism-align/frontend/app/views/editor/media/components/media.formImageSelection.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 toBlob from 'data-uri-to-blob'
 
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 d8187c9..beb9517 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
@@ -1,6 +1,4 @@
 import React, { Component } from 'react'
-import { Link } from 'react-router-dom'
-import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 
 import actions from 'app/actions'
@@ -18,8 +16,8 @@ const thumbnailOptions = [
 const sortOptions = [
   { name: 'id-asc', label: 'Most recent' },
   { name: 'id-desc', label: 'Oldest first' },
-  { name: 'username-asc', label: 'Username (A-Z)' },
-  { name: 'username-desc', label: 'Username (Z-A)' },
+  // { name: 'username-asc', label: 'Username (A-Z)' },
+  // { name: 'username-desc', label: 'Username (Z-A)' },
   { name: 'author-asc', label: 'Author (A-Z)' },
   { name: 'author-desc', label: 'Author (Z-A)' },
   { name: 'title-asc', label: 'Title (A-Z)' },
@@ -53,7 +51,4 @@ const mapStateToProps = state => ({
   options: state.upload.options,
 })
 
-const mapDispatchToProps = dispatch => ({
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(IndexOptions)
+export default connect(mapStateToProps)(IndexOptions)
diff --git a/animism-align/frontend/app/views/editor/media/components/media.menu.js b/animism-align/frontend/app/views/editor/media/components/media.menu.js
index b782cdc..9a15354 100644
--- a/animism-align/frontend/app/views/editor/media/components/media.menu.js
+++ b/animism-align/frontend/app/views/editor/media/components/media.menu.js
@@ -1,35 +1,36 @@
 import React, { Component } from 'react'
-import { Route, Link } from 'react-router-dom'
+import { Route } from 'react-router-dom'
 import { connect } from 'react-redux'
 
 import { history } from 'app/store'
 import actions from 'app/actions'
-import { MenuButton, FileInput } from 'app/common'
+import { MenuButton } from 'app/common'
 
 const mapStateToProps = state => ({
   media: state.media,
+  episode_id: state.site.episode.id,
 })
 
 export default class MediaMenu extends Component {
   render() {
     return (
       <div className='menuButtons'>
-        <Route exact path='/media/:id/show/' component={MediaShowMenu} />
-        <Route exact path='/media/:id/edit/' component={MediaEditMenu} />
-        <Route exact path='/media/new/' component={MediaNewMenu} />
-        <Route exact path='/media/' component={MediaIndexMenu} />
+        <Route exact path='/editor/:episode_id/media/:id/show/' component={MediaShowMenu} />
+        <Route exact path='/editor/:episode_id/media/:id/edit/' component={MediaEditMenu} />
+        <Route exact path='/editor/:episode_id/media/new/' component={MediaNewMenu} />
+        <Route exact path='/editor/:episode_id/media/' component={MediaIndexMenu} />
       </div>
     )
   }
 }
 
-const MediaIndexMenu = () => ([
-  <MenuButton key='new' name="new" href="/media/new/" />,
-])
+const MediaIndexMenu = connect(mapStateToProps)((props) => ([
+  <MenuButton key='new' name="new" href={`/editor/${props.episode_id}/media/new/`} />,
+]))
 
 const MediaShowMenu = connect(mapStateToProps)((props) => ([
-  <MenuButton key='back' name="back" href="/media/" />,
-  <MenuButton key='edit' name="edit" href={"/media/" + props.match.params.id + "/edit/"} />,
+  <MenuButton key='back' name="back" href={`/editor/${props.episode_id}/media/`} />,
+  <MenuButton key='edit' name="edit" href={`/editor/${props.episode_id}/media/${props.match.params.id}/edit/`} />,
   <MenuButton key='delete' name="delete" onClick={() => {
     const { res: media } = props.media.show
     if (confirm("Really delete this media?")) {
@@ -40,13 +41,13 @@ const MediaShowMenu = connect(mapStateToProps)((props) => ([
   }} />,
 ]))
 
-const MediaNewMenu = (props) => ([
-  <MenuButton key='back' name="back" href="/media/" />,
-])
+const MediaNewMenu = connect(mapStateToProps)((props) => ([
+  <MenuButton key='back' name="back" href={`/editor/${props.episode_id}/media/`} />,
+]))
 
 const MediaEditMenu = connect(mapStateToProps)((props) => ([
-  <MenuButton key='back' name="back" href="/media/" />,
-  <MenuButton key='copy' name="copy" href={"/media/" + props.match.params.id + '/copy/'} label="Make a copy" />,
+  <MenuButton key='back' name="back" href={`/editor/${props.episode_id}/media/`} />,
+  <MenuButton key='copy' name="copy" href={`/editor/${props.episode_id}/media/${props.match.params.id}/copy/`} label="Make a copy" />,
   <MenuButton key='delete' name="delete" onClick={() => {
     const { res: media } = props.media.show
     if (confirm("Really delete this media?")) {
@@ -56,3 +57,4 @@ const MediaEditMenu = connect(mapStateToProps)((props) => ([
     }
   }} />,
 ]))
+
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)
diff --git a/animism-align/frontend/app/views/editor/media/media.container.js b/animism-align/frontend/app/views/editor/media/media.container.js
index b597a6c..007c616 100644
--- a/animism-align/frontend/app/views/editor/media/media.container.js
+++ b/animism-align/frontend/app/views/editor/media/media.container.js
@@ -1,12 +1,9 @@
 import React, { Component } from 'react'
-import { Route, Link } from 'react-router-dom'
-import { bindActionCreators } from 'redux'
+import { Route } from 'react-router-dom'
 import { connect } from 'react-redux'
 
 import './media.css'
 
-import actions from 'app/actions'
-
 import MediaIndex from './containers/media.index'
 // import MediaShow from './containers/media.show'
 import MediaNew from './containers/media.new'
@@ -16,10 +13,10 @@ class Container extends Component {
   render() {
     return (
       <div className='media'>
-        <Route exact path='/media/:id/copy/' component={MediaNew} />
-        <Route exact path='/media/:id/edit/' component={MediaEdit} />
-        <Route exact path='/media/new/' component={MediaNew} />
-        <Route exact path='/media/' component={MediaIndex} />
+        <Route exact path='/editor/:episode_id/media/:id/copy/' component={MediaNew} />
+        <Route exact path='/editor/:episode_id/media/:id/edit/' component={MediaEdit} />
+        <Route exact path='/editor/:episode_id/media/new/' component={MediaNew} />
+        <Route exact path='/editor/:episode_id/media/' component={MediaIndex} />
       </div>
     )
   }
@@ -31,8 +28,4 @@ const mapStateToProps = state => ({
   media: state.media,
 })
 
-const mapDispatchToProps = dispatch => ({
-  // uploadActions: bindActionCreators({ ...uploadActions }, dispatch),
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(Container)
+export default connect(mapStateToProps)(Container)
-- 
cgit v1.2.3-70-g09d2