From 668c9f4841e7118b98bb31d8e68640689be99830 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Sat, 22 Aug 2020 13:54:56 +0300
Subject: refactor!: simplify file operations

---
 src/containers/PollCreation/ImageInput.tsx    | 10 +++++--
 src/containers/PollCreation/PollCreation.tsx  |  2 +-
 src/containers/PollCreation/useS3Preupload.ts | 40 +++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 src/containers/PollCreation/useS3Preupload.ts

(limited to 'src/containers/PollCreation')

diff --git a/src/containers/PollCreation/ImageInput.tsx b/src/containers/PollCreation/ImageInput.tsx
index 475d527..e807865 100644
--- a/src/containers/PollCreation/ImageInput.tsx
+++ b/src/containers/PollCreation/ImageInput.tsx
@@ -10,6 +10,7 @@ import { Check, CancelOutlined } from '@material-ui/icons';
 import AttachLink from '../../components/AttachLink/AttachLink';
 import FileUpload from '../../components/FileUpload/FileUpload';
 import BackgroundImage from '../../components/Image/BackgroundImage';
+import getLocalFileUrl from '../../utils/getLocalFileUrl';
 
 interface PropTypes {
   callback: (file?: File | string) => void;
@@ -59,9 +60,12 @@ const ImageInput: React.FC<PropTypes> = ({ callback, progress }) => {
     callback(undefined);
   };
 
-  const childrenCallback = (fileUrl: string, file?: File) => {
-    setUrl(fileUrl);
-    callback(file || fileUrl);
+  const childrenCallback = (value: File | string) => {
+    if (value instanceof File) {
+      getLocalFileUrl(value).then(localUrl => setUrl(localUrl));
+    } else setUrl(value);
+
+    callback(value);
   };
 
   const Upload = (
diff --git a/src/containers/PollCreation/PollCreation.tsx b/src/containers/PollCreation/PollCreation.tsx
index 03ab905..87bdcf7 100644
--- a/src/containers/PollCreation/PollCreation.tsx
+++ b/src/containers/PollCreation/PollCreation.tsx
@@ -12,12 +12,12 @@ import {
 } from '@material-ui/core';
 import { useSnackbar } from 'notistack';
 
+import useS3Preupload from './useS3Preupload';
 import ImageInput from './ImageInput';
 import UserStrip from '../../components/UserStrip/UserStrip';
 import { post } from '../../requests';
 import { useAuth } from '../../hooks/useAuth';
 import { useFeed } from '../../hooks/APIClient';
-import useS3Preupload from '../../hooks/useS3Preupload';
 
 
 const useStyles = makeStyles(theme => ({
diff --git a/src/containers/PollCreation/useS3Preupload.ts b/src/containers/PollCreation/useS3Preupload.ts
new file mode 100644
index 0000000..ef3a408
--- /dev/null
+++ b/src/containers/PollCreation/useS3Preupload.ts
@@ -0,0 +1,40 @@
+import { useState, useCallback, useMemo } from 'react';
+import uploadFileToS3 from '../../utils/uploadFileToS3';
+
+
+interface Hook {
+  setValue: (value: File | string | undefined) => void;
+  isReady: boolean;
+  resolve: () => Promise<string>;
+  progress: number;
+}
+
+export default (): Hook => {
+  const [url, setUrl] = useState<string>();
+  const [file, setFile] = useState<File>();
+  const [progress, setProgress] = useState<number>(0);
+
+  const isReady = useMemo(() => Boolean(file || url), [file, url]);
+
+  const setValue: Hook['setValue'] = useCallback(value => {
+    if (value instanceof File) {
+      setFile(value);
+      setUrl(undefined);
+    } else {
+      setUrl(value);
+      setFile(undefined);
+    }
+  }, [setUrl, setFile]);
+
+  const resolve = useCallback(async (quality?: number): Promise<string> => {
+    if (file) return uploadFileToS3(file, quality, setProgress);
+    return url || '';
+  }, [file, url]);
+
+  return {
+    setValue,
+    isReady,
+    resolve,
+    progress
+  };
+};
-- 
cgit v1.2.3


From 66e1dfd1b726aa465969d0b7d028db8b0dfa1d0e Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Sat, 22 Aug 2020 14:16:36 +0300
Subject: fix: resolve eslint errors

---
 src/containers/PollCreation/PollCreation.tsx  | 23 ++++++++----------
 src/containers/PollCreation/useS3Preupload.ts | 35 +++++++++------------------
 2 files changed, 22 insertions(+), 36 deletions(-)

(limited to 'src/containers/PollCreation')

diff --git a/src/containers/PollCreation/PollCreation.tsx b/src/containers/PollCreation/PollCreation.tsx
index 87bdcf7..ecc6757 100644
--- a/src/containers/PollCreation/PollCreation.tsx
+++ b/src/containers/PollCreation/PollCreation.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable */
 import React from 'react';
 import Bluebird from 'bluebird';
 import { useHistory } from 'react-router-dom';
@@ -38,23 +37,21 @@ const PollCreation: React.FC = () => {
   const { user } = useAuth();
   const { mutate: updateFeed } = useFeed();
   const {
-    setValue: setLeft,
-    progress: progressLeft,
+    file: left,
+    setFile: setLeft,
     resolve: resolveLeft,
-    isReady: isLeftReady
+    progress: leftProgress
   } = useS3Preupload();
   const {
-    setValue: setRight,
-    progress: progressRight,
+    file: right,
+    setFile: setRight,
     resolve: resolveRight,
-    isReady: isRightReady
+    progress: rightProgress
   } = useS3Preupload();
 
   const handleClick = async () => {
     try {
       const [leftUrl, rightUrl] = await Bluebird.all([resolveLeft(), resolveRight()]);
-      console.log('leftUrl', leftUrl);
-      console.log('rightUrl', rightUrl);
 
       const contents = {
         left: { url: leftUrl },
@@ -79,16 +76,16 @@ const PollCreation: React.FC = () => {
         {user && <UserStrip user={user} info="" />}
         <Divider />
         <div className={classes.images}>
-          <ImageInput callback={setLeft} progress={progressLeft} />
-          <ImageInput callback={setRight} progress={progressRight} />
+          <ImageInput callback={setLeft} progress={leftProgress} />
+          <ImageInput callback={setRight} progress={rightProgress} />
         </div>
         {
-          progressLeft || progressRight
+          leftProgress || rightProgress
             ? <LinearProgress color="primary" />
             : (
               <Button
                 color="primary"
-                disabled={!(isLeftReady && isRightReady)}
+                disabled={!(left && right)}
                 variant="contained"
                 onClick={handleClick}
                 fullWidth
diff --git a/src/containers/PollCreation/useS3Preupload.ts b/src/containers/PollCreation/useS3Preupload.ts
index ef3a408..0e2a8c4 100644
--- a/src/containers/PollCreation/useS3Preupload.ts
+++ b/src/containers/PollCreation/useS3Preupload.ts
@@ -1,39 +1,28 @@
-import { useState, useCallback, useMemo } from 'react';
+import { useState, useCallback } from 'react';
 import uploadFileToS3 from '../../utils/uploadFileToS3';
 
-
 interface Hook {
-  setValue: (value: File | string | undefined) => void;
-  isReady: boolean;
+  file: File | string | undefined;
+  setFile: (value: File | string | undefined) => void;
   resolve: () => Promise<string>;
   progress: number;
 }
 
 export default (): Hook => {
-  const [url, setUrl] = useState<string>();
-  const [file, setFile] = useState<File>();
+  const [file, setFile] = useState<File | string>();
   const [progress, setProgress] = useState<number>(0);
 
-  const isReady = useMemo(() => Boolean(file || url), [file, url]);
-
-  const setValue: Hook['setValue'] = useCallback(value => {
-    if (value instanceof File) {
-      setFile(value);
-      setUrl(undefined);
-    } else {
-      setUrl(value);
-      setFile(undefined);
-    }
-  }, [setUrl, setFile]);
-
   const resolve = useCallback(async (quality?: number): Promise<string> => {
-    if (file) return uploadFileToS3(file, quality, setProgress);
-    return url || '';
-  }, [file, url]);
+    // Indicate start
+    setProgress(0.01);
+
+    if (file instanceof File) return uploadFileToS3(file, quality, setProgress);
+    return file || '';
+  }, [file]);
 
   return {
-    setValue,
-    isReady,
+    file,
+    setFile,
     resolve,
     progress
   };
-- 
cgit v1.2.3