Merge branch 'master' of https://github.com/brown-dash/Dash-Web into nathan-starter

1 files changed, 128 insertions, 105 deletions

diff --git a/src/client/views/global/globalScripts.ts b/src/client/views/global/globalScripts.ts
index 6f9afe165..a4246fae3 100644
--- a/src/client/views/global/globalScripts.ts
+++ b/src/client/views/global/globalScripts.ts
@@ -1,19 +1,23 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { Colors } from 'browndash-components';
 import { action, runInAction } from 'mobx';
 import { aggregateBounds } from '../../../Utils';
-import { Doc, DocListCast, NumListCast, Opt } from '../../../fields/Doc';
+import { Doc, DocListCast, Opt, StrListCast } from '../../../fields/Doc';
 import { DocData } from '../../../fields/DocSymbols';
 import { InkTool } from '../../../fields/InkField';
-import { List } from '../../../fields/List';
 import { BoolCast, Cast, NumCast, StrCast } from '../../../fields/Types';
 import { WebField } from '../../../fields/URLField';
 import { Gestures } from '../../../pen-gestures/GestureTypes';
-import { DocumentType } from '../../documents/DocumentTypes';
+import { CollectionViewType, DocumentType } from '../../documents/DocumentTypes';
+import { Docs } from '../../documents/Documents';
 import { LinkManager } from '../../util/LinkManager';
 import { ScriptingGlobals } from '../../util/ScriptingGlobals';
+import { SnappingManager } from '../../util/SnappingManager';
 import { UndoManager, undoable } from '../../util/UndoManager';
 import { GestureOverlay } from '../GestureOverlay';
 import { InkingStroke } from '../InkingStroke';
