Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web

8 files changed, 66 insertions, 46 deletions

diff --git a/src/client/views/InkingCanvas.tsx b/src/client/views/InkingCanvas.tsx
index d7b8bf3c3..8d0121035 100644
--- a/src/client/views/InkingCanvas.tsx
+++ b/src/client/views/InkingCanvas.tsx
@@ -46,7 +46,7 @@ export class InkingCanvas extends React.Component<InkCanvasProps> {
     }
 
     set inkData(value: StrokeMap) {
-        this.props.Document.SetOnPrototype(KeyStore.Ink, new InkField(value));
+        this.props.Document.SetDataOnPrototype(KeyStore.Ink, value, InkField);
     }
 
     componentDidMount() {
diff --git a/src/client/views/InkingControl.tsx b/src/client/views/InkingControl.tsx
index ad6bbd476..eb2172d03 100644
--- a/src/client/views/InkingControl.tsx
+++ b/src/client/views/InkingControl.tsx
@@ -40,7 +40,7 @@ export class InkingControl extends React.Component {
         if (SelectionManager.SelectedDocuments().length == 1) {
             var sdoc = SelectionManager.SelectedDocuments()[0];
             if (sdoc.props.ContainingCollectionView && sdoc.props.ContainingCollectionView) {
-                sdoc.props.Document.SetOnPrototype(KeyStore.BackgroundColor, new TextField(color.hex));
+                sdoc.props.Document.SetDataOnPrototype(KeyStore.BackgroundColor, color.hex, TextField);
             }
         }
     }
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx
index 81c68d978..763cd1234 100644
--- a/src/client/views/collections/CollectionDockingView.tsx
+++ b/src/client/views/collections/CollectionDockingView.tsx
@@ -16,6 +16,7 @@ import "./CollectionDockingView.scss";
 import { COLLECTION_BORDER_WIDTH } from "./CollectionView";
 import React = require("react");
 import { SubCollectionViewProps } from "./CollectionViewBase";
+import { ServerUtils } from "../../../server/ServerUtil";
 
 @observer
 export class CollectionDockingView extends React.Component<SubCollectionViewProps> {
@@ -220,7 +221,7 @@ export class CollectionDockingView extends React.Component<SubCollectionViewProp
         stack.header.controlsContainer.find('.lm_popout') //get the close icon
             .off('click') //unbind the current click handler
             .click(action(function () {
-                var url = "http://localhost:1050/doc/" + stack.contentItems[0].tab.contentItem.config.props.documentId;
+                var url = ServerUtils.prepend("/doc/" + stack.contentItems[0].tab.contentItem.config.props.documentId);
                 let win = window.open(url, stack.contentItems[0].tab.title, "width=300,height=400");
             }));
     }
diff --git a/src/client/views/collections/CollectionViewBase.tsx b/src/client/views/collections/CollectionViewBase.tsx
index 7175e2846..f33007196 100644
--- a/src/client/views/collections/CollectionViewBase.tsx
+++ b/src/client/views/collections/CollectionViewBase.tsx
@@ -15,6 +15,8 @@ import { TupleField } from "../../../fields/TupleField";
 import { CurrentUserUtils } from "../../../server/authentication/models/current_user_utils";
 import { NumberField } from "../../../fields/NumberField";
 import { DocumentManager } from "../../util/DocumentManager";
+import request = require("request");
+import { ServerUtils } from "../../../server/ServerUtil";
 
 export interface CollectionViewProps {
     fieldKey: Key;
@@ -94,6 +96,27 @@ export class CollectionViewBase extends React.Component<SubCollectionViewProps>
         }
     }
 
+    protected getDocumentFromType(type: string, path: string, options: DocumentOptions): Opt<Document> {
+        let ctor: ((path: string, options: DocumentOptions) => Document) | undefined;
+        if (type.indexOf("image") !== -1) {
+            ctor = Documents.ImageDocument;
+        }
+        if (type.indexOf("video") !== -1) {
+            ctor = Documents.VideoDocument;
+        }
+        if (type.indexOf("audio") !== -1) {
+            ctor = Documents.AudioDocument;
+        }
+        if (type.indexOf("pdf") !== -1) {
+            ctor = Documents.PdfDocument;
+        }
+        if (type.indexOf("html") !== -1) {
+            ctor = Documents.WebDocument;
+            options = { height: options.width, ...options, };
+        }
+        return ctor ? ctor(path, options) : undefined;
+    }
+
     @action
     protected onDrop(e: React.DragEvent, options: DocumentOptions): void {
         let that = this;
@@ -115,16 +138,25 @@ export class CollectionViewBase extends React.Component<SubCollectionViewProps>
             return;
         }
 
