some clean up

4 files changed, 31 insertions, 71 deletions

diff --git a/src/Utils.ts b/src/Utils.ts
index ff55a2e4e..c629bc263 100644
--- a/src/Utils.ts
+++ b/src/Utils.ts
@@ -87,16 +87,12 @@ export class Utils {
     }
 }
 
-export function returnTrue() {
-    return true;
-}
+export function returnTrue() { return true; }
 
-export function returnFalse() {
-    return false;
-}
+export function returnFalse() { return false; }
 
 export function emptyFunction() { }
 
-export function emptyDocFunction(doc: Document) { console.log("focus " + doc.Title); }
+export function emptyDocFunction(doc: Document) { }
 
 export type Without<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
\ No newline at end of file
diff --git a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
index ccc2fcf0c..a4722a6f8 100644
--- a/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
+++ b/src/client/views/collections/collectionFreeForm/MarqueeView.tsx
@@ -7,13 +7,12 @@ import { KeyStore } from "../../../../fields/KeyStore";
 import { Documents } from "../../../documents/Documents";
 import { SelectionManager } from "../../../util/SelectionManager";
 import { Transform } from "../../../util/Transform";
+import { undoBatch } from "../../../util/UndoManager";
 import { InkingCanvas } from "../../InkingCanvas";
 import { PreviewCursor } from "../../PreviewCursor";
 import { CollectionFreeFormView } from "./CollectionFreeFormView";
 import "./MarqueeView.scss";
 import React = require("react");
-import { undo } from "prosemirror-history";
-import { undoBatch } from "../../../util/UndoManager";
 
 interface MarqueeViewProps {
     getContainerTransform: () => Transform;
diff --git a/src/server/Client.ts b/src/server/Client.ts
index 02402a5a0..b4c419438 100644
--- a/src/server/Client.ts
+++ b/src/server/Client.ts
@@ -1,15 +1,12 @@
 import { computed } from "mobx";
 
 export class Client {
+    private _guid: string;
+
     constructor(guid: string) {
-        this.guid = guid;
+        this._guid = guid;
     }
 
-    private guid: string;
-
-    @computed
-    public get GUID(): string {
-        return this.guid;
-    }
+    @computed public get GUID(): string { return this._guid; }
 
 }
\ No newline at end of file
diff --git a/src/server/database.ts b/src/server/database.ts
index 0bc806253..51eefeb8d 100644
--- a/src/server/database.ts
+++ b/src/server/database.ts
@@ -7,9 +7,7 @@ export class Database {
     private db?: mongodb.Db;
 
     constructor() {
-        this.MongoClient.connect(this.url, (err, client) => {
-            this.db = client.db();
-        });
+        this.MongoClient.connect(this.url, (err, client) => this.db = client.db());
     }
 
     private currentWrites: { [_id: string]: Promise<void> } = {};
@@ -21,14 +19,11 @@ export class Database {
             const run = (promise: Promise<void>, resolve?: () => void) => {
                 collection.updateOne({ _id: id }, { $set: value }, {
                     upsert: true
-                }, (err, res) => {
+                }, (err, result) => {
                     if (err) {
                         console.log(err.message);
                         console.log(err.errmsg);
                     }
-                    // if (res) {
-                    //     console.log(JSON.stringify(res.result));
-                    // }
                     if (this.currentWrites[id] === promise) {
                         delete this.currentWrites[id];
                     }
@@ -38,70 +33,43 @@ export class Database {
                     callback();
                 });
             };
-            if (prom) {
-                const newProm: Promise<void> = prom.then(() => run(newProm));
-                this.currentWrites[id] = newProm;
-            } else {
-                const newProm: Promise<void> = new Promise<void>(res => run(newProm, res));
-                this.currentWrites[id] = newProm;
-            }
+
+            let newProm: Promise<void> = new Promise<void>(resolve => run(newProm, resolve));
+            this.currentWrites[id] = newProm;
+            if (prom)
+                prom.then(() => newProm);
+            else newProm;
         }
     }
 
     public delete(id: string) {
-        if (this.db) {
-            let collection = this.db.collection('documents');
-            collection.remove({ _id: id });
-        }
+        this.db && this.db.collection('documents').remove({ _id: id });
     }
 
     public deleteAll(collectionName: string = 'documents'): Promise<any> {
-        return new Promise(res => {
-            if (this.db) {
-                let collection = this.db.collection(collectionName);
-                collection.deleteMany({}, res);
-            }
-        });
+        return new Promise(res =>
+            this.db && this.db.collection(collectionName).deleteMany({}, res));
     }
 
     public insert(kvpairs: any) {
-        if (this.db) {
-            let collection = this.db.collection('documents');
-            collection.insertOne(kvpairs, (err: any, res: any) => {
-                if (err) {
-                    // console.log(err)
-                    return;
-                }
-            });
-        }
+        this.db && this.db.collection('documents').insertOne(kvpairs, (err: any, res: any) =>
+            err // &&  console.log(err)
+        );
     }
 
     public getDocument(id: string, fn: (res: any) => void) {
-        var result: JSON;
-        if (this.db) {
-            let collection = this.db.collection('documents');
-            collection.findOne({ _id: id }, (err: any, res: any) => {
-                result = res;
-                if (!result) {
-                    fn(undefined);
-                }
-                fn(result);
-            });
-        }
+        this.db && this.db.collection('documents').findOne({ _id: id }, (err: any, result: any) =>
+            fn(result ? result : undefined));
     }
 
     public getDocuments(ids: string[], fn: (res: any) => void) {
-        if (this.db) {
-            let collection = this.db.collection('documents');
-            let cursor = collection.find({ _id: { "$in": ids } });
-            cursor.toArray((err, docs) => {
-                if (err) {
-                    console.log(err.message);
-                    console.log(err.errmsg);
-                }
-                fn(docs);
-            });
-        }
+        this.db && this.db.collection('documents').find({ _id: { "$in": ids } }).toArray((err, docs) => {
+            if (err) {
+                console.log(err.message);
+                console.log(err.errmsg);
+            }
+            fn(docs);
+        });
     }
 
     public print() {