Merge branch 'master' into menu_restructure

3 files changed, 5 insertions, 4 deletions

diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx
index ca3ab8866..7787a8b38 100644
--- a/src/client/views/collections/CollectionTreeView.tsx
+++ b/src/client/views/collections/CollectionTreeView.tsx
@@ -331,7 +331,7 @@ class TreeView extends React.Component<TreeViewProps> {
                         [...this.props.renderedIds, this.doc[Id]], this.props.libraryPath, this.props.onCheckedClick, this.props.onChildClick, this.props.ignoreFields)}
             </ul >;
         } else if (this.treeViewExpandedView === "fields") {
-            return <ul><div ref={this._dref} style={{ display: "inline-block" }} key={this.doc[Id] + this.doc.title}>
+            return <ul key={this.doc[Id] + this.doc.title}><div ref={this._dref} style={{ display: "inline-block" }} >
                 {this.expandedField}
             </div></ul>;
         } else {
diff --git a/src/server/MemoryDatabase.ts b/src/server/MemoryDatabase.ts
index 7f477327e..d2d8bb3b3 100644
--- a/src/server/MemoryDatabase.ts
+++ b/src/server/MemoryDatabase.ts
@@ -1,4 +1,3 @@
-import { DH_CHECK_P_NOT_SAFE_PRIME } from 'constants';
 import * as mongodb from 'mongodb';
 import { DocumentsCollection, IDatabase } from './IDatabase';
 import { Transferable } from './Message';
diff --git a/src/server/websocket.ts b/src/server/websocket.ts
index d5f89a750..827888ff7 100644
--- a/src/server/websocket.ts
+++ b/src/server/websocket.ts
@@ -1,5 +1,5 @@
-import { green } from "colors";
 import * as express from "express";
+import { blue, green } from "colors";
 import { createServer, Server } from "https";
 import { networkInterfaces } from "os";
 import * as sio from 'socket.io';
@@ -186,7 +186,7 @@ export namespace WebSocket {
             + currentdate.getHours() + ":"
             + currentdate.getMinutes() + ":"
             + currentdate.getSeconds();
-        console.log(green(`user ${userEmail} has connected to the web socket at: ${datetime}`));
+        console.log(blue(`user ${userEmail} has connected to the web socket at: ${datetime}`));
         socketMap.set(socket, userEmail);
     }
 
@@ -208,10 +208,12 @@ export namespace WebSocket {
     }
 
     function GetRefField([id, callback]: [string, (result?: Transferable) => void]) {
+        process.stdout.write(`(f)`)
         Database.Instance.getDocument(id, callback);
     }
 
     function GetRefFields([ids, callback]: [string[], (result?: Transferable[]) => void]) {
+        console.log(green(`> ${ids.length} fields`));
         Database.Instance.getDocuments(ids, callback);
     }