more cleanup of import/export

1 files changed, 15 insertions, 19 deletions

diff --git a/src/server/ApiManagers/UploadManager.ts b/src/server/ApiManagers/UploadManager.ts
index 2cc2ac46c..1f72d72dc 100644
--- a/src/server/ApiManagers/UploadManager.ts
+++ b/src/server/ApiManagers/UploadManager.ts
@@ -228,6 +228,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];
@@ -254,28 +255,23 @@ 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) =>
-                                                new Promise<void>(res =>
-                                                    Database.Instance.replace(
-                                                        doc.id,
-                                                        doc,
-                                                        (err, r) => {
-                                                            err && console.log(err);
-                                                            res();
-                                                        },
-                                                        true
-                                                    )
-                                                )
+                                        [...rdocs, ...ldocs].map(
+                                            doc =>
+                                                new Promise<void>(res => {
+                                                    // overwrite mongo doc with json doc contents
+                                                    Database.Instance.replace(doc.id, doc, (err, r) => res(err && console.log(err)), true);
+                                                })
                                         )
                                     );
                                 } catch (e) {
@@ -284,7 +280,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);
                         }