1 files changed, 17 insertions, 21 deletions
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index e5e12a7e5..d085c5f5e 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -858,7 +858,8 @@ export class CurrentUserUtils {
         const reqdBtnOpts:DocumentOptions = { _forceActive: true, toolTip: "Import from computer",
             _width: 30, _height: 30, _stayInCollection: true, _hideContextMenu: true, title: "Import", btnType: ButtonType.ClickButton, 
             buttonText: "Import", icon: "upload", system: true };
-        return this.AssignDocField(myImports, "buttonMenuDoc", (opts) => Docs.Create.FontIconDocument(opts), reqdBtnOpts, undefined, { onClick: "importDocument()" });
+        this.AssignDocField(myImports, "buttonMenuDoc", (opts) => Docs.Create.FontIconDocument(opts), reqdBtnOpts, undefined, { onClick: "importDocument()" });
+        return myImports;
     }
 
     static setupClickEditorTemplates(doc: Doc) {
@@ -1065,29 +1066,24 @@ export class CurrentUserUtils {
         input.onchange = async _e => {
             const upload = Utils.prepend("/uploadDoc");
             const formData = new FormData();
-            const file = input.files && input.files[0];
+            const file = input.files?.[0];
             if (file?.type === 'application/zip') {
-                formData.append('file', file);
-                formData.append('remap', "true");
-                const response = await fetch(upload, { method: "POST", body: formData });
-                const json = await response.json();
-                if (json !== "error") {
-                    const doc = Docs.newAccount ? undefined : await DocServer.GetRefField(json);
-                    if (doc instanceof Doc) {
-                        setTimeout(() => SearchUtil.Search(`{!join from=id to=proto_i}id:link*`, true, {}).then(docs =>
-                            docs.docs.forEach(d => LinkManager.Instance.addLink(d))), 2000); // need to give solr some time to update so that this query will find any link docs we've added.
-                    }
-                }
+                const doc = await Doc.importDocument(file);
+                // NOT USING SOLR, so need to replace this with something else // if (doc instanceof Doc) {
+                //     setTimeout(() => SearchUtil.Search(`{!join from=id to=proto_i}id:link*`, true, {}).then(docs =>
+                //         docs.docs.forEach(d => LinkManager.Instance.addLink(d))), 2000); // need to give solr some time to update so that this query will find any link docs we've added.
+                // }
+                const list = Cast(CurrentUserUtils.MyImports.data, listSpec(Doc), null);
+                doc instanceof Doc && list?.splice(0, 0, doc);
             } else if (input.files && input.files.length !== 0) {
                 const disposer = OverlayView.ShowSpinner();
-                DocListCastAsync(CurrentUserUtils.MyImports.data).then(async list => {
-                    const results = await DocUtils.uploadFilesToDocs(Array.from(input.files || []), {});
-                    if (results.length !== input.files?.length) {
-                        alert("Error uploading files - possibly due to unsupported file types");
-                    }
-                    list?.splice(0, 0, ...results);
-                    disposer();
-                });
+                const results = await DocUtils.uploadFilesToDocs(Array.from(input.files || []), {});
+                if (results.length !== input.files?.length) {
+                    alert("Error uploading files - possibly due to unsupported file types");
+                }
+                const list = Cast(CurrentUserUtils.MyImports.data, listSpec(Doc), null);
+                list?.splice(0, 0, ...results);
+                disposer();
             } else {
                 console.log("No file selected");
             }