From d255edebd48ed8195b6c9590e545ea4345306c03 Mon Sep 17 00:00:00 2001
From: cv <34649812+cpvalente@users.noreply.github.com>
Date: Tue, 8 Jun 2021 23:26:18 +0200
Subject: [PATCH] refract: simpler upload

- also reverting deleting the file that is uploaded
---
 client/src/features/editors/Editor.jsx     |  2 +-
 client/src/features/menu/MenuBar.jsx       | 64 ++++++++++++----------
 server/src/controllers/ontimeController.js |  3 +
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/client/src/features/editors/Editor.jsx b/client/src/features/editors/Editor.jsx
index 7490f0439..fc2660a54 100644
--- a/client/src/features/editors/Editor.jsx
+++ b/client/src/features/editors/Editor.jsx
@@ -24,7 +24,7 @@ export default function Editor() {
 
       <div className={styles.mainContainer}>
         <Box id='settings' className={styles.settings}>
-          <MenuBar onOpen={onOpen} onClose={onClose} />
+          <MenuBar onOpen={onOpen} />
         </Box>
 
         <Box className={styles.editor}>
diff --git a/client/src/features/menu/MenuBar.jsx b/client/src/features/menu/MenuBar.jsx
index 3d32ea0bf..1dae90257 100644
--- a/client/src/features/menu/MenuBar.jsx
+++ b/client/src/features/menu/MenuBar.jsx
@@ -1,5 +1,9 @@
 import { useMutation, useQueryClient } from 'react-query';
-import { downloadEvents, uploadEventsWithPath } from 'app/api/ontimeApi';
+import {
+  downloadEvents,
+  uploadEvents,
+  uploadEventsWithPath,
+} from 'app/api/ontimeApi';
 import { EVENTS_TABLE } from 'app/api/apiConstants';
 import DownloadIconBtn from './buttons/DownloadIconBtn';
 import SettingsIconBtn from './buttons/SettingsIconBtn';
@@ -10,13 +14,15 @@ import QuitIconBtn from './buttons/QuitIconBtn';
 import style from './MenuBar.module.css';
 import HelpIconBtn from './buttons/HelpIconBtn';
 import UploadIconBtn from './buttons/UploadIconBtn';
+import { useRef } from 'react';
 
-const { ipcRenderer, remote } = window.require('electron');
+const { ipcRenderer } = window.require('electron');
 
 export default function MenuBar(props) {
-  const { onOpen, onClose } = props;
+  const { onOpen } = props;
+  const hiddenFileInput = useRef(null);
   const queryClient = useQueryClient();
-  const uploaddbPath = useMutation(uploadEventsWithPath, {
+  const uploaddb = useMutation(uploadEvents, {
     onSettled: () => {
       queryClient.invalidateQueries(EVENTS_TABLE);
     },
@@ -26,30 +32,22 @@ export default function MenuBar(props) {
     downloadEvents();
   };
 
-  const handleUpload = () => {
-    remote.dialog
-      .showOpenDialog({
-        title: 'Select the File to be uploaded',
-        buttonLabel: 'Upload',
-        filters: [
-          {
-            name: 'Text Files',
-            extensions: ['json'],
-          },
-        ],
-        // Specifying the File Selector Property
-        properties: ['openFile'],
-      })
-      .then((file) => {
-        // Stating whether dialog operation was
-        // cancelled or not.
-        if (!file.canceled) {
-          uploaddbPath.mutate(file.filePaths[0].toString());
-        }
-      })
-      .catch((err) => {
-        console.log(err);
-      });
+  const handleClick = () => {
+    if (hiddenFileInput && hiddenFileInput.current) {
+      hiddenFileInput.current.click();
+    }
+  };
+
+  const handleUpload = (event) => {
+    const fileUploaded = event.target.files[0];
+
+    if (fileUploaded == null) return;
+
+    try {
+      uploaddb.mutate(fileUploaded);
+    } catch (error) {
+      console.log(error);
+    }
   };
 
   const handleIPC = (action) => {
@@ -89,6 +87,7 @@ export default function MenuBar(props) {
         style={{ fontSize: '1.5em' }}
         size='lg'
         clickhandler={() => handleIPC('help')}
+        disabled
       />
       <SettingsIconBtn style={{ fontSize: '1.5em' }} size='lg' disabled />
       <div className={style.gap} />
@@ -97,10 +96,17 @@ export default function MenuBar(props) {
         size='lg'
         clickhandler={onOpen}
       />
+      <input
+        type='file'
+        style={{ display: 'none' }}
+        ref={hiddenFileInput}
+        onChange={handleUpload}
+        accept='.json'
+      />
       <UploadIconBtn
         style={{ fontSize: '1.5em' }}
         size='lg'
-        clickhandler={handleUpload}
+        clickhandler={handleClick}
       />
       <DownloadIconBtn
         style={{ fontSize: '1.5em' }}
diff --git a/server/src/controllers/ontimeController.js b/server/src/controllers/ontimeController.js
index ed5a8dd9c..99126e19f 100644
--- a/server/src/controllers/ontimeController.js
+++ b/server/src/controllers/ontimeController.js
@@ -115,6 +115,9 @@ const upload = async (file, req, res) => {
     const rawdata = fs.readFileSync(file);
     const uploadedJson = JSON.parse(rawdata);
 
+    // delete file
+    deleteFile(file);
+
     // check version
     if (uploadedJson.settings.version === 1) parsev1(uploadedJson);
     else {