Address PR comments

Author: bryophyta

public/video-ui/src/components/VideoUpload/AddSelfHostedAsset.jsx

@@ -17,7 +17,7 @@ export default class AddSelfHostedAsset extends React.Component {
   };
 
   render() {
-    const { video, permissions, uploading, startUpload } = this.props;
+    const { video, permissions, isUploading, startUpload } = this.props;
 
     if (!permissions || !permissions.addSelfHostedAsset) {
       return false;
@@ -34,13 +34,13 @@ export default class AddSelfHostedAsset extends React.Component {
               className="form__field__file"
               type="file"
               onChange={this.setFile}
-              disabled={uploading}
+              disabled={isUploading}
               accept="video/*,.mxf"
             />
             <button
               type="button"
               className="btn button__secondary__assets"
-              disabled={!this.state.file || uploading}
+              disabled={!this.state.file || isUploading}
               onClick={() =>
                 startUpload({
                   id: video.id,

public/video-ui/src/components/VideoUpload/YoutubeUpload.jsx

@@ -33,7 +33,7 @@ export default class YoutubeUpload extends React.Component {
               className="form__field__file"
               type="file"
               onChange={this.setFile}
-              disabled={!canUploadToYouTube || this.props.uploading}
+              disabled={!canUploadToYouTube || this.props.isUploading}
               accept="video/*,.mxf"
             />
             { !canUploadToYouTube ?
@@ -44,7 +44,7 @@ export default class YoutubeUpload extends React.Component {
             <button
               type="button"
               className="btn button__secondary__assets"
-              disabled={!canUploadToYouTube || this.props.uploading || !this.state.file}
+              disabled={!canUploadToYouTube || this.props.isUploading || !this.state.file}
               onClick={() =>
                 startUpload({
                   id: video.id,

public/video-ui/src/pages/Upload/index.tsx

@@ -14,7 +14,6 @@ import YoutubeUpload from '../../components/VideoUpload/YoutubeUpload';
 import { startVideoUpload } from '../../slices/s3Upload';
 import { fetchCategories, fetchChannels } from '../../slices/youtube';
 import { AppDispatch, RootState } from '../../util/setupStore';
-import { getStore } from '../../util/storeAccessor';
 
 export const VideoUpload = (props: { params: { id: string } }) => {
   const dispatch = useDispatch<AppDispatch>();
@@ -61,7 +60,7 @@ export const VideoUpload = (props: { params: { id: string } }) => {
     store.youtube.channels
   ]);
 
-  const uploading = store.s3Upload.status === 'uploading';
+  const isUploading = store.s3Upload.status === 'uploading';
 
   const projectId = store.video.plutoData?.projectId;
 
@@ -80,7 +79,7 @@ export const VideoUpload = (props: { params: { id: string } }) => {
               video={store.video}
               categories={store.youtube.categories}
               channels={store.youtube.channels}
-              uploading={uploading}
+              isUploading={isUploading}
               saveVideo={bindActionCreators(saveVideo, dispatch)}
               startUpload={bindActionCreators(startVideoUpload, dispatch)}
             />
@@ -90,8 +89,8 @@ export const VideoUpload = (props: { params: { id: string } }) => {
             />
             <AddSelfHostedAsset
               video={store.video}
-              permissions={getStore().getState().config.permissions}
-              uploading={uploading}
+              permissions={store.config.permissions}
+              isUploading={isUploading}
               startUpload={bindActionCreators(startVideoUpload, dispatch)}
             />
           </div>