Merge branch 'master' into geireann-eslint-prettier

1 files changed, 10 insertions, 4 deletions

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 4690d856d..65b3db0e2 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -12,7 +12,7 @@ import { RichTextField } from "../../fields/RichTextField";
 import { SchemaHeaderField } from "../../fields/SchemaHeaderField";
 import { ComputedField, ScriptField } from "../../fields/ScriptField";
 import { Cast, NumCast, StrCast } from "../../fields/Types";
-import { AudioField, ImageField, MapField, PdfField, RecordingField, VideoField, WebField, YoutubeField } from "../../fields/URLField";
+import { AudioField, CsvField, ImageField, MapField, PdfField, RecordingField, VideoField, WebField, YoutubeField } from "../../fields/URLField";
 import { inheritParentAcls, SharingPermissions } from "../../fields/util";
 import { Upload } from "../../server/SharedMediaTypes";
 import { aggregateBounds, OmitKeys, Utils } from "../../Utils";
@@ -37,7 +37,7 @@ import { AudioBox } from "../views/nodes/AudioBox";
 import { FontIconBox } from "../views/nodes/button/FontIconBox";
 import { ColorBox } from "../views/nodes/ColorBox";
 import { ComparisonBox } from "../views/nodes/ComparisonBox";
-import { DataVizBox } from "../views/nodes/DataViz";
+import { DataVizBox } from "../views/nodes/DataVizBox/DataVizBox";
 import { DocFocusOptions } from "../views/nodes/DocumentView";
 import { EquationBox } from "../views/nodes/EquationBox";
 import { FieldViewProps } from "../views/nodes/FieldView";
@@ -904,8 +904,8 @@ export namespace Docs {
             return InstanceFromProto(Prototypes.get(DocumentType.PRESELEMENT), undefined, { ...(options || {}) });
         }
 
-        export function DataVizDocument(options?: DocumentOptions) {
-            return InstanceFromProto(Prototypes.get(DocumentType.DATAVIZ), undefined, { title: "Data Viz", ...options });
+        export function DataVizDocument(url: string, options?: DocumentOptions) {
+            return InstanceFromProto(Prototypes.get(DocumentType.DATAVIZ), new CsvField(url), { title: "Data Viz", ...options });
         }
 
         export function DockDocument(documents: Array<Doc>, config: string, options: DocumentOptions, id?: string) {
@@ -1217,6 +1217,11 @@ export namespace DocUtils {
             if (!options._width) options._width = 400;
             if (!options._height) options._height = (options._width as number) * 1200 / 927;
         }
+        if (type.indexOf("csv") !== -1) {
+            ctor = Docs.Create.DataVizDocument;
+            if (!options._width) options._width = 400;
+            if (!options._height) options._height = (options._width as number) * 1200 / 927;
+        }
         //TODO:al+glr
         // if (type.indexOf("map") !== -1) {
         //     ctor = Docs.Create.MapDocument;
@@ -1242,6 +1247,7 @@ export namespace DocUtils {
             ctor = Docs.Create.WebDocument;
             options = { ...options, _width: 400, _height: 512, title: path, };
         }
+        
         return ctor ? ctor(path, options) : undefined;
     }