+import { MainView } from '../MainView';
+import { PropertiesView } from '../PropertiesView';
 import { CollectionFreeFormView } from '../collections/collectionFreeForm';
 import { CollectionFreeFormDocumentView } from '../nodes/CollectionFreeFormDocumentView';
 import {
@@ -35,8 +39,7 @@ import { ImageBox } from '../nodes/ImageBox';
 import { VideoBox } from '../nodes/VideoBox';
 import { WebBox } from '../nodes/WebBox';
 import { RichTextMenu } from '../nodes/formattedText/RichTextMenu';
-
-// import { InkTranscription } from '../InkTranscription';
+import { GPTPopup, GPTPopupMode } from '../pdf/GPTPopup/GPTPopup';
 
 // eslint-disable-next-line prefer-arrow-callback
 ScriptingGlobals.add(function IsNoneSelected() {
@@ -134,22 +137,27 @@ ScriptingGlobals.add(function toggleOverlay(checkResult?: boolean) {
 });
 
 // eslint-disable-next-line prefer-arrow-callback
-ScriptingGlobals.add(function showFreeform(attr: 'center' | 'grid' | 'snaplines' | 'clusters' | 'viewAll' | 'fitOnce', checkResult?: boolean, persist?: boolean) {
+ScriptingGlobals.add(function showFreeform(attr: 'hcenter' | 'vcenter' | 'grid' | 'snaplines' | 'clusters' | 'viewAll' | 'fitOnce', checkResult?: boolean, persist?: boolean) {
     const selected = DocumentView.SelectedDocs().lastElement();
+
+    function isAttrFiltered(attribute: string) {
+        return StrListCast(selected._childFilters).some(filter => filter.includes(attribute));
+    }
+
     // prettier-ignore
-    const map: Map<'flashcards' | 'center' | 'grid' | 'snaplines' | 'clusters' | 'arrange' | 'viewAll' | 'fitOnce' | 'time' | 'docType' | 'color' | 'links' | 'like' | 'star' | 'idea' | 'chat' | '1' | '2' | '3' | '4', 
+    const map: Map<'flashcards' | 'hcenter' | 'vcenter' | 'grid' | 'snaplines' | 'clusters' | 'arrange' | 'viewAll' | 'fitOnce' | 'time' | 'docType' | 'color' | 'chat' | 'up' | 'down' | 'pile' | 'toggle-chat' | 'tag', 
     { 
         waitForRender?: boolean; 
-        checkResult: (doc: Doc) => any; 
+        checkResult: (doc: Doc) => boolean; 
         setDoc: (doc: Doc, dv: DocumentView) => void; 
     }> = new Map([
         ['grid', {
-            checkResult: (doc:Doc) => BoolCast(doc?._freeform_backgroundGrid, false),
-            setDoc: (doc:Doc) => { doc._freeform_backgroundGrid = !doc._freeform_backgroundGrid; },
+            checkResult: (doc: Doc) => BoolCast(doc?._freeform_backgroundGrid, false),
+            setDoc: (doc: Doc) => { doc._freeform_backgroundGrid = !doc._freeform_backgroundGrid; },
         }],
         ['snaplines', {
-            checkResult: (doc:Doc) => BoolCast(doc?._freeform_snapLines, false),
-            setDoc: (doc:Doc) => { doc._freeform_snapLines = !doc._freeform_snapLines; },
+            checkResult: (doc: Doc) => BoolCast(doc?._freeform_snapLines, false),
+            setDoc: (doc: Doc) => { doc._freeform_snapLines = !doc._freeform_snapLines; },
         }],
         ['viewAll', {
             checkResult: (doc: Doc) => BoolCast(doc?._freeform_fitContentsToBox, false),
@@ -159,146 +167,159 @@ ScriptingGlobals.add(function showFreeform(attr: 'center' | 'grid' | 'snaplines'
                 else (dv.ComponentView as CollectionFreeFormView)?.fitContentOnce();
             },
         }],
-        ['center', {
-            checkResult: (doc:Doc) => BoolCast(doc?._stacking_alignCenter, false),
-            setDoc: (doc:Doc) => { doc._stacking_alignCenter = !doc._stacking_alignCenter; },
+        ['vcenter', {
+            checkResult: (doc:Doc) => !StrCast(doc?._layout_dontCenter).includes('y'),
+            setDoc: (doc:Doc) => { doc._layout_dontCenter = StrCast(doc.layout_dontCenter).includes('y') ? StrCast(doc.layout_dontCenter).replace(/y/,"") : StrCast(doc.layout_dontCenter) + 'y'; },
+        }],
+        ['hcenter', {
+            checkResult: (doc:Doc) => !StrCast(doc?._layout_dontCenter).includes('x'),
+            setDoc: (doc:Doc) => { doc._layout_dontCenter = StrCast(doc.layout_dontCenter).includes('x') ? StrCast(doc.layout_dontCenter).replace(/x/,"") : 'x'+ StrCast(doc.layout_dontCenter); },
         }],
         ['clusters', {
             waitForRender: true, // flags that undo batch should terminate after a re-render giving the script the chance to fire
-            checkResult: (doc:Doc) => BoolCast(doc?._freeform_useClusters, false),
-            setDoc: (doc:Doc) => { doc._freeform_useClusters = !doc._freeform_useClusters; },
+            checkResult: (doc: Doc) => BoolCast(doc?._freeform_useClusters, false),
+            setDoc: (doc: Doc) => { doc._freeform_useClusters = !doc._freeform_useClusters; },
         }],
         ['flashcards', {
             checkResult: (doc: Doc) => BoolCast(Doc.UserDoc().defaultToFlashcards, false),
-            setDoc: (doc: Doc, dv: DocumentView) => Doc.UserDoc().defaultToFlashcards = !Doc.UserDoc().defaultToFlashcards,
+            setDoc: (doc: Doc, dv: DocumentView) => { Doc.UserDoc().defaultToFlashcards = !Doc.UserDoc().defaultToFlashcards}, // prettier-ignore
         }],
         ['time', {
             checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "time",
-            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort = "time",
+            setDoc: (doc: Doc, dv: DocumentView) => { doc.cardSort === "time" ? doc.cardSort = '' : doc.cardSort = 'time'}, // prettier-ignore
         }],
         ['docType', {
             checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "type",
-            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort = "type",
+            setDoc: (doc: Doc, dv: DocumentView) => { doc.cardSort === "type" ? doc.cardSort = '' : doc.cardSort = 'type'}, // prettier-ignore
         }],
         ['color', {
             checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "color",
-            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort = "color",
+            setDoc: (doc: Doc, dv: DocumentView) => { doc.cardSort === "color" ? doc.cardSort = '' : doc.cardSort = 'color'}, // prettier-ignore
         }],
-        ['links', {
-            checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "links",
-            setDoc: (doc: Doc, dv: DocumentView) => doc.cardSort = "links",
+        ['tag', {
+            checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "tag",
+            setDoc: (doc: Doc, dv: DocumentView) => { doc.cardSort === "tag" ? doc.cardSort = '' : doc.cardSort = 'tag'}, // prettier-ignore
         }],
-        ['like', {
-            checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "custom" && StrCast(doc?.cardSort_customField) === "like",
+        ['up', {
+            checkResult: (doc: Doc) => BoolCast(!doc?.cardSort_isDesc),
             setDoc: (doc: Doc, dv: DocumentView) => {
-                doc.cardSort = "custom";
-                doc.cardSort_customField = "like";
-                doc.cardSort_visibleSortGroups = new List<number>();
-            }
+                doc.cardSort_isDesc = false;
+            },
         }],
-        ['star', {
-            checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "custom" && StrCast(doc?.cardSort_customField) === "star",
+        ['down', {
+            checkResult: (doc: Doc) => BoolCast(doc?.cardSort_isDesc),
             setDoc: (doc: Doc, dv: DocumentView) => {
-                doc.cardSort = "custom";
-                doc.cardSort_customField = "star";
-                doc.cardSort_visibleSortGroups = new List<number>();
-            }
+                doc.cardSort_isDesc = true;
+            },
         }],
-        ['idea', {
-            checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "custom" && StrCast(doc?.cardSort_customField) === "idea",
+        ['toggle-chat', {
+            checkResult: (doc: Doc) => GPTPopup.Instance.visible,
             setDoc: (doc: Doc, dv: DocumentView) => {
-                doc.cardSort = "custom";
-                doc.cardSort_customField = "idea";
-                doc.cardSort_visibleSortGroups = new List<number>();
-            }
+                if (GPTPopup.Instance.visible){
+                    doc.cardSort = ''
+                    GPTPopup.Instance.setVisible(false);
+   
+                } else {
+                    GPTPopup.Instance.setVisible(true);
+                    GPTPopup.Instance.setMode(GPTPopupMode.CARD);
+                    GPTPopup.Instance.setCardsDoneLoading(true);
+
+                }
+                
+
+            },
         }],
-        ['chat', {
-            checkResult: (doc: Doc) => StrCast(doc?.cardSort) === "custom"  && StrCast(doc?.cardSort_customField) === "chat",
+        ['pile', {
+            checkResult: (doc: Doc) => doc._type_collection == CollectionViewType.Freeform,
             setDoc: (doc: Doc, dv: DocumentView) => {
-                doc.cardSort = "custom";
-                doc.cardSort_customField = "chat";
-                doc.cardSort_visibleSortGroups = new List<number>();
+                doc._type_collection = CollectionViewType.Freeform;
+                const newCol = Docs.Create.CarouselDocument(DocListCast(doc[Doc.LayoutFieldKey(doc)]), {
+                    _width: 250,
+                    _height: 200,
+                    _layout_fitWidth: false,
+                    _layout_autoHeight: true,
+                });
+
+
+                const iconMap: { [key: number]: string } = {
+                    0: 'star',
+                    1: 'heart',
+                    2: 'cloud',
+                    3: 'bolt'
+                };
+
+                for (let i=0; i<4; i++){
+                    if (isAttrFiltered(iconMap[i])){
+                        newCol[iconMap[i]] = true
+                    }
+                }
+
+                    newCol && dv.ComponentView?.addDocument?.(newCol);
+                    DocumentView.showDocument(newCol, { willZoomCentered: true })
+
             },
         }],
     ]);
-    for (let i = 0; i < 8; i++) {
-        map.set((i + 1 + '') as any, {
-            checkResult: (doc: Doc) => NumListCast(doc?.cardSort_visibleSortGroups).includes(i),
-            setDoc: (doc: Doc, dv: DocumentView) => {
-                const list = NumListCast(doc.cardSort_visibleSortGroups);
-                doc.cardSort_visibleSortGroups = new List<number>(list.includes(i) ? list.filter(d => d !== i) : [...list, i]);
-            },
-        });
-    }
 
     if (checkResult) {
         return map.get(attr)?.checkResult(selected);
     }
+
     const batch = map.get(attr)?.waitForRender ? UndoManager.StartBatch('set freeform attribute') : { end: () => {} };
     DocumentView.Selected().map(dv => map.get(attr)?.setDoc(dv.layoutDoc, dv));
     setTimeout(() => batch.end(), 100);
     return undefined;
 });
 
-ScriptingGlobals.add(function cardHasLabel(label: string) {
+/**
+ * Applies (or removes) a filter to the selected document for the specified tag
+ * NOTE: this also opens the filter panel if the settings button is clicked (probably should be a different function)
+ */
+// eslint-disable-next-line prefer-arrow-callback
+ScriptingGlobals.add(function setTagFilter(tag: string, added: boolean, checkResult?: boolean) {
     const selected = DocumentView.SelectedDocs().lastElement();
-    const labelNum = Number(label) - 1;
-    return labelNum < 4 || (selected && DocListCast(selected[Doc.LayoutFieldKey(selected)]).some(doc => doc[StrCast(selected.cardSort_customField)] == labelNum));
-}, '');
+    const isOptions = tag === '-opts-';
 
-// ScriptingGlobals.add(function setCardSortAttr(attr: 'time' | 'docType' | 'color', value: any, checkResult?: boolean) {
-//     // const editorView = RichTextMenu.Instance?.TextView?.EditorView;
-//     const selected = SelectionManager.Docs.lastElement();
-//     // prettier-ignore
-//     const map: Map<'time' | 'docType' | 'color', { waitForRender?: boolean, checkResult: (doc:Doc) => any; setDoc: (doc:Doc, dv:DocumentView) => void;}> = new Map([
-//         ['time', {
-//             checkResult: (doc:Doc) => StrCast(doc?.cardSort),
-//             setDoc: (doc:Doc,dv:DocumentView) => doc.cardSort = "time",
-//         }],
-//         ['docType', {
-//             checkResult: (doc:Doc) => StrCast(doc?.cardSort),
-//             setDoc: (doc:Doc,dv:DocumentView) => doc.cardSort = "type",
-//         }],
-//         ['color', {
-//             checkResult: (doc:Doc) => StrCast(doc?.cardSort),
-//             setDoc: (doc:Doc,dv:DocumentView) => doc.cardSort = "color",
-//         }],
-//         // ['custom', {
-//         //     checkResult: () => RichTextMenu.Instance.textAlign,
-//         //     setDoc: () => value && editorView?.state ? RichTextMenu.Instance.align(editorView, editorView.dispatch, value):(Doc.UserDoc().textAlign = value),
-//         // }]
-//         // ,
-//     ]);
-
-//     if (checkResult) {
-//         return map.get(attr)?.checkResult(selected);
-//     }
-
-//     console.log('hey')
-//     SelectionManager.Views.map(dv => map.get(attr)?.setDoc(dv.layoutDoc, dv));
-//     console.log('success')
-// });
+    if (checkResult) {
+        return isOptions
+            ? false
+            : StrListCast(selected._childFilters) // check all filters for one that filters tags:value where value is the tag's name
+                  .map(filter => filter.split(Doc.FilterSep))
+                  .some(([key, val]) => key === 'tags' && val === tag);
+    }
+
+    if (!isOptions) {
+        added ? Doc.setDocFilter(selected, 'tags', tag, 'check') : Doc.setDocFilter(selected, 'tags', tag, 'remove');
+    } else {
+        SnappingManager.PropertiesWidth < 5 && SnappingManager.SetPropertiesWidth(0);
+        SnappingManager.SetPropertiesWidth(MainView.Instance.propertiesWidth() < 15 ? 250 : 0);
+        PropertiesView.Instance?.CloseAll();
+        runInAction(() => (PropertiesView.Instance.openFilters = SnappingManager.PropertiesWidth > 5));
+    }
+
+    return undefined;
+}, '');
 
 // eslint-disable-next-line prefer-arrow-callback
-ScriptingGlobals.add(function setFontAttr(attr: 'font' | 'fontColor' | 'highlight' | 'fontSize' | 'alignment', value: any, checkResult?: boolean) {
+ScriptingGlobals.add(function setFontAttr(attr: 'font' | 'fontColor' | 'highlight' | 'fontSize' | 'alignment', value: string | number, checkResult?: boolean) {
     const editorView = RichTextMenu.Instance?.TextView?.EditorView;
     // prettier-ignore
-    const map: Map<'font'|'fontColor'|'highlight'|'fontSize'|'alignment', { checkResult: () => any; setDoc: () => void;}> = new Map([
+    const map: Map<'font'|'fontColor'|'highlight'|'fontSize'|'alignment', { checkResult: () => string | undefined; setDoc: () => void;}> = new Map([
         ['font', {
             checkResult: () => RichTextMenu.Instance?.fontFamily,
-            setDoc: () => value && RichTextMenu.Instance?.setFontField(value, 'fontFamily'),
+            setDoc: () => value && RichTextMenu.Instance?.setFontField(value.toString(), 'fontFamily'),
         }],
         ['highlight', {
             checkResult: () => RichTextMenu.Instance?.fontHighlight,
-            setDoc: () => value  && RichTextMenu.Instance?.setFontField(value, 'fontHighlight'),
+            setDoc: () => value  && RichTextMenu.Instance?.setFontField(value.toString(), 'fontHighlight'),
         }],
         ['fontColor', {
             checkResult: () => RichTextMenu.Instance?.fontColor,
-            setDoc: () => value && RichTextMenu.Instance?.setFontField(value, 'fontColor'),
+            setDoc: () => value && RichTextMenu.Instance?.setFontField(value.toString(), 'fontColor'),
         }],
         ['alignment', {
             checkResult: () => RichTextMenu.Instance?.textAlign,
-            setDoc: () => { value && editorView?.state ? RichTextMenu.Instance?.align(editorView, editorView.dispatch, value):(Doc.UserDoc().textAlign = value); },
+            setDoc: () => { value && editorView?.state ? RichTextMenu.Instance?.align(editorView, editorView.dispatch, value.toString() as "center"|"left"|"right"):(Doc.UserDoc().textAlign = value); },
         }],
         ['fontSize', {
             checkResult: () => RichTextMenu.Instance?.fontSize.replace('px', ''),
@@ -312,6 +333,7 @@ ScriptingGlobals.add(function setFontAttr(attr: 'font' | 'fontColor' | 'highligh
     ]);
 
     if (checkResult) {
+        // console.log(map.get(attr)?.checkResult() + "font check result")
         return map.get(attr)?.checkResult();
     }
     map.get(attr)?.setDoc?.();
@@ -319,7 +341,7 @@ ScriptingGlobals.add(function setFontAttr(attr: 'font' | 'fontColor' | 'highligh
 });
 
 type attrname = 'noAutoLink' | 'dictation' | 'bold' | 'italics' | 'elide' | 'underline' | 'left' | 'center' | 'right' | 'vcent' | 'bullet' | 'decimal';
-type attrfuncs = [attrname, { checkResult: () => boolean; toggle?: () => any }];
+type attrfuncs = [attrname, { checkResult: () => boolean; toggle?: () => unknown }];
 
 // eslint-disable-next-line prefer-arrow-callback
 ScriptingGlobals.add(function toggleCharStyle(charStyle: attrname, checkResult?: boolean) {
@@ -440,7 +462,7 @@ function setActiveTool(tool: InkTool | Gestures, keepPrim: boolean, checkResult?
         if (GestureOverlay.Instance) {
             GestureOverlay.Instance.KeepPrimitiveMode = keepPrim;
         }
-        if (Object.values(Gestures).includes(tool as any)) {
+        if (Object.values(Gestures).includes(tool as Gestures)) {
             if (GestureOverlay.Instance.InkShape === tool && !keepPrim) {
                 Doc.ActiveTool = InkTool.None;
                 GestureOverlay.Instance.InkShape = undefined;
@@ -452,14 +474,14 @@ function setActiveTool(tool: InkTool | Gestures, keepPrim: boolean, checkResult?
             if (Doc.UserDoc().ActiveTool === tool) {
                 Doc.ActiveTool = InkTool.None;
             } else {
-                if ([InkTool.StrokeEraser, InkTool.RadiusEraser, InkTool.SegmentEraser].includes(tool as any)) {
+                if ([InkTool.StrokeEraser, InkTool.RadiusEraser, InkTool.SegmentEraser].includes(tool as InkTool)) {
                     Doc.UserDoc().activeEraserTool = tool;
                 }
                 // pen or eraser
                 if (Doc.ActiveTool === tool && !GestureOverlay.Instance.InkShape && !keepPrim) {
                     Doc.ActiveTool = InkTool.None;
                 } else {
-                    Doc.ActiveTool = tool as any;
+                    Doc.ActiveTool = tool as InkTool;
                     GestureOverlay.Instance.InkShape = undefined;
                 }
             }
@@ -472,16 +494,17 @@ function setActiveTool(tool: InkTool | Gestures, keepPrim: boolean, checkResult?
 
 ScriptingGlobals.add(setActiveTool, 'sets the active ink tool mode');
 
+// eslint-disable-next-line prefer-arrow-callback
 ScriptingGlobals.add(function activeEraserTool() {
     return StrCast(Doc.UserDoc().activeEraserTool, InkTool.StrokeEraser);
 }, 'returns the current eraser tool');
 
 // toggle: Set overlay status of selected document
 // eslint-disable-next-line prefer-arrow-callback
-ScriptingGlobals.add(function setInkProperty(option: 'inkMask' | 'labels' | 'fillColor' | 'strokeWidth' | 'strokeColor' | 'eraserWidth', value: any, checkResult?: boolean) {
+ScriptingGlobals.add(function setInkProperty(option: 'inkMask' | 'labels' | 'fillColor' | 'strokeWidth' | 'strokeColor' | 'eraserWidth', value: string | number, checkResult?: boolean) {
     const selected = DocumentView.SelectedDocs().lastElement() ?? Doc.UserDoc();
     // prettier-ignore
-    const map: Map<'inkMask' | 'labels' | 'fillColor' | 'strokeWidth' | 'strokeColor' | 'eraserWidth', { checkResult: () => any; setInk: (doc: Doc) => void; setMode: () => void }> = new Map([
+    const map: Map<'inkMask' | 'labels' | 'fillColor' | 'strokeWidth' | 'strokeColor' | 'eraserWidth', { checkResult: () => number|boolean|string|undefined; setInk: (doc: Doc) => void; setMode: () => void }> = new Map([
         ['inkMask', {
             checkResult: () => ((selected?._layout_isSvg ? BoolCast(selected[DocData].stroke_isInkMask) : ActiveIsInkMask())),
             setInk: (doc: Doc) => { doc[DocData].stroke_isInkMask = !doc.stroke_isInkMask; },
@@ -510,7 +533,7 @@ ScriptingGlobals.add(function setInkProperty(option: 'inkMask' | 'labels' | 'fil
         [ 'eraserWidth', {
             checkResult: () => ActiveEraserWidth(),
             setInk: (doc: Doc) => { },
-            setMode: () => { SetEraserWidth(value.toString());},
+            setMode: () => { SetEraserWidth(+value);},
         }]
     ]);