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

2 files changed, 105 insertions, 97 deletions

diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index cc0c19ab0..afe3940b6 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -297,24 +297,24 @@ export class CurrentUserUtils {
             noteView.isTemplateDoc = makeTemplate(noteView, true, "Topic");
             doc["template-note-Topic"] = new PrefetchProxy(noteView);
         }
-        if (doc["template-note-Todo"] === undefined) {
-            const noteView = Docs.Create.TextDocument("", {
-                title: "text", backgroundColor: "orange", _autoHeight: false, _height: 100, _showCaption: "caption",
-                layout: FormattedTextBox.LayoutString("Todo"), caption: RichTextField.DashField("taskStatus"), system: true,
-                _fontFamily: StrCast(Doc.UserDoc()._fontFamily), _fontSize: StrCast(Doc.UserDoc()._fontSize),
-            });
-            noteView.isTemplateDoc = makeTemplate(noteView, true, "Todo");
-            doc["template-note-Todo"] = new PrefetchProxy(noteView);
-        }
-        const taskStatusValues = [
-            { title: "todo", _backgroundColor: "blue", color: "white", system: true },
-            { title: "in progress", _backgroundColor: "yellow", color: "black", system: true },
-            { title: "completed", _backgroundColor: "green", color: "white", system: true }
-        ];
-        if (doc.fieldTypes === undefined) {
-            doc.fieldTypes = Docs.Create.TreeDocument([], { title: "field enumerations", system: true });
-            DocUtils.addFieldEnumerations(Doc.GetProto(doc["template-note-Todo"] as any as Doc), "taskStatus", taskStatusValues);
-        }
+        // if (doc["template-note-Todo"] === undefined) {
+        //     const noteView = Docs.Create.TextDocument("", {
+        //         title: "text", backgroundColor: "orange", _autoHeight: false, _height: 100, _showCaption: "caption",
+        //         layout: FormattedTextBox.LayoutString("Todo"), caption: RichTextField.DashField("taskStatus"), system: true,
+        //         _fontFamily: StrCast(Doc.UserDoc()._fontFamily), _fontSize: StrCast(Doc.UserDoc()._fontSize),
+        //     });
+        //     noteView.isTemplateDoc = makeTemplate(noteView, true, "Todo");
+        //     doc["template-note-Todo"] = new PrefetchProxy(noteView);
+        // }
+        // const taskStatusValues = [
+        //     { title: "todo", _backgroundColor: "blue", color: "white", system: true },
+        //     { title: "in progress", _backgroundColor: "yellow", color: "black", system: true },
+        //     { title: "completed", _backgroundColor: "green", color: "white", system: true }
+        // ];
+        // if (doc.fieldTypes === undefined) {
+        //     doc.fieldTypes = Docs.Create.TreeDocument([], { title: "field enumerations", system: true });
+        //     DocUtils.addFieldEnumerations(Doc.GetProto(doc["template-note-Todo"] as any as Doc), "taskStatus", taskStatusValues);
+        // }
 
         if (doc["template-notes"] === undefined) {
             doc["template-notes"] = new PrefetchProxy(Docs.Create.TreeDocument([doc["template-note-Note"] as any as Doc, doc["template-note-Idea"] as any as Doc, doc["template-note-Topic"] as any as Doc], // doc["template-note-Todo"] as any as Doc],
@@ -1048,41 +1048,79 @@ export class CurrentUserUtils {
 
     // Sets up the default context menu buttons
     static async setupContextMenuButtons(doc: Doc) {
-        const docList: Doc[] = [];
-
-        (await CurrentUserUtils.contextMenuTools(doc)).map(({ title, width, list, toolTip, ignoreClick, icon, type, btnType, click, script, subMenu, hidden, expanded, checkResult }) => {
-            const menuDocList: Doc[] = [];
-            if (subMenu) {
-                // default is textTools
-                let tools: Button[];
-                switch (type) {
-                    case "inkTools":
-                        tools = CurrentUserUtils.inkTools(doc);
-                        break;
-                    case "schemaTools":
-                        tools = CurrentUserUtils.schemaTools(doc);
-                        break;
-                    case "webTools":
-                        tools = CurrentUserUtils.webTools(doc);
-                        break;
-                    case "textTools":
-                        tools = CurrentUserUtils.textTools(doc);
-                        break;
-                    default:
-                        tools = CurrentUserUtils.textTools(doc);
-                        break;
-                }
-                tools.map(({ title, toolTip, icon, btnType, numBtnType, numBtnMax, numBtnMin, click, script, width, list, ignoreClick, switchToggle, checkResult }) => {
-                    menuDocList.push(Docs.Create.FontIconDocument({
+        if (doc.contextMenuBtns === undefined) {
+            const docList: Doc[] = [];
+
+            (await CurrentUserUtils.contextMenuTools(doc)).map(({ title, width, list, toolTip, ignoreClick, icon, type, btnType, click, script, subMenu, hidden, expanded, checkResult }) => {
+                const menuDocList: Doc[] = [];
+                if (subMenu) {
+                    // default is textTools
+                    let tools: Button[];
+                    switch (type) {
+                        case "inkTools":
+                            tools = CurrentUserUtils.inkTools(doc);
+                            break;
+                        case "schemaTools":
+                            tools = CurrentUserUtils.schemaTools(doc);
+                            break;
+                        case "webTools":
+                            tools = CurrentUserUtils.webTools(doc);
+                            break;
+                        case "textTools":
+                            tools = CurrentUserUtils.textTools(doc);
+                            break;
+                        default:
+                            tools = CurrentUserUtils.textTools(doc);
+                            break;
+                    }
+                    tools.map(({ title, toolTip, icon, btnType, numBtnType, numBtnMax, numBtnMin, click, script, width, list, ignoreClick, switchToggle, checkResult }) => {
+                        menuDocList.push(Docs.Create.FontIconDocument({
+                            _nativeWidth: width ? width : 25,
+                            _nativeHeight: 25,
+                            _width: width ? width : 25,
+                            _height: 25,
+                            icon,
+                            toolTip,
+                            numBtnType,
+                            numBtnMin,
+                            numBtnMax,
+                            script,
+                            btnType: btnType,
+                            btnList: new List<string>(list),
+                            ignoreClick: ignoreClick,
+                            _stayInCollection: true,
+                            _hideContextMenu: true,
+                            _lockedPosition: true,
+                            system: true,
+                            dontUndo: true,
+                            title,
+                            switchToggle,
+                            color: Colors.WHITE,
+                            backgroundColor: checkResult ? ComputedField.MakeFunction(checkResult) as any : "transparent",
+                            _dropAction: "alias",
+                            _removeDropProperties: new List<string>(["dropAction", "_stayInCollection"]),
+                            onClick: click ? ScriptField.MakeScript(click, { doc: Doc.name }) : undefined
+                        }));
+                    });
+                    docList.push(CurrentUserUtils.linearButtonList({
+                        linearViewSubMenu: true,
+                        flexGap: 0,
+                        ignoreClick: true,
+                        linearViewExpandable: true,
+                        icon: title,
+                        _height: 30,
+                        backgroundColor: checkResult ? ComputedField.MakeFunction(checkResult) as any : "transparent",
+                        linearViewIsExpanded: expanded ? !(ComputedField.MakeFunction(expanded) as any) : undefined,
+                        hidden: hidden ? ComputedField.MakeFunction(hidden) as any : undefined,
+                    }, menuDocList));
+                } else {
+                    docList.push(Docs.Create.FontIconDocument({
                         _nativeWidth: width ? width : 25,
                         _nativeHeight: 25,
                         _width: width ? width : 25,
                         _height: 25,
                         icon,
                         toolTip,
-                        numBtnType,
-                        numBtnMin,
-                        numBtnMax,
                         script,
                         btnType: btnType,
                         btnList: new List<string>(list),
@@ -1093,54 +1131,16 @@ export class CurrentUserUtils {
                         system: true,
                         dontUndo: true,
                         title,
-                        switchToggle,
                         color: Colors.WHITE,
-                        backgroundColor: checkResult ? ComputedField.MakeFunction(checkResult) as any : "transparent",
+                        backgroundColor: "transparent",
                         _dropAction: "alias",
+                        hidden: hidden ? ComputedField.MakeFunction(hidden) as any : undefined,
                         _removeDropProperties: new List<string>(["dropAction", "_stayInCollection"]),
-                        onClick: click ? ScriptField.MakeScript(click, { doc: Doc.name }) : undefined
+                        onClick: click ? ScriptField.MakeScript(click, { scriptContext: "any" }) : undefined
                     }));
-                });
-                docList.push(CurrentUserUtils.linearButtonList({
-                    linearViewSubMenu: true,
-                    flexGap: 0,
-                    ignoreClick: true,
-                    linearViewExpandable: true,
-                    icon: title,
-                    _height: 30,
-                    backgroundColor: checkResult ? ComputedField.MakeFunction(checkResult) as any : "transparent",
-                    linearViewIsExpanded: expanded ? !(ComputedField.MakeFunction(expanded) as any) : undefined,
-                    hidden: hidden ? ComputedField.MakeFunction(hidden) as any : undefined,
-                }, menuDocList));
-            } else {
-                docList.push(Docs.Create.FontIconDocument({
-                    _nativeWidth: width ? width : 25,
-                    _nativeHeight: 25,
-                    _width: width ? width : 25,
-                    _height: 25,
-                    icon,
-                    toolTip,
-                    script,
-                    btnType: btnType,
-                    btnList: new List<string>(list),
-                    ignoreClick: ignoreClick,
-                    _stayInCollection: true,
-                    _hideContextMenu: true,
-                    _lockedPosition: true,
-                    system: true,
-                    dontUndo: true,
-                    title,
-                    color: Colors.WHITE,
-                    backgroundColor: "transparent",
-                    _dropAction: "alias",
-                    hidden: hidden ? ComputedField.MakeFunction(hidden) as any : undefined,
-                    _removeDropProperties: new List<string>(["dropAction", "_stayInCollection"]),
-                    onClick: click ? ScriptField.MakeScript(click, { scriptContext: "any" }) : undefined
-                }));
-            }
-        });
+                }
+            });
 
-        if (doc.contextMenuBtns === undefined) {
             doc.contextMenuBtns = CurrentUserUtils.linearButtonList({ title: "menu buttons", flexGap: 0, linearViewIsExpanded: true, ignoreClick: true, linearViewExpandable: false, _height: 35 }, docList);
         }
     }
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index f0c055049..64da68f59 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -1,14 +1,12 @@
-import { observable, observe, action, reaction, computed } from "mobx";
+import { action, observable, observe } from "mobx";
 import { computedFn } from "mobx-utils";
 import { DirectLinksSym, Doc, DocListCast, Field, Opt } from "../../fields/Doc";
 import { List } from "../../fields/List";
 import { ProxyField } from "../../fields/Proxy";
-import { listSpec } from "../../fields/Schema";
-import { BoolCast, Cast, PromiseValue, StrCast } from "../../fields/Types";
+import { BoolCast, Cast, StrCast } from "../../fields/Types";
 import { LightboxView } from "../views/LightboxView";
 import { DocumentViewSharedProps, ViewAdjustment } from "../views/nodes/DocumentView";
 import { DocumentManager } from "./DocumentManager";
-import { SharingManager } from "./SharingManager";
 import { UndoManager } from "./UndoManager";
 
 type CreateViewFunc = (doc: Doc, followLinkLocation: string, finished?: () => void) => void;
@@ -121,7 +119,7 @@ export class LinkManager {
     public getAllRelatedLinks(anchor: Doc) { return this.relatedLinker(anchor); } // finds all links that contain the given anchor
     public getAllDirectLinks(anchor: Doc): Doc[] {
         // FIXME:glr Why is Doc undefined?
-        if (Doc.GetProto(anchor)[DirectLinksSym]){
+        if (Doc.GetProto(anchor)[DirectLinksSym]) {
             return Array.from(Doc.GetProto(anchor)[DirectLinksSym]);
         } else {
             return [];
@@ -130,9 +128,19 @@ export class LinkManager {
 
     relatedLinker = computedFn(function relatedLinker(this: any, anchor: Doc): Doc[] {
         const lfield = Doc.LayoutFieldKey(anchor);
-        const related = DocListCast(anchor[lfield + "-annotations"]).concat(DocListCast(anchor[lfield + "-annotations-timeline"])).reduce((list, anno) =>
+        if (!anchor || anchor instanceof Promise || Doc.GetProto(anchor) instanceof Promise) {
+            console.log("WAITING FOR DOC/PROTO IN LINKMANAGER");
+            return [];
+        }
+        const dirLinks = Doc.GetProto(anchor)[DirectLinksSym];
+        const annos = DocListCast(anchor[lfield + "-annotations"]);
+        const timelineAnnos = DocListCast(anchor[lfield + "-annotations-timeline"]);
+        if (!annos || !timelineAnnos) {
+            debugger;
+        }
+        const related = [...annos, ...timelineAnnos].reduce((list, anno) =>
             [...list, ...LinkManager.Instance.relatedLinker(anno)],
-            Array.from(Doc.GetProto(anchor)[DirectLinksSym]).slice());
+            Array.from(dirLinks).slice());
         return related;
     }, true);