fixes for rich text menu updates and setting parameters on text doc vs within in RTF. Lots of lint cleanup.

1 files changed, 21 insertions, 16 deletions

diff --git a/src/server/MemoryDatabase.ts b/src/server/MemoryDatabase.ts
index b74332bf5..1432d91c4 100644
--- a/src/server/MemoryDatabase.ts
+++ b/src/server/MemoryDatabase.ts
@@ -3,16 +3,15 @@ import { DocumentsCollection, IDatabase } from './IDatabase';
 import { Transferable } from './Message';
 
 export class MemoryDatabase implements IDatabase {
-
     private db: { [collectionName: string]: { [id: string]: any } } = {};
 
     private getCollection(collectionName: string) {
         const collection = this.db[collectionName];
         if (collection) {
             return collection;
-        } else {
-            return this.db[collectionName] = {};
         }
+        this.db[collectionName] = {};
+        return {};
     }
 
     public getCollectionNames() {
@@ -21,15 +20,15 @@ export class MemoryDatabase implements IDatabase {
 
     public update(id: string, value: any, callback: (err: mongodb.MongoError, res: mongodb.UpdateResult) => void, _upsert?: boolean, collectionName = DocumentsCollection): Promise<void> {
         const collection = this.getCollection(collectionName);
-        const set = "$set";
+        const set = '$set';
         if (set in value) {
             let currentVal = collection[id] ?? (collection[id] = {});
             const val = value[set];
             for (const key in val) {
-                const keys = key.split(".");
+                const keys = key.split('.');
                 for (let i = 0; i < keys.length - 1; i++) {
                     const k = keys[i];
-                    if (typeof currentVal[k] === "object") {
+                    if (typeof currentVal[k] === 'object') {
                         currentVal = currentVal[k];
                     } else {
                         currentVal[k] = {};
@@ -45,7 +44,7 @@ export class MemoryDatabase implements IDatabase {
         return Promise.resolve(undefined);
     }
 
-    public updateMany(query: any, update: any, collectionName = DocumentsCollection): Promise<mongodb.UpdateResult> {
+    public updateMany(/* query: any, update: any, collectionName = DocumentsCollection */): Promise<mongodb.UpdateResult> {
         throw new Error("Can't updateMany a MemoryDatabase");
     }
 
@@ -54,7 +53,9 @@ export class MemoryDatabase implements IDatabase {
     }
 
     public delete(query: any, collectionName?: string): Promise<mongodb.DeleteResult>;
+    // eslint-disable-next-line no-dupe-class-members
     public delete(id: string, collectionName?: string): Promise<mongodb.DeleteResult>;
+    // eslint-disable-next-line no-dupe-class-members
     public delete(id: any, collectionName = DocumentsCollection): Promise<mongodb.DeleteResult> {
         const i = id.id ?? id;
         delete this.getCollection(collectionName)[i];
@@ -75,7 +76,7 @@ export class MemoryDatabase implements IDatabase {
     }
 
     public insert(value: any, collectionName = DocumentsCollection): Promise<void> {
-        const id = value.id;
+        const { id } = value;
         this.getCollection(collectionName)[id] = value;
         return Promise.resolve();
     }
@@ -93,14 +94,18 @@ export class MemoryDatabase implements IDatabase {
             const count = Math.min(ids.length, 1000);
             const index = ids.length - count;
             const fetchIds = ids.splice(index, count).filter(id => !visited.has(id));
-            if (!fetchIds.length) {
-                continue;
-            }
-            const docs = await new Promise<{ [key: string]: any }[]>(res => this.getDocuments(fetchIds, res, collectionName));
-            for (const doc of docs) {
-                const id = doc.id;
-                visited.add(id);
-                ids.push(...(await fn(doc)));
+            if (fetchIds.length) {
+                // eslint-disable-next-line no-await-in-loop
+                const docs = await new Promise<{ [key: string]: any }[]>(res => {
+                    this.getDocuments(fetchIds, res, collectionName);
+                });
+                // eslint-disable-next-line no-restricted-syntax
+                for (const doc of docs) {
+                    const { id } = doc;
+                    visited.add(id);
+                    // eslint-disable-next-line no-await-in-loop
+                    ids.push(...(await fn(doc)));
+                }
             }
         }
     }