Merge branch 'master' into aarav_edit

3 files changed, 6 insertions, 8 deletions

diff --git a/src/client/documents/DocUtils.ts b/src/client/documents/DocUtils.ts
index 914e94bfa..84e2db989 100644
--- a/src/client/documents/DocUtils.ts
+++ b/src/client/documents/DocUtils.ts
@@ -691,6 +691,7 @@ export namespace DocUtils {
             }
             generatedDocuments.push(doc);
         }
+        return doc;
     }
 
     export function GetNewTextDoc(title: string, x: number, y: number, width?: number, height?: number, annotationOn?: Doc, backgroundColor?: string) {
@@ -868,7 +869,7 @@ export namespace DocUtils {
     export function uploadFileToDoc(file: File, options: DocumentOptions, overwriteDoc: Doc) {
         const generatedDocuments: Doc[] = [];
         // Since this file has an overwriteDoc, we can set the client tracking guid to the overwriteDoc's guid.
-        Networking.UploadFilesToServer([{ file, guid: overwriteDoc[Id] }]).then(upfiles => {
+        return Networking.UploadFilesToServer([{ file, guid: overwriteDoc[Id] }]).then(upfiles => {
             const {
                 source: { newFilename, mimetype },
                 result,
@@ -878,7 +879,9 @@ export namespace DocUtils {
                     overwriteDoc.loadingError = result.message;
                     Doc.removeCurrentlyLoading(overwriteDoc);
                 }
-            } else newFilename && mimetype && processFileupload(generatedDocuments, newFilename, mimetype, result, options, overwriteDoc);
+                return undefined;
+            }
+            return newFilename && mimetype ? processFileupload(generatedDocuments, newFilename, mimetype, result, options, overwriteDoc) : undefined;
         });
     }
 
diff --git a/src/client/documents/DocumentTypes.ts b/src/client/documents/DocumentTypes.ts
index 00f5dedd6..03626107f 100644
--- a/src/client/documents/DocumentTypes.ts
+++ b/src/client/documents/DocumentTypes.ts
@@ -31,7 +31,6 @@ export enum DocumentType {
     DATAVIZ = 'dataviz',
     ANNOPALETTE = 'annopalette',
     LOADING = 'loading',
-    SIMULATION = 'simulation', // physics simulation
     MESSAGE = 'message', // chat message
 
     // special purpose wrappers that either take no data or are compositions of lower level types
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 7468b0c00..fe121021d 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -35,7 +35,7 @@ export enum FInfoFieldType {
     enumeration = 'enum',
     date = 'date',
     list = 'list',
-    rtf = 'rich text',
+    rtf = 'richtext',
     map = 'map',
 }
 export class FInfo {
@@ -1164,9 +1164,5 @@ export namespace Docs {
         export function DelegateDocument(proto: Doc, options: DocumentOptions = {}) {
             return InstanceFromProto(proto, undefined, options);
         }
-
-        export function SimulationDocument(options?: DocumentOptions) {
-            return InstanceFromProto(Prototypes.get(DocumentType.SIMULATION), undefined, { ...(options || {}) });
-        }
     }
 }