Merge branch 'zaul-branch-2' into moreUpgrading

2 files changed, 11 insertions, 3 deletions

diff --git a/src/client/documents/DocumentTypes.ts b/src/client/documents/DocumentTypes.ts
index 5c2792a53..1123bcac9 100644
--- a/src/client/documents/DocumentTypes.ts
+++ b/src/client/documents/DocumentTypes.ts
@@ -62,5 +62,5 @@ export enum CollectionViewType {
     Pile = 'pileup',
     StackedTimeline = 'stacked timeline',
     NoteTaking = 'notetaking',
-    Calendar = 'calendar_view'
+    Calendar = 'calendar'
 }
diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index d6fd8aea3..ff14eb101 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -58,6 +58,7 @@ import { VideoBox } from '../views/nodes/VideoBox';
 import { WebBox } from '../views/nodes/WebBox';
 import { SearchBox } from '../views/search/SearchBox';
 import { CollectionViewType, DocumentType } from './DocumentTypes';
+import { CalendarBox } from '../views/nodes/calendarBox/CalendarBox';
 const {
     default: { DFLT_IMAGE_NATIVE_DIM },
 } = require('../views/global/globalCssVariables.module.scss');
@@ -784,6 +785,13 @@ export namespace Docs {
                     options: {},
                 },
             ],
+            [
+                DocumentType.CALENDAR,
+                {
+                    layout: { view: CalendarBox, dataField: defaultDataKey },
+                    options: {},
+                }
+            ]
         ]);
 
         const suffix = 'Proto';
@@ -1146,8 +1154,8 @@ export namespace Docs {
             return InstanceFromProto(Prototypes.get(DocumentType.MAPROUTE), new List(documents), { infoWindowOpen, ...options }, id);
         }
 
-        export function CalendarDocument(options: DocumentOptions={}, documents: Array<Doc>){
-            return InstanceFromProto(Prototypes.get(DocumentType.CALENDAR), new List(documents), options)
+        export function CalendarDocument(options: DocumentOptions, documents: Array<Doc>){
+            return InstanceFromProto(Prototypes.get(DocumentType.CALENDAR), new List(documents), {...options})
         }
 
         // shouldn't ever need to create a KVP document-- instead set the LayoutTemplateString to be a KeyValueBox for the DocumentView (see addDocTab in TabDocView)