Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web

1 files changed, 22 insertions, 27 deletions

diff --git a/src/mobile/ImageUpload.tsx b/src/mobile/ImageUpload.tsx
index 16808a598..ae48dd2c6 100644
--- a/src/mobile/ImageUpload.tsx
+++ b/src/mobile/ImageUpload.tsx
@@ -1,15 +1,14 @@
 import * as ReactDOM from 'react-dom';
-import React = require('react');
-import "./ImageUpload.scss"
+import * as rp from 'request-promise';
+import { Documents } from '../client/documents/Documents';
+import { Server } from '../client/Server';
 import { Document } from '../fields/Document';
 import { KeyStore } from '../fields/KeyStore';
-import { Server } from '../client/Server';
-import { Documents } from '../client/documents/Documents';
 import { ListField } from '../fields/ListField';
-import { ImageField } from '../fields/ImageField';
-import request = require('request');
-import { ServerUtils } from '../server/ServerUtil';
 import { RouteStore } from '../server/RouteStore';
+import { ServerUtils } from '../server/ServerUtil';
+import "./ImageUpload.scss";
+import React = require('react');
 
 
 
@@ -40,28 +39,24 @@ const onFileLoad = (file: any) => {
                 json.map((file: any) => {
                     let path = window.location.origin + file
                     var doc: Document = Documents.ImageDocument(path, { nativeWidth: 200, width: 200 })
-                    doc.GetTAsync(KeyStore.Data, ImageField, (i) => {
-                        if (i) {
-                            document.getElementById("message")!.innerText = i.Data.href;
+
+                    rp.get(ServerUtils.prepend(RouteStore.getUserDocumentId)).then(res => {
+                        if (res) {
+                            return Server.GetField(res);
                         }
-                    })
-                    request.get(ServerUtils.prepend(RouteStore.getActiveWorkspace), (error, response, body) => {
-                        if (body) {
-                            Server.GetField(body, field => {
-                                if (field instanceof Document) {
-                                    field.GetTAsync(KeyStore.OptionalRightCollection, Document,
-                                        pending => {
-                                            if (pending) {
-                                                pending.GetOrCreateAsync(KeyStore.Data, ListField, list => {
-                                                    list.Data.push(doc);
-                                                })
-                                            }
-                                        })
-                                }
-                            }
-                            );
+                        throw new Error("No user id returned");
+                    }).then(field => {
+                        if (field instanceof Document) {
+                            return field.GetTAsync(KeyStore.OptionalRightCollection, Document)
                         }
-                    })
+                    }).then(pending => {
+                        if (pending) {
+                            pending.GetOrCreateAsync(KeyStore.Data, ListField, list => {
+                                list.Data.push(doc);
+                            })
+                        }
+                    });
+
                     // console.log(window.location.origin + file[0])
 
                     //imgPrev.setAttribute("src", window.location.origin + files[0].name)