Merge branch 'master' of https://github.com/brown-dash/Dash-Web

1 files changed, 16 insertions, 24 deletions

diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 6e28268a9..74c06b4a6 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -180,13 +180,9 @@ export default class UploadManager extends ApiManager {
                 const ids: { [id: string]: string } = {};
                 let remap = true;
                 const getId = (id: string): string => {
-                    if (!remap) return id;
-                    if (id.endsWith('Proto')) return id;
-                    if (id in ids) {
-                        return ids[id];
-                    } else {
-                        return (ids[id] = v4());
-                    }
+                    if (!remap || id.endsWith('Proto')) return id;
+                    if (id in ids) return ids[id];
+                    return (ids[id] = v4());
                 };
                 const mapFn = (doc: any) => {
                     if (doc.id) {
@@ -229,6 +225,7 @@ export default class UploadManager extends ApiManager {
                         remap = fields.remap !== 'false';
                         let id: string = '';
                         let docids: string[] = [];
+                        let linkids: string[] = [];
                         try {
                             for (const name in files) {
                                 const f = files[name];
@@ -255,27 +252,22 @@ export default class UploadManager extends ApiManager {
                                         console.log(e);
                                     }
                                 });
-                                const json = zip.getEntry('doc.json');
+                                const json = zip.getEntry('docs.json');
                                 try {
                                     const data = JSON.parse(json.getData().toString('utf8'), retrocycle());
-                                    const datadocs = data.docs;
+                                    const { docs, links } = data;
                                     id = getId(data.id);
-                                    const docs = Object.keys(datadocs).map(key => datadocs[key]);
-                                    docs.forEach(mapFn);
-                                    docids = docs.map(doc => doc.id);
+                                    const rdocs = Object.keys(docs).map(key => docs[key]);
+                                    const ldocs = Object.keys(links).map(key => links[key]);
+                                    [...rdocs, ...ldocs].forEach(mapFn);
+                                    docids = rdocs.map(doc => doc.id);
+                                    linkids = ldocs.map(link => link.id);
                                     await Promise.all(
-                                        docs.map(
-                                            (doc: any) =>
+                                        [...rdocs, ...ldocs].map(
+                                            doc =>
                                                 new Promise<void>(res => {
-                                                    Database.Instance.replace(
-                                                        doc.id,
-                                                        doc,
-                                                        (err, r) => {
-                                                            err && console.log(err);
-                                                            res();
-                                                        },
-                                                        true
-                                                    );
+                                                    // overwrite mongo doc with json doc contents
+                                                    Database.Instance.replace(doc.id, doc, (err, r) => res(err && console.log(err)), true);
                                                 })
                                         )
                                     );
@@ -285,7 +277,7 @@ export default class UploadManager extends ApiManager {
                                 unlink(path_2, () => {});
                             }
                             SolrManager.update();
-                            res.send(JSON.stringify({ id, docids } || 'error'));
+                            res.send(JSON.stringify({ id, docids, linkids } || 'error'));
                         } catch (e) {
                             console.log(e);
                         }