1 files changed, 17 insertions, 17 deletions

diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 391f67bbb..c3b8643d3 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -11,7 +11,7 @@ import RouteSubscriber from '../RouteSubscriber';
 import { AcceptableMedia, Upload } from '../SharedMediaTypes';
 import ApiManager, { Registration } from './ApiManager';
 import { SolrManager } from './SearchManager';
-import v4 = require('uuid/v4');
+import * as uuid from 'uuid';
 import { DashVersion } from '../../fields/DocSymbols';
 const AdmZip = require('adm-zip');
 const imageDataUri = require('image-data-uri');
@@ -63,7 +63,7 @@ export default class UploadManager extends ApiManager {
             method: Method.POST,
             subscription: '/uploadFormData',
             secureHandler: async ({ req, res }) => {
-                const form = new formidable.IncomingForm();
+                const form = new formidable.IncomingForm({ keepExtensions: true, uploadDir: pathToDirectory(Directory.parsed_files) });
                 let fileguids = '';
                 let filesize = '';
                 form.on('field', (e: string, value: string) => {
@@ -77,19 +77,19 @@ export default class UploadManager extends ApiManager {
                 fileguids.split(';').map(guid => DashUploadUtils.uploadProgress.set(guid, `upload starting`));
 
                 form.on('progress', e => fileguids.split(';').map(guid => DashUploadUtils.uploadProgress.set(guid, `read:(${Math.round((100 * +e) / +filesize)}%) ${e} of ${filesize}`)));
-                form.keepExtensions = true;
-                form.uploadDir = pathToDirectory(Directory.parsed_files);
                 return new Promise<void>(resolve => {
                     form.parse(req, async (_err, _fields, files) => {
                         const results: Upload.FileResponse[] = [];
                         if (_err?.message) {
                             results.push({
                                 source: {
+                                    filepath: '',
+                                    originalFilename: 'none',
+                                    newFilename: 'none',
+                                    mimetype: 'text',
                                     size: 0,
-                                    path: 'none',
-                                    name: 'none',
-                                    type: 'none',
-                                    toJSON: () => ({ name: 'none', path: '' }),
+                                    hashAlgorithm: 'md5',
+                                    toJSON: () => ({ name: 'none', size: 0, length: 0, mtime: new Date(), filepath: '', originalFilename: 'none', newFilename: 'none', mimetype: 'text' }),
                                 },
                                 result: { name: 'failed upload', message: `${_err.message}` },
                             });
@@ -98,8 +98,8 @@ export default class UploadManager extends ApiManager {
 
                         for (const key in files) {
                             const f = files[key];
-                            if (!Array.isArray(f)) {
-                                const result = await DashUploadUtils.upload(f, key); // key is the guid used by the client to track upload progress.
+                            if (f) {
+                                const result = await DashUploadUtils.upload(f[0], key); // key is the guid used by the client to track upload progress.
                                 result && !(result.result instanceof Error) && results.push(result);
                             }
                         }
@@ -197,15 +197,14 @@ export default class UploadManager extends ApiManager {
             method: Method.POST,
             subscription: '/uploadDoc',
             secureHandler: ({ req, res }) => {
-                const form = new formidable.IncomingForm();
-                form.keepExtensions = true;
+                const form = new formidable.IncomingForm({ keepExtensions: true });
                 // let path = req.body.path;
                 const ids: { [id: string]: string } = {};
                 let remap = true;
                 const getId = (id: string): string => {
                     if (!remap || id.endsWith('Proto')) return id;
                     if (id in ids) return ids[id];
-                    return (ids[id] = v4());
+                    return (ids[id] = uuid.v4());
                 };
                 const mapFn = (doc: any) => {
                     if (doc.id) {
@@ -245,15 +244,16 @@ export default class UploadManager extends ApiManager {
                 };
                 return new Promise<void>(resolve => {
                     form.parse(req, async (_err, fields, files) => {
-                        remap = fields.remap !== 'false';
+                        remap = Object.keys(fields).some(key => key === 'remap' && !fields.remap?.includes('false')); //.remap !== 'false'; // bcz: looking to see if the field 'remap' is set to 'false'
                         let id: string = '';
                         let docids: string[] = [];
                         let linkids: string[] = [];
                         try {
                             for (const name in files) {
                                 const f = files[name];
-                                const path_2 = Array.isArray(f) ? '' : f.path;
-                                const zip = new AdmZip(path_2);
+                                if (!f) continue;
+                                const path_2 = f[0]; // what about the rest of the array? are we guaranteed only one value is set?
+                                const zip = new AdmZip(path_2.filepath);
                                 zip.getEntries().forEach((entry: any) => {
                                     let entryName = entry.entryName.replace(/%%%/g, '/');
                                     if (!entryName.startsWith('files/')) {
@@ -299,7 +299,7 @@ export default class UploadManager extends ApiManager {
                                 } catch (e) {
                                     console.log(e);
                                 }
-                                unlink(path_2, () => {});
+                                unlink(path_2.filepath, () => {});
                             }
                             SolrManager.update();
                             res.send(JSON.stringify({ id, docids, linkids } || 'error'));