-        console.log(e.dataTransfer.items.length);
-
         for (let i = 0; i < e.dataTransfer.items.length; i++) {
             const upload = window.location.origin + RouteStore.upload;
             let item = e.dataTransfer.items[i];
             if (item.kind === "string" && item.type.indexOf("uri") != -1) {
-                e.dataTransfer.items[i].getAsString(action((s: string) => this.props.addDocument(Documents.WebDocument(s, options), false)))
+                e.dataTransfer.items[i].getAsString(action((s: string) => {
+                    let document: Document;
+                    request.head(ServerUtils.prepend(RouteStore.corsProxy + "/" + s), (err, res, body) => {
+                        let type = res.headers["content-type"];
+                        if (type) {
+                            let doc = this.getDocumentFromType(type, s, { ...options, width: 300, nativeWidth: 300 })
+                            if (doc) {
+                                this.props.addDocument(doc, false);
+                            }
+                        }
+                    });
+                    // this.props.addDocument(Documents.WebDocument(s, { ...options, width: 300, height: 300 }), false)
+                }))
             }
             let type = item.type
-            console.log(type)
             if (item.kind == "file") {
                 let file = item.getAsFile();
                 let formData = new FormData()
@@ -136,44 +168,27 @@ export class CollectionViewBase extends React.Component<SubCollectionViewProps>
                 fetch(upload, {
                     method: 'POST',
                     body: formData
-                })
-                    .then((res: Response) => {
-                        return res.json()
-                    }).then(json => {
-
-                        json.map((file: any) => {
-                            let path = window.location.origin + file
-                            runInAction(() => {
-                                var doc: any;
-
-                                if (type.indexOf("image") !== -1) {
-                                    doc = Documents.ImageDocument(path, { ...options, nativeWidth: 200, width: 200, })
-                                }
-                                if (type.indexOf("video") !== -1) {
-                                    doc = Documents.VideoDocument(path, { ...options, nativeWidth: 300, width: 300, })
+                }).then((res: Response) => {
+                    return res.json()
+                }).then(json => {
+                    json.map((file: any) => {
+                        let path = window.location.origin + file
+                        runInAction(() => {
+                            let doc = this.getDocumentFromType(type, path, { ...options, nativeWidth: 300, width: 300 })
+
+                            let docs = that.props.Document.GetT(KeyStore.Data, ListField);
+                            if (docs != FieldWaiting) {
+                                if (!docs) {
+                                    docs = new ListField<Document>();
+                                    that.props.Document.Set(KeyStore.Data, docs)
                                 }
-                                if (type.indexOf("audio") !== -1) {
-                                    doc = Documents.AudioDocument(path, { ...options, nativeWidth: 300, width: 300, })
+                                if (doc) {
+                                    docs.Data.push(doc);
                                 }
-                                if (type.indexOf("pdf") !== -1) {
-                                    doc = Documents.PdfDocument(path, { ...options, nativeWidth: 300, width: 300, })
-                                }
-                                let docs = that.props.Document.GetT(KeyStore.Data, ListField);
-                                if (docs != FieldWaiting) {
-                                    if (!docs) {
-                                        docs = new ListField<Document>();
-                                        that.props.Document.Set(KeyStore.Data, docs)
-                                    }
-                                    if (doc) {
-                                        docs.Data.push(doc);
-                                    }
-
-                                }
-                            })
+                            }
                         })
                     })
-
-
+                })
             }
         }
     }
diff --git a/src/client/views/nodes/FieldView.tsx b/src/client/views/nodes/FieldView.tsx
index e84c5f933..b6d50bffb 100644
--- a/src/client/views/nodes/FieldView.tsx
+++ b/src/client/views/nodes/FieldView.tsx
@@ -59,9 +59,6 @@ export class FieldView extends React.Component<FieldViewProps> {
         else if (field instanceof ImageField) {
             return <ImageBox {...this.props} />
         }
-        else if (field instanceof WebField) {
-            return <WebBox {...this.props} />
-        }
         else if (field instanceof VideoField) {
             return <VideoBox {...this.props} />
         }
diff --git a/src/client/views/nodes/FormattedTextBox.tsx b/src/client/views/nodes/FormattedTextBox.tsx
index 4bd5726f4..ba9bd9566 100644
--- a/src/client/views/nodes/FormattedTextBox.tsx
+++ b/src/client/views/nodes/FormattedTextBox.tsx
@@ -56,7 +56,7 @@ export class FormattedTextBox extends React.Component<FieldViewProps> {
             const state = this._editorView.state.apply(tx);
             this._editorView.updateState(state);
             const { doc, fieldKey } = this.props;
-            doc.SetOnPrototype(fieldKey, new RichTextField(JSON.stringify(state.toJSON())))
+            doc.SetDataOnPrototype(fieldKey, JSON.stringify(state.toJSON()), RichTextField);
             // doc.SetData(fieldKey, JSON.stringify(state.toJSON()), RichTextField);
         }
     }
diff --git a/src/fields/Document.ts b/src/fields/Document.ts
index be0137128..b6439364a 100644
--- a/src/fields/Document.ts
+++ b/src/fields/Document.ts
@@ -249,6 +249,13 @@ export class Document extends Field {
     }
 
     @action
+    SetDataOnPrototype<T, U extends Field & { Data: T }>(key: Key, value: T, ctor: { new(): U }, replaceWrongType = true) {
+        this.GetAsync(KeyStore.Prototype, (f: Field) => {
+            (f as Document).SetData(key, value, ctor)
+        })
+    }
+
+    @action
     SetData<T, U extends Field & { Data: T }>(key: Key, value: T, ctor: { new(): U }, replaceWrongType = true) {
 
         let field = this.Get(key, true);
diff --git a/src/server/index.ts b/src/server/index.ts
index 5773514ea..6226dbfe2 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -52,7 +52,7 @@ app.use(cookieParser());
 app.use(session({
     secret: "64d6866242d3b5a5503c675b32c9605e4e90478e9b77bcf2bc",
     resave: true,
-    cookie: { maxAge: 7 * 24 * 60 * 60 },
+    cookie: { maxAge: 7 * 24 * 60 * 60 * 1000 },
     saveUninitialized: true,
     store: new MongoStore({
         url: 'mongodb://localhost:27017/Dash'