Merge branch 'master' into joanne-tutorialagent

1 files changed, 14 insertions, 9 deletions

diff --git a/src/client/documents/DocumentTypes.ts b/src/client/documents/DocumentTypes.ts
index 00f5dedd6..cef44e999 100644
--- a/src/client/documents/DocumentTypes.ts
+++ b/src/client/documents/DocumentTypes.ts
@@ -31,13 +31,12 @@ export enum DocumentType {
     DATAVIZ = 'dataviz',
     ANNOPALETTE = 'annopalette',
     LOADING = 'loading',
-    SIMULATION = 'simulation', // physics simulation
     MESSAGE = 'message', // chat message
 
     // special purpose wrappers that either take no data or are compositions of lower level types
     LINK = 'link',
     PRES = 'presentation',
-    PRESELEMENT = 'preselement',
+    PRESSLIDE = 'presslide',
     COMPARISON = 'comparison',
     PUSHPIN = 'pushpin',
     MAPROUTE = 'maproute',
@@ -45,28 +44,34 @@ export enum DocumentType {
     SCRIPTDB = 'scriptdb', // database of scripts
     GROUPDB = 'groupdb', // database of groups
 
+    SCRAPBOOK = 'scrapbook',
     JOURNAL = 'journal', // AARAV ADD
 }
 export enum CollectionViewType {
-    Invalid = 'invalid',
+    // general collections
     Freeform = 'freeform',
-    Calendar = 'calendar',
     Card = 'card',
     Carousel = 'carousel',
     Carousel3D = '3D Carousel',
-    Docking = 'docking',
     Grid = 'grid',
-    Linear = 'linear',
-    Map = 'map',
     Masonry = 'masonry',
     Multicolumn = 'multicolumn',
     Multirow = 'multirow',
     NoteTaking = 'notetaking',
-    Pile = 'pileup',
     Pivot = 'pivot',
     Schema = 'schema',
     Stacking = 'stacking',
-    StackedTimeline = 'stacked timeline',
     Time = 'time',
     Tree = 'tree',
+    // under development
+    Calendar = 'calendar',
+    // special collections
+    Docking = 'docking',
+    Pile = 'pileup',
+    StackedTimeline = 'stacked timeline',
+    Linear = 'linear',
+    Invalid = 'invalid',
 }
+
+export const specialCollectionTypes = [CollectionViewType.Docking, CollectionViewType.Pile, CollectionViewType.StackedTimeline, CollectionViewType.Linear, CollectionViewType.Invalid];
+export const standardViewTypes = Object.values(CollectionViewType).filter(key => !specialCollectionTypes.includes(key));