From 3a64e2dccf1c879db0aee29c563ed8ffae901e99 Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Sun, 25 Feb 2018 17:38:14 -0800
Subject: [PATCH 1/2] added clearFile action to file selection error

---
 react/containers/Dropzone/index.js    |  3 +-
 react/containers/Dropzone/view.jsx    | 56 +++++++++++++--------------
 react/containers/PublishForm/view.jsx | 32 +++++++--------
 3 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/react/containers/Dropzone/index.js b/react/containers/Dropzone/index.js
index 07cc66e0..c66d30a1 100644
--- a/react/containers/Dropzone/index.js
+++ b/react/containers/Dropzone/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { selectFile, updateError } from 'actions/publish';
+import { selectFile, updateError, clearFile } from 'actions/publish';
 import View from './view';
 
 const mapStateToProps = ({ publish }) => {
@@ -17,6 +17,7 @@ const mapDispatchToProps = dispatch => {
       dispatch(updateError('publishSubmit', null));
     },
     onFileError: (value) => {
+      dispatch(clearFile());
       dispatch(updateError('file', value));
     },
   };
diff --git a/react/containers/Dropzone/view.jsx b/react/containers/Dropzone/view.jsx
index 90b7c2a4..7c9a0dd7 100644
--- a/react/containers/Dropzone/view.jsx
+++ b/react/containers/Dropzone/view.jsx
@@ -83,11 +83,11 @@ class Dropzone extends React.Component {
   }
   render () {
     return (
-      <div className="row row--tall flex-container--column">
+      <div className='row row--tall flex-container--column'>
         <form>
-          <input className="input-file" type="file" id="file_input" name="file_input" accept="video/*,image/*" onChange={this.handleFileInput} encType="multipart/form-data"/>
+          <input className='input-file' type='file' id='file_input' name='file_input' accept='video/*,image/*' onChange={this.handleFileInput} encType='multipart/form-data' />
         </form>
-        <div id="preview-dropzone" className={'row row--padded row--tall dropzone' + (this.state.dragOver ? ' dropzone--drag-over' : '')} onDrop={this.handleDrop} onDragOver={this.handleDragOver} onDragEnd={this.handleDragEnd} onDragEnter={this.handleDragEnter} onDragLeave={this.handleDragLeave} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} onClick={this.handleClick}>
+        <div id='preview-dropzone' className={'row row--padded row--tall dropzone' + (this.state.dragOver ? ' dropzone--drag-over' : '')} onDrop={this.handleDrop} onDragOver={this.handleDragOver} onDragEnd={this.handleDragEnd} onDragEnter={this.handleDragEnter} onDragLeave={this.handleDragLeave} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} onClick={this.handleClick}>
           {this.props.file ? (
             <div>
               <Preview
@@ -95,38 +95,38 @@ class Dropzone extends React.Component {
                 file={this.props.file}
                 thumbnail={this.props.thumbnail}
               />
-              <div id="dropzone-text-holder" className={'flex-container--column flex-container--center-center'}>
-              { this.state.dragOver ? (
-                <div id="dropzone-dragover">
-                  <p className="blue">Drop it.</p>
-                </div>
-              ) : (
-                null
-              )}
-              { this.state.mouseOver ? (
-                <div id="dropzone-instructions">
-                  <p className="info-message-placeholder info-message--failure" id="input-error-file-selection">{this.props.fileError}</p>
-                  <p>Drag & drop image or video here to publish</p>
-                  <p className="fine-print">OR</p>
-                  <p className="blue--underlined">CHOOSE FILE</p>
-                </div>
-              ) : (
-                null
-              )}
+              <div id='dropzone-text-holder' className={'flex-container--column flex-container--center-center'}>
+                { this.state.dragOver ? (
+                  <div id='dropzone-dragover'>
+                    <p className='blue'>Drop it.</p>
+                  </div>
+                ) : (
+                  null
+                )}
+                { this.state.mouseOver ? (
+                  <div id='dropzone-instructions'>
+                    <p className='info-message-placeholder info-message--failure' id='input-error-file-selection'>{this.props.fileError}</p>
+                    <p>Drag & drop image or video here to publish</p>
+                    <p className='fine-print'>OR</p>
+                    <p className='blue--underlined'>CHOOSE FILE</p>
+                  </div>
+                ) : (
+                  null
+                )}
               </div>
             </div>
           ) : (
-            <div id="dropzone-text-holder" className={'flex-container--column flex-container--center-center'}>
+            <div id='dropzone-text-holder' className={'flex-container--column flex-container--center-center'}>
               { this.state.dragOver ? (
-                <div id="dropzone-dragover">
-                  <p className="blue">Drop it.</p>
+                <div id='dropzone-dragover'>
+                  <p className='blue'>Drop it.</p>
                 </div>
               ) : (
-                <div id="dropzone-instructions">
-                  <p className="info-message-placeholder info-message--failure" id="input-error-file-selection">{this.props.fileError}</p>
+                <div id='dropzone-instructions'>
+                  <p className='info-message-placeholder info-message--failure' id='input-error-file-selection'>{this.props.fileError}</p>
                   <p>Drag & drop image or video here to publish</p>
-                  <p className="fine-print">OR</p>
-                  <p className="blue--underlined">CHOOSE FILE</p>
+                  <p className='fine-print'>OR</p>
+                  <p className='blue--underlined'>CHOOSE FILE</p>
                 </div>
               )}
             </div>
diff --git a/react/containers/PublishForm/view.jsx b/react/containers/PublishForm/view.jsx
index 366e86ba..45cf367d 100644
--- a/react/containers/PublishForm/view.jsx
+++ b/react/containers/PublishForm/view.jsx
@@ -128,39 +128,39 @@ class PublishForm extends React.Component {
   }
   render () {
     return (
-      <div className="row row--no-bottom">
-        <div className="column column--10">
+      <div className='row row--no-bottom'>
+        <div className='column column--10'>
           <PublishTitleInput />
         </div>
-        <div className="column column--5 column--sml-10" >
-          <div className="row row--padded">
+        <div className='column column--5 column--sml-10' >
+          <div className='row row--padded'>
             <Dropzone />
           </div>
         </div>
-        <div className="column column--5 column--sml-10 align-content-top">
-          <div id="publish-active-area" className="row row--padded">
-            <div className="row row--padded row--no-top row--wide">
+        <div className='column column--5 column--sml-10 align-content-top'>
+          <div id='publish-active-area' className='row row--padded'>
+            <div className='row row--padded row--no-top row--wide'>
               <PublishUrlInput />
             </div>
-            <div className="row row--padded row--no-top row--wide">
+            <div className='row row--padded row--no-top row--wide'>
               <ChannelSelect />
             </div>
             { (this.props.file.type === 'video/mp4') && (
-              <div className="row row--padded row--no-top row--wide ">
+              <div className='row row--padded row--no-top row--wide '>
                 <PublishThumbnailInput />
               </div>
             )}
-            <div className="row row--padded row--no-top row--no-bottom row--wide">
+            <div className='row row--padded row--no-top row--no-bottom row--wide'>
               <PublishMetadataInputs />
             </div>
-            <div className="row row--wide align-content-center">
-              <button id="publish-submit" className="button--primary button--large" onClick={this.publish}>Publish</button>
+            <div className='row row--wide align-content-center'>
+              <button id='publish-submit' className='button--primary button--large' onClick={this.publish}>Publish</button>
             </div>
-            <div className="row row--padded row--no-bottom align-content-center">
-              <button className="button--cancel" onClick={this.props.onFileClear}>Cancel</button>
+            <div className='row row--padded row--no-bottom align-content-center'>
+              <button className='button--cancel' onClick={this.props.onFileClear}>Cancel</button>
             </div>
-            <div className="row row--short align-content-center">
-              <p className="fine-print">By clicking 'Publish', you affirm that you have the rights to publish this content to the LBRY network, and that you understand the properties of publishing it to a decentralized, user-controlled network. <a className="link--primary" target="_blank" href="https://lbry.io/learn">Read more.</a></p>
+            <div className='row row--short align-content-center'>
+              <p className='fine-print'>By clicking 'Publish', you affirm that you have the rights to publish this content to the LBRY network, and that you understand the properties of publishing it to a decentralized, user-controlled network. <a className='link--primary' target='_blank' href='https://lbry.io/learn'>Read more.</a></p>
             </div>
           </div>
         </div>

From d4fabe347313b8046d1b94fdead84334696ff0fe Mon Sep 17 00:00:00 2001
From: bill bittner <bittner.w@gmail.com>
Date: Sun, 25 Feb 2018 17:47:22 -0800
Subject: [PATCH 2/2] removed unneeded actions from publish form

---
 react/containers/Dropzone/index.js    | 7 +++++--
 react/containers/Dropzone/view.jsx    | 6 +++---
 react/containers/PublishForm/index.js | 9 +--------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/react/containers/Dropzone/index.js b/react/containers/Dropzone/index.js
index c66d30a1..1faeb20c 100644
--- a/react/containers/Dropzone/index.js
+++ b/react/containers/Dropzone/index.js
@@ -12,14 +12,17 @@ const mapStateToProps = ({ publish }) => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    onFileSelect: (file) => {
+    selectFile: (file) => {
       dispatch(selectFile(file));
       dispatch(updateError('publishSubmit', null));
     },
-    onFileError: (value) => {
+    setFileError: (value) => {
       dispatch(clearFile());
       dispatch(updateError('file', value));
     },
+    clearFileError: () => {
+      dispatch(updateError('file', null));
+    },
   };
 };
 
diff --git a/react/containers/Dropzone/view.jsx b/react/containers/Dropzone/view.jsx
index 7c9a0dd7..be5a9af1 100644
--- a/react/containers/Dropzone/view.jsx
+++ b/react/containers/Dropzone/view.jsx
@@ -74,11 +74,11 @@ class Dropzone extends React.Component {
       try {
         validateFile(file); // validate the file's name, type, and size
       } catch (error) {
-        return this.props.onFileError(error.message);
+        return this.props.setFileError(error.message);
       }
       // stage it so it will be ready when the publish button is clicked
-      this.props.onFileError(null);
-      this.props.onFileSelect(file);
+      this.props.clearFileError(null);
+      this.props.selectFile(file);
     }
   }
   render () {
diff --git a/react/containers/PublishForm/index.js b/react/containers/PublishForm/index.js
index df1614b6..e0bc4473 100644
--- a/react/containers/PublishForm/index.js
+++ b/react/containers/PublishForm/index.js
@@ -1,6 +1,5 @@
 import {connect} from 'react-redux';
-import {clearFile, selectFile, updateError, updatePublishStatus} from 'actions/publish';
-import {updateLoggedInChannel} from 'actions/channel';
+import {clearFile, updateError, updatePublishStatus} from 'actions/publish';
 import View from './view';
 
 const mapStateToProps = ({ channel, publish }) => {
@@ -23,15 +22,9 @@ const mapStateToProps = ({ channel, publish }) => {
 
 const mapDispatchToProps = dispatch => {
   return {
-    onFileSelect: (file) => {
-      dispatch(selectFile(file));
-    },
     onFileClear: () => {
       dispatch(clearFile());
     },
-    onChannelLogin: (name, shortId, longId) => {
-      dispatch(updateLoggedInChannel(name, shortId, longId));
-    },
     onPublishStatusChange: (status, message) => {
       dispatch(updatePublishStatus(status, message));
     },