From 972f76a34e3c1a1aa5f0be59639fbd5763c9c16f Mon Sep 17 00:00:00 2001
From: Sam Wilkins <abdullah_ahmed@brown.edu>
Date: Thu, 6 Jun 2019 17:45:26 -0400
Subject: links get saved to global table

---
 src/client/views/nodes/LinkMenu.tsx | 51 ++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 7 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 3f09d6214..6dc5623d1 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -8,6 +8,7 @@ import React = require("react");
 import { Doc, DocListCast } from "../../../new_fields/Doc";
 import { Cast, FieldValue, StrCast } from "../../../new_fields/Types";
 import { Id } from "../../../new_fields/FieldSymbols";
+import { LinkManager } from "./LinkManager";
 
 interface Props {
     docView: DocumentView;
@@ -19,26 +20,62 @@ export class LinkMenu extends React.Component<Props> {
 
     @observable private _editingLink?: Doc;
 
-    renderLinkItems(links: Doc[], key: string, type: string) {
+    // renderLinkItems(links: Doc[], key: string, type: string) {
+    //     return links.map(link => {
+    //         let doc = FieldValue(Cast(link[key], Doc));
+    //         if (doc) {
+    //             return <LinkBox key={doc[Id]} linkDoc={link} linkName={StrCast(link.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={type} />;
+    //         }
+    //     });
+    // }
+
+    renderLinkGroup(links: Doc[]) {
+        console.log("render link group");
+        let source = this.props.docView.Document;
+        console.log("num links", links.length, typeof links);
         return links.map(link => {
-            let doc = FieldValue(Cast(link[key], Doc));
+            let destination = (link["linkedTo"] === source) ? link["linkedFrom"] : link["linkedTo"];
+            let doc = FieldValue(Cast(destination, Doc));
             if (doc) {
-                return <LinkBox key={doc[Id]} linkDoc={link} linkName={StrCast(link.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={type} />;
+                console.log(doc[Id] + source[Id], "source is", source[Id]);
+                return <LinkBox key={doc[Id] + source[Id]} linkDoc={link} linkName={StrCast(link.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={""} />;
             }
         });
     }
 
+    renderLinkItems(links: Map<string, Array<Doc>>) {
+        console.log("render link items");
+
+        let linkItems: Array<JSX.Element> = [];
+
+        links.forEach((links, group) => {
+            console.log("category is ", group);
+            linkItems.push(
+                <div key={group} className="link-menu-group">
+                    <p className="link-menu-group-name">{group}:</p>
+                    <div className="link-menu-group-wrapper">
+                        {this.renderLinkGroup(links)}
+                    </div>
+                </div>
+            )
+        });
+
+        return linkItems;
+    }
+
     render() {
         //get list of links from document
-        let linkFrom = DocListCast(this.props.docView.props.Document.linkedFromDocs);
-        let linkTo = DocListCast(this.props.docView.props.Document.linkedToDocs);
+        // let linkFrom = DocListCast(this.props.docView.props.Document.linkedFromDocs);
+        // let linkTo = DocListCast(this.props.docView.props.Document.linkedToDocs);
+        let related = LinkManager.Instance.findRelatedGroupedLinks(this.props.docView.props.Document);
         if (this._editingLink === undefined) {
             return (
                 <div id="linkMenu-container">
                     {/* <input id="linkMenu-searchBar" type="text" placeholder="Search..."></input> */}
                     <div id="linkMenu-list">
-                        {this.renderLinkItems(linkTo, "linkedTo", "Destination: ")}
-                        {this.renderLinkItems(linkFrom, "linkedFrom", "Source: ")}
+                        {/* {this.renderLinkItems(linkTo, "linkedTo", "Destination: ")}
+                        {this.renderLinkItems(linkFrom, "linkedFrom", "Source: ")} */}
+                        {this.renderLinkItems(related)}
                     </div>
                 </div>
             );
-- 
cgit v1.2.3-70-g09d2


From 70996f3f19d408e819e081ed03bd7ccf0de44503 Mon Sep 17 00:00:00 2001
From: Vellichora <fangrui_tong@brown.edu>
Date: Fri, 7 Jun 2019 17:52:31 -0400
Subject: links can be categorized under a group

---
 src/client/documents/Documents.ts        |  40 +++++++++---
 src/client/util/DocumentManager.ts       |   5 +-
 src/client/util/DragManager.ts           |   2 +-
 src/client/util/LinkManager.ts           |  84 +++++++++++++++++++++++++
 src/client/views/DocumentDecorations.tsx |   2 +-
 src/client/views/nodes/DocumentView.tsx  |   2 +-
 src/client/views/nodes/LinkEditor.tsx    | 103 +++++++++++++++++++++++++------
 src/client/views/nodes/LinkManager.tsx   |  51 ---------------
 src/client/views/nodes/LinkMenu.tsx      |  33 ++++++----
 9 files changed, 227 insertions(+), 95 deletions(-)
 create mode 100644 src/client/util/LinkManager.ts
 delete mode 100644 src/client/views/nodes/LinkManager.tsx

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 87b831663..5ec19f987 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -35,7 +35,7 @@ import { dropActionType } from "../util/DragManager";
 import { DateField } from "../../new_fields/DateField";
 import { UndoManager } from "../util/UndoManager";
 import { RouteStore } from "../../server/RouteStore";
-import { LinkManager } from "../views/nodes/LinkManager";
+import { LinkManager } from "../util/LinkManager";
 var requestImageSize = require('request-image-size');
 var path = require('path');
 
@@ -69,21 +69,45 @@ export interface DocumentOptions {
 }
 const delegateKeys = ["x", "y", "width", "height", "panX", "panY"];
 
+// export interface LinkData {
+//     anchor1: Doc;
+//     anchor1Page: number;
+//     anchor1Tags: Array<{ tag: string, name: string, description: string }>;
+//     anchor2: Doc;
+//     anchor2Page: number;
+//     anchor2Tags: Array<{ tag: string, name: string, description: string }>;
+// }
+
+// export interface TagData {
+//     tag: string;
+//     name: string;
+//     description: string;
+// }
+
 export namespace DocUtils {
     export function MakeLink(source: Doc, target: Doc) {
         // let protoSrc = source.proto ? source.proto : source;
         // let protoTarg = target.proto ? target.proto : target;
         UndoManager.RunInBatch(() => {
+            let groupDoc = Docs.TextDocument();
+            groupDoc.proto!.type = "*";
+
             let linkDoc = Docs.TextDocument({ width: 100, height: 30, borderRounding: -1 });
             //let linkDoc = new Doc;
-            linkDoc.proto!.title = source.proto!.title + " and " + target.proto!.title;
-            linkDoc.proto!.linkDescription = "";
-            linkDoc.proto!.linkTags = "Default";
+            // linkDoc.proto!.title = source.proto!.title + " and " + target.proto!.title;
+            // linkDoc.proto!.linkDescription = "";
+            linkDoc.proto!.anchor1 = source;
+            linkDoc.proto!.anchor1Page = source.curPage;
+            linkDoc.proto!.anchor1Groups = new List<Doc>([groupDoc]);
+
+            linkDoc.proto!.anchor2 = target;
+            linkDoc.proto!.anchor2Page = target.curPage;
+            linkDoc.proto!.anchor2Groups = new List<Doc>([groupDoc]);
 
-            linkDoc.proto!.linkedTo = target;
-            linkDoc.proto!.linkedToPage = target.curPage;
-            linkDoc.proto!.linkedFrom = source;
-            linkDoc.proto!.linkedFromPage = source.curPage;
+            // linkDoc.proto!.linkedTo = target;
+            // linkDoc.proto!.linkedToPage = target.curPage;
+            // linkDoc.proto!.linkedFrom = source;
+            // linkDoc.proto!.linkedFromPage = source.curPage;
 
             // let linkedFrom = Cast(protoTarg.linkedFromDocs, listSpec(Doc));
             // if (!linkedFrom) {
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 712529745..52f0fe3f6 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -9,7 +9,7 @@ import { CollectionView } from '../views/collections/CollectionView';
 import { CollectionPDFView } from '../views/collections/CollectionPDFView';
 import { CollectionVideoView } from '../views/collections/CollectionVideoView';
 import { Id } from '../../new_fields/FieldSymbols';
-import { LinkManager } from '../views/nodes/LinkManager';
+import { LinkManager } from './LinkManager';
 
 
 export class DocumentManager {
@@ -91,7 +91,8 @@ export class DocumentManager {
             if (linksList && linksList.length) {
                 pairs.push(...linksList.reduce((pairs, link) => {
                     if (link) {
-                        let destination = (link["linkedTo"] === dv.props.Document) ? link["linkedFrom"] : link["linkedTo"];
+                        // let destination = (link["linkedTo"] === dv.props.Document) ? link["linkedFrom"] : link["linkedTo"];
+                        let destination = LinkManager.Instance.findOppositeAnchor(link, dv.props.Document);
                         let linkToDoc = FieldValue(Cast(destination, Doc));
                         // let linkToDoc = FieldValue(Cast(link.linkedTo, Doc));
                         if (linkToDoc) {
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 7854cc080..809368aff 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -4,7 +4,7 @@ import { Cast } from "../../new_fields/Types";
 import { emptyFunction } from "../../Utils";
 import { CollectionDockingView } from "../views/collections/CollectionDockingView";
 import * as globalCssVariables from "../views/globalCssVariables.scss";
-import { LinkManager } from "../views/nodes/LinkManager";
+import { LinkManager } from "./LinkManager";
 
 export type dropActionType = "alias" | "copy" | undefined;
 export function SetupDrag(_reference: React.RefObject<HTMLElement>, docFunc: () => Doc | Promise<Doc>, moveFunc?: DragManager.MoveFunction, dropAction?: dropActionType) {
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
new file mode 100644
index 000000000..a6d649395
--- /dev/null
+++ b/src/client/util/LinkManager.ts
@@ -0,0 +1,84 @@
+import { observable, computed, action } from "mobx";
+import React = require("react");
+import { SelectionManager } from "./SelectionManager";
+import { observer } from "mobx-react";
+import { props } from "bluebird";
+import { DocumentView } from "../views/nodes/DocumentView";
+import { link } from "fs";
+import { StrCast, Cast } from "../../new_fields/Types";
+import { Doc } from "../../new_fields/Doc";
+import { listSpec } from "../../new_fields/Schema";
+import { List } from "../../new_fields/List";
+
+
+export class LinkManager {
+    private static _instance: LinkManager;
+    public static get Instance(): LinkManager {
+        return this._instance || (this._instance = new this());
+    }
+    private constructor() {
+    }
+
+    @observable
+    public allLinks: Array<Doc> = [];
+
+    public findAllRelatedLinks(source: Doc): Array<Doc> {
+        let related = LinkManager.Instance.allLinks.filter(
+            link => Doc.AreProtosEqual(source, Cast(link.anchor1, Doc, new Doc)) || Doc.AreProtosEqual(source, Cast(link.anchor2, Doc, new Doc)));
+        return related;
+    }
+
+    public findRelatedGroupedLinks(source: Doc): Map<string, Array<Doc>> {
+        let related = this.findAllRelatedLinks(source);
+
+        let categories = new Map();
+        related.forEach(link => {
+            // get groups of given doc
+            let groups = (Doc.AreProtosEqual(source, Cast(link.anchor1, Doc, new Doc))) ? Cast(link.anchor1Groups, listSpec(Doc), []) : Cast(link.anchor2Groups, listSpec(Doc), []);
+            if (groups) {
+                if (groups.length > 0) {
+                    groups.forEach(groupDoc => {
+                        if (groupDoc instanceof Doc) {
+                            let groupType = StrCast(groupDoc.proto!.type);
+                            let group = categories.get(groupType); // TODO: clean this up lol
+                            if (group) group.push(link);
+                            else group = [link];
+                            categories.set(groupType, group);
+                        } else {
+                            // promise doc
+                        }
+
+                    })
+                }
+                else {
+                    // if link is in no groups then put it in default group
+                    let group = categories.get("*");
+                    if (group) group.push(link);
+                    else group = [link];
+                    categories.set("*", group);
+                }
+            }
+
+
+            //     let anchor = this.findOppositeAnchor(link, source);
+            //     let group = categories.get(link.linkTags);
+            //     if (group) group.push(link);
+            //     else group = [link];
+            //     categories.set(link.linkTags, group);
+        })
+        return categories;
+    }
+
+    public findOppositeAnchor(link: Doc, source: Doc): Doc {
+        if (Doc.AreProtosEqual(source, Cast(link.anchor1, Doc, new Doc))) {
+            return Cast(link.anchor2, Doc, new Doc);
+        } else {
+            return Cast(link.anchor1, Doc, new Doc);
+        }
+    }
+
+    // public findAnchorTags(link: Doc, source: Doc): Doc[] {
+    //     if (source)
+    // }
+
+}
\ No newline at end of file
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index 2aae9bce6..eb45c770e 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -28,7 +28,7 @@ import { CollectionView } from "./collections/CollectionView";
 import { DocumentManager } from "../util/DocumentManager";
 import { FormattedTextBox } from "./nodes/FormattedTextBox";
 import { FieldView } from "./nodes/FieldView";
-import { LinkManager } from "./nodes/LinkManager";
+import { LinkManager } from "../util/LinkManager";
 
 library.add(faLink);
 
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 0baa061ab..fc6974e6c 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -52,7 +52,7 @@ library.add(faDesktop);
 const linkSchema = createSchema({
     title: "string",
     linkDescription: "string",
-    linkTags: listSpec("string"),
+    linkTags: "string",
     linkedTo: Doc,
     linkedFrom: Doc
 });
diff --git a/src/client/views/nodes/LinkEditor.tsx b/src/client/views/nodes/LinkEditor.tsx
index 71a423338..2ab8c3460 100644
--- a/src/client/views/nodes/LinkEditor.tsx
+++ b/src/client/views/nodes/LinkEditor.tsx
@@ -6,52 +6,115 @@ import './LinkEditor.scss';
 import { props } from "bluebird";
 import { DocumentView } from "./DocumentView";
 import { link } from "fs";
-import { StrCast } from "../../../new_fields/Types";
+import { StrCast, Cast } from "../../../new_fields/Types";
 import { Doc } from "../../../new_fields/Doc";
+import { List } from "../../../new_fields/List";
+import { listSpec } from "../../../new_fields/Schema";
+import { LinkManager } from "../../util/LinkManager";
 
 interface Props {
+    sourceDoc: Doc;
     linkDoc: Doc;
+    groups: Map<number, Doc>;
     showLinks: () => void;
 }
 
 @observer
 export class LinkEditor extends React.Component<Props> {
 
-    @observable private _nameInput: string = StrCast(this.props.linkDoc.title);
-    @observable private _descriptionInput: string = StrCast(this.props.linkDoc.linkDescription);
+    // @observable private _title: string = StrCast(this.props.linkDoc.title);
+    // @observable private _description: string = StrCast(this.props.linkDoc.linkDescription);
+    // @observable private _tags: Array<string> = Cast(this.props.linkDoc.linkTags, List);
 
+    // @action
+    // onTitleChanged = (e: React.ChangeEvent<HTMLInputElement>) => {
+    //     this._title = e.target.value;
+    // }
 
-    onSaveButtonPressed = (e: React.PointerEvent): void => {
-        e.stopPropagation();
+    // @action
+    // onDescriptionChanged = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+    //     this._description = e.target.value;
+    // }
+
+    // renderTags() {
+    //     return this._tags.map(tag => {
+    //         if (tag === "") {
+    //             return <input type="text" placeholder="Tag"></input>;
+    //         } else {
+    //             return <input type="text" value={tag}></input>;
+    //         }
+    //     })
+    // }
+
+    // addTag = (): void => {
+    //     this._tags.push("");
+    // }
 
+    @action
+    editGroup(groupId: number, value: string) {
         let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-        linkDoc.title = this._nameInput;
-        linkDoc.linkDescription = this._descriptionInput;
+        let groupDoc = this.props.groups.get(groupId);
+        if (groupDoc) {
+            groupDoc.proto!.type = value;
+            if (Doc.AreProtosEqual(this.props.sourceDoc, Cast(linkDoc.anchor1, Doc, new Doc))) {
+                // let groups = Cast(linkDoc.anchor1Groups, listSpec(Doc), []);
+                // groups.push(groupDoc);
+                linkDoc.anchor1Groups = new List<Doc>([groupDoc]);
+
+            } else {
+                linkDoc.anchor2Groups = new List<Doc>([groupDoc]);
+            }
+        }
 
-        this.props.showLinks();
     }
 
+    renderGroup(groupId: number, groupDoc: Doc) {
+        return (
+            <div>
+                <p>type:</p>
+                <input type="text" value={StrCast(groupDoc.proto!.type)} onChange={e => this.editGroup(groupId, e.target.value)}></input>
+            </div>
+        )
+    }
 
+    renderGroups() {
+        let groups: Array<JSX.Element> = [];
+        this.props.groups.forEach((groupDoc, groupId) => {
+            groups.push(
+                <div>
+                    {this.renderGroup(groupId, groupDoc)}
+                </div>
+            )
+        });
+        return groups;
+    }
+
+    onSaveButtonPressed = (e: React.PointerEvent): void => {
+        e.stopPropagation();
+
+        // let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
+        // // linkDoc.title = this._title;
+        // // linkDoc.linkDescription = this._description;
+
+        this.props.showLinks();
+    }
 
     render() {
+        let destination = LinkManager.Instance.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
 
         return (
             <div className="edit-container">
-                <input onChange={this.onNameChanged} className="name-input" type="text" value={this._nameInput} placeholder="Name . . ."></input>
-                <textarea onChange={this.onDescriptionChanged} className="description-input" value={this._descriptionInput} placeholder="Description . . ."></textarea>
+                <p>linked to: {destination.proto!.title}</p>
+                <b>Groups:</b>
+                {this.renderGroups()}
+
+                {/* <input onChange={this.onTitleChanged} className="name-input" type="text" value={this._title} placeholder="Name . . ."></input>
+                <textarea onChange={this.onDescriptionChanged} className="description-input" value={this._description} placeholder="Description . . ."></textarea> */}
+                {/* {this.renderTags()}
+                <button onClick={this.addTag}>+</button> */}
                 <div className="save-button" onPointerDown={this.onSaveButtonPressed}>SAVE</div>
             </div>
 
         );
     }
-
-    @action
-    onNameChanged = (e: React.ChangeEvent<HTMLInputElement>) => {
-        this._nameInput = e.target.value;
-    }
-
-    @action
-    onDescriptionChanged = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-        this._descriptionInput = e.target.value;
-    }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkManager.tsx b/src/client/views/nodes/LinkManager.tsx
deleted file mode 100644
index 1064eaa22..000000000
--- a/src/client/views/nodes/LinkManager.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { observable, computed, action } from "mobx";
-import React = require("react");
-import { SelectionManager } from "../../util/SelectionManager";
-import { observer } from "mobx-react";
-import './LinkEditor.scss';
-import { props } from "bluebird";
-import { DocumentView } from "./DocumentView";
-import { link } from "fs";
-import { StrCast, Cast } from "../../../new_fields/Types";
-import { Doc } from "../../../new_fields/Doc";
-import { listSpec } from "../../../new_fields/Schema";
-
-
-export class LinkManager {
-    private static _instance: LinkManager;
-    public static get Instance(): LinkManager {
-        return this._instance || (this._instance = new this());
-    }
-    private constructor() {
-    }
-
-    @observable
-    public allLinks: Array<Doc> = [];
-
-    public findAllRelatedLinks(source: Doc): Array<Doc> {
-        let related = LinkManager.Instance.allLinks.filter(
-            link => Doc.AreProtosEqual(source, Cast(link.linkedFrom, Doc, new Doc)) || Doc.AreProtosEqual(source, Cast(link.linkedTo, Doc, new Doc)));
-        return related;
-    }
-
-    public findRelatedGroupedLinks(source: Doc): Map<string, Array<Doc>> {
-        let related = this.findAllRelatedLinks(source);
-        let categories = new Map();
-        related.forEach(link => {
-            let group = categories.get(link.linkTags);
-            if (group) group.push(link);
-            else group = [link];
-            categories.set(link.linkTags, group);
-        })
-        return categories;
-    }
-
-    public findOppositeAnchor(link: Doc, source: Doc): Doc {
-        if (Doc.AreProtosEqual(source, Cast(link.linkedFrom, Doc, new Doc))) {
-            return Cast(link.linkedTo, Doc, new Doc);
-        } else {
-            return Cast(link.linkedFrom, Doc, new Doc);
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 6dc5623d1..affe35e2a 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -8,7 +8,9 @@ import React = require("react");
 import { Doc, DocListCast } from "../../../new_fields/Doc";
 import { Cast, FieldValue, StrCast } from "../../../new_fields/Types";
 import { Id } from "../../../new_fields/FieldSymbols";
-import { LinkManager } from "./LinkManager";
+import { LinkManager } from "../../util/LinkManager";
+import { number } from "prop-types";
+import { listSpec } from "../../../new_fields/Schema";
 
 interface Props {
     docView: DocumentView;
@@ -29,23 +31,20 @@ export class LinkMenu extends React.Component<Props> {
     //     });
     // }
 
-    renderLinkGroup(links: Doc[]) {
-        console.log("render link group");
+    renderLinkGroupItems(links: Doc[]) {
         let source = this.props.docView.Document;
-        console.log("num links", links.length, typeof links);
         return links.map(link => {
-            let destination = (link["linkedTo"] === source) ? link["linkedFrom"] : link["linkedTo"];
+            // let destination = (link["linkedTo"] === source) ? link["linkedFrom"] : link["linkedTo"];
+            let destination = LinkManager.Instance.findOppositeAnchor(link, source);
             let doc = FieldValue(Cast(destination, Doc));
             if (doc) {
                 console.log(doc[Id] + source[Id], "source is", source[Id]);
-                return <LinkBox key={doc[Id] + source[Id]} linkDoc={link} linkName={StrCast(link.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={""} />;
+                return <LinkBox key={doc[Id] + source[Id]} linkDoc={link} linkName={"link"} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={""} />;
             }
         });
     }
 
-    renderLinkItems(links: Map<string, Array<Doc>>) {
-        console.log("render link items");
-
+    renderLinkItems = (links: Map<string, Array<Doc>>): Array<JSX.Element> => {
         let linkItems: Array<JSX.Element> = [];
 
         links.forEach((links, group) => {
@@ -54,7 +53,7 @@ export class LinkMenu extends React.Component<Props> {
                 <div key={group} className="link-menu-group">
                     <p className="link-menu-group-name">{group}:</p>
                     <div className="link-menu-group-wrapper">
-                        {this.renderLinkGroup(links)}
+                        {this.renderLinkGroupItems(links)}
                     </div>
                 </div>
             )
@@ -80,8 +79,20 @@ export class LinkMenu extends React.Component<Props> {
                 </div>
             );
         } else {
+            let counter = 0;
+            let groups = new Map<number, Doc>();
+            let groupList = (Doc.AreProtosEqual(this.props.docView.props.Document, Cast(this._editingLink.anchor1, Doc, new Doc))) ?
+                Cast(this._editingLink.anchor1Groups, listSpec(Doc), []) : Cast(this._editingLink.anchor2Groups, listSpec(Doc), []);
+            groupList.forEach(group => {
+                if (group instanceof Doc) {
+                    console.log(counter);
+                    groups.set(counter, group);
+                    counter++;
+                }
+            })
+
             return (
-                <LinkEditor linkDoc={this._editingLink} showLinks={action(() => this._editingLink = undefined)}></LinkEditor>
+                <LinkEditor groups={groups} sourceDoc={this.props.docView.props.Document} linkDoc={this._editingLink} showLinks={action(() => this._editingLink = undefined)}></LinkEditor>
             );
         }
 
-- 
cgit v1.2.3-70-g09d2


From d429898b5337331450e46c223380e5d00967b2d6 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Mon, 10 Jun 2019 20:02:32 -0400
Subject: added set up for metadata on links

---
 src/client/documents/Documents.ts      |   1 +
 src/client/util/DocumentManager.ts     |   5 +-
 src/client/util/DragManager.ts         |   4 +-
 src/client/util/LinkManager.ts         |  81 ++++++++----
 src/client/views/nodes/LinkEditor.scss |  42 ++++++
 src/client/views/nodes/LinkEditor.tsx  | 229 +++++++++++++++++++++++++++------
 src/client/views/nodes/LinkMenu.tsx    |  34 +++--
 7 files changed, 313 insertions(+), 83 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 5ec19f987..731490d97 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -91,6 +91,7 @@ export namespace DocUtils {
         UndoManager.RunInBatch(() => {
             let groupDoc = Docs.TextDocument();
             groupDoc.proto!.type = "*";
+            groupDoc.proto!.metadata = new List<Doc>([]);
 
             let linkDoc = Docs.TextDocument({ width: 100, height: 30, borderRounding: -1 });
             //let linkDoc = new Doc;
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 52f0fe3f6..2acbb3ad4 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -9,7 +9,7 @@ import { CollectionView } from '../views/collections/CollectionView';
 import { CollectionPDFView } from '../views/collections/CollectionPDFView';
 import { CollectionVideoView } from '../views/collections/CollectionVideoView';
 import { Id } from '../../new_fields/FieldSymbols';
-import { LinkManager } from './LinkManager';
+import { LinkManager, LinkUtils } from './LinkManager';
 
 
 export class DocumentManager {
@@ -92,7 +92,8 @@ export class DocumentManager {
                 pairs.push(...linksList.reduce((pairs, link) => {
                     if (link) {
                         // let destination = (link["linkedTo"] === dv.props.Document) ? link["linkedFrom"] : link["linkedTo"];
-                        let destination = LinkManager.Instance.findOppositeAnchor(link, dv.props.Document);
+
+                        let destination = LinkUtils.findOppositeAnchor(link, dv.props.Document);
                         let linkToDoc = FieldValue(Cast(destination, Doc));
                         // let linkToDoc = FieldValue(Cast(link.linkedTo, Doc));
                         if (linkToDoc) {
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 809368aff..9ac421fbf 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -4,7 +4,7 @@ import { Cast } from "../../new_fields/Types";
 import { emptyFunction } from "../../Utils";
 import { CollectionDockingView } from "../views/collections/CollectionDockingView";
 import * as globalCssVariables from "../views/globalCssVariables.scss";
-import { LinkManager } from "./LinkManager";
+import { LinkManager, LinkUtils } from "./LinkManager";
 
 export type dropActionType = "alias" | "copy" | undefined;
 export function SetupDrag(_reference: React.RefObject<HTMLElement>, docFunc: () => Doc | Promise<Doc>, moveFunc?: DragManager.MoveFunction, dropAction?: dropActionType) {
@@ -48,7 +48,7 @@ export async function DragLinksAsDocuments(dragEle: HTMLElement, x: number, y: n
         // let linkFromDocs = await DocListCastAsync(srcTarg.linkedFromDocs);
         let linkDocs = LinkManager.Instance.findAllRelatedLinks(srcTarg);
         if (linkDocs) draggedDocs = linkDocs.map(link => {
-            return LinkManager.Instance.findOppositeAnchor(link, sourceDoc);
+            return LinkUtils.findOppositeAnchor(link, sourceDoc);
         });
 
 
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index a6d649395..5e8e0475b 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -10,6 +10,43 @@ import { Doc } from "../../new_fields/Doc";
 import { listSpec } from "../../new_fields/Schema";
 import { List } from "../../new_fields/List";
 
+export namespace LinkUtils {
+    export function findOppositeAnchor(link: Doc, anchor: Doc): Doc {
+        if (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) {
+            return Cast(link.anchor2, Doc, new Doc);
+        } else {
+            return Cast(link.anchor1, Doc, new Doc);
+        }
+    }
+
+    // export function getAnchorGroups(link: Doc, anchor: Doc): Doc[] {
+    //     let groups;
+    //     if (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) {
+    //         groups = Cast(link.anchor1Groups, listSpec(Doc), []);
+    //     } else {
+    //         groups = Cast(link.anchor2Groups, listSpec(Doc), []);
+    //     }
+
+    //     if (groups instanceof Doc[]) {
+    //         return groups;
+    //     } else {
+    //         return [];
+    //     }
+    //     // if (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) {
+    //     //     returnCast(link.anchor1Groups, listSpec(Doc), []);
+    //     // } else {
+    //     //     return Cast(link.anchor2Groups, listSpec(Doc), []);
+    //     // }
+    // }
+
+    export function setAnchorGroups(link: Doc, anchor: Doc, groups: Doc[]) {
+        if (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) {
+            link.anchor1Groups = new List<Doc>(groups);
+        } else {
+            link.anchor2Groups = new List<Doc>(groups);
+        }
+    }
+}
 
 export class LinkManager {
     private static _instance: LinkManager;
@@ -19,31 +56,30 @@ export class LinkManager {
     private constructor() {
     }
 
-    @observable
-    public allLinks: Array<Doc> = [];
+    @observable public allLinks: Array<Doc> = [];
+    @observable public allGroups: Map<string, Doc> = new Map();
 
-    public findAllRelatedLinks(source: Doc): Array<Doc> {
-        let related = LinkManager.Instance.allLinks.filter(
-            link => Doc.AreProtosEqual(source, Cast(link.anchor1, Doc, new Doc)) || Doc.AreProtosEqual(source, Cast(link.anchor2, Doc, new Doc)));
-        return related;
+    public findAllRelatedLinks(anchor: Doc): Array<Doc> {
+        return LinkManager.Instance.allLinks.filter(
+            link => Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc)) || Doc.AreProtosEqual(anchor, Cast(link.anchor2, Doc, new Doc)));
     }
 
-    public findRelatedGroupedLinks(source: Doc): Map<string, Array<Doc>> {
-        let related = this.findAllRelatedLinks(source);
+    public findRelatedGroupedLinks(anchor: Doc): Map<string, Array<Doc>> {
+        let related = this.findAllRelatedLinks(anchor);
 
-        let categories = new Map();
+        let anchorGroups = new Map();
         related.forEach(link => {
             // get groups of given doc
-            let groups = (Doc.AreProtosEqual(source, Cast(link.anchor1, Doc, new Doc))) ? Cast(link.anchor1Groups, listSpec(Doc), []) : Cast(link.anchor2Groups, listSpec(Doc), []);
-            if (groups) {
-                if (groups.length > 0) {
-                    groups.forEach(groupDoc => {
+            let oppGroups = (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) ? Cast(link.anchor1Groups, listSpec(Doc), []) : Cast(link.anchor2Groups, listSpec(Doc), []);
+            if (oppGroups) {
+                if (oppGroups.length > 0) {
+                    oppGroups.forEach(groupDoc => {
                         if (groupDoc instanceof Doc) {
                             let groupType = StrCast(groupDoc.proto!.type);
-                            let group = categories.get(groupType); // TODO: clean this up lol
+                            let group = anchorGroups.get(groupType); // TODO: clean this up lol
                             if (group) group.push(link);
                             else group = [link];
-                            categories.set(groupType, group);
+                            anchorGroups.set(groupType, group);
                         } else {
                             // promise doc
                         }
@@ -52,10 +88,10 @@ export class LinkManager {
                 }
                 else {
                     // if link is in no groups then put it in default group
-                    let group = categories.get("*");
+                    let group = anchorGroups.get("*");
                     if (group) group.push(link);
                     else group = [link];
-                    categories.set("*", group);
+                    anchorGroups.set("*", group);
                 }
             }
 
@@ -66,16 +102,11 @@ export class LinkManager {
             //     else group = [link];
             //     categories.set(link.linkTags, group);
         })
-        return categories;
+        return anchorGroups;
     }
 
-    public findOppositeAnchor(link: Doc, source: Doc): Doc {
-        if (Doc.AreProtosEqual(source, Cast(link.anchor1, Doc, new Doc))) {
-            return Cast(link.anchor2, Doc, new Doc);
-        } else {
-            return Cast(link.anchor1, Doc, new Doc);
-        }
-    }
+
+
 
     // public findAnchorTags(link: Doc, source: Doc): Doc[] {
     //     if (source)
diff --git a/src/client/views/nodes/LinkEditor.scss b/src/client/views/nodes/LinkEditor.scss
index 9629585d7..52ed26442 100644
--- a/src/client/views/nodes/LinkEditor.scss
+++ b/src/client/views/nodes/LinkEditor.scss
@@ -39,4 +39,46 @@
 .save-button:hover {
     background: $main-accent;
     cursor: pointer;
+}
+
+.linkEditor {
+    font-size: 12px; // TODO
+
+    .linkEditor-back {
+        // background-color: $dark-color;
+        // color: $light-color;
+        margin-bottom: 6px;
+    }
+
+    .linkEditor-groupsLabel {
+        display: flex;
+        justify-content: space-between;
+        button {
+            width: 20px;
+            height: 20px;
+            margin-left: 6px;
+            padding: 0;
+            font-size: 14px;
+        }
+    }
+    .linkEditor-linkedTo {
+        border-bottom: 0.5px solid $light-color-secondary; 
+        padding-bottom: 6px;
+        margin-bottom: 6px;
+    }
+    .linkEditor-group {
+        background-color: $light-color-secondary; 
+        padding: 6px;
+        margin: 3px 0;
+        border-radius: 3px;
+    }
+    .linkEditor-group-row {
+        display: flex;
+        .linkEditor-group-row-label {
+            margin-right: 6px;
+        }
+    }
+    .linkEditor-metadata-row {
+        display: flex;
+    }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkEditor.tsx b/src/client/views/nodes/LinkEditor.tsx
index 2ab8c3460..14fdd26df 100644
--- a/src/client/views/nodes/LinkEditor.tsx
+++ b/src/client/views/nodes/LinkEditor.tsx
@@ -10,17 +10,57 @@ import { StrCast, Cast } from "../../../new_fields/Types";
 import { Doc } from "../../../new_fields/Doc";
 import { List } from "../../../new_fields/List";
 import { listSpec } from "../../../new_fields/Schema";
-import { LinkManager } from "../../util/LinkManager";
+import { LinkManager, LinkUtils } from "../../util/LinkManager";
+import { Docs } from "../../documents/Documents";
+import { Utils } from "../../../Utils";
+import { faArrowLeft, faEllipsisV } from '@fortawesome/free-solid-svg-icons';
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { string } from "prop-types";
 
-interface Props {
+library.add(faArrowLeft);
+library.add(faEllipsisV);
+
+interface LinkEditorProps {
     sourceDoc: Doc;
     linkDoc: Doc;
-    groups: Map<number, Doc>;
+    groups: Map<string, Doc>;
+    metadata: Map<string, Map<string, Doc>>;
     showLinks: () => void;
 }
 
 @observer
-export class LinkEditor extends React.Component<Props> {
+export class LinkEditor extends React.Component<LinkEditorProps> {
+
+    // @observable private _groups: Map<string, Doc> = new Map();
+    // @observable private _metadata: Map<string, Map<string, Doc>> = new Map();
+
+    // // componentDidMount() {
+
+    // // }
+    // constructor(props: LinkEditorProps) {
+    //     super(props);
+
+    //     let groups = new Map<string, Doc>();
+    //     let metadata: Map<string, Map<string, Doc>> = new Map();
+    //     let groupList = (Doc.AreProtosEqual(props.docView.props.Document, Cast(this._editingLink.anchor1, Doc, new Doc))) ?
+    //         Cast(this._editingLink.anchor1Groups, listSpec(Doc), []) : Cast(this._editingLink.anchor2Groups, listSpec(Doc), []);
+    //     groupList.forEach(groupDoc => {
+    //         if (groupDoc instanceof Doc) {
+    //             let id = Utils.GenerateGuid();
+    //             groups.set(id, groupDoc);
+
+    //             let metadataMap = new Map<string, Doc>();
+    //             let metadataDocs = Cast(groupDoc.proto!.metadata, listSpec(Doc), []);
+    //             metadataDocs.forEach(mdDoc => {
+    //                 if (mdDoc && mdDoc instanceof Doc) { // TODO: handle promise doc
+    //                     metadataMap.set(Utils.GenerateGuid(), mdDoc);
+    //                 }
+    //             })
+    //             metadata.set(id, metadataMap);
+    //         }
+    //     })
+    // }
 
     // @observable private _title: string = StrCast(this.props.linkDoc.title);
     // @observable private _description: string = StrCast(this.props.linkDoc.linkDescription);
@@ -51,68 +91,175 @@ export class LinkEditor extends React.Component<Props> {
     // }
 
     @action
-    editGroup(groupId: number, value: string) {
+    editGroup(groupId: string, value: string) {
         let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
         let groupDoc = this.props.groups.get(groupId);
         if (groupDoc) {
             groupDoc.proto!.type = value;
-            if (Doc.AreProtosEqual(this.props.sourceDoc, Cast(linkDoc.anchor1, Doc, new Doc))) {
-                // let groups = Cast(linkDoc.anchor1Groups, listSpec(Doc), []);
-                // groups.push(groupDoc);
-                linkDoc.anchor1Groups = new List<Doc>([groupDoc]);
-
-            } else {
-                linkDoc.anchor2Groups = new List<Doc>([groupDoc]);
-            }
+            LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, [groupDoc]);
         }
+    }
+
+    @action
+    addGroup = (e: React.MouseEvent): void => {
+        // create new document for group
+        let groupDoc = Docs.TextDocument();
+        groupDoc.proto!.title = "";
+        groupDoc.proto!.metadata = new List<Doc>([]);
 
+        this.props.groups.set(Utils.GenerateGuid(), groupDoc);
+
+        let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
+        LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this.props.groups.values()));
     }
 
-    renderGroup(groupId: number, groupDoc: Doc) {
+    renderGroup(groupId: string, groupDoc: Doc) {
+        // let metadata = this.props.metadata.get(groupId);
+        // if (!metadata) {
+        //     metadata = new Map<string, Doc>();
+        // }
         return (
-            <div>
-                <p>type:</p>
-                <input type="text" value={StrCast(groupDoc.proto!.type)} onChange={e => this.editGroup(groupId, e.target.value)}></input>
+            // <div key={groupId} className="linkEditor-group">
+            <div key={groupId} className="linkEditor-group-row">
+                <p className="linkEditor-group-row-label">type:</p>
+                <input key={groupId + "-type"} type="text" value={StrCast(groupDoc.proto!.type)} onChange={e => this.editGroup(groupId, e.target.value)}></input>
             </div>
+            //         {/* {this.renderMetadata(groupId)} */ }
+            // {/* <button onPointerDown={() => this.addMetadata(groupId)}>+</button> */ }
+            //     // </div>
         )
     }
 
+    @action
+    addMetadata = (groupId: string): void => {
+        // create new metadata doc
+        let mdDoc = Docs.TextDocument();
+        mdDoc.proto!.title = "";
+        mdDoc.proto!.value = "";
+
+        // append to map
+        let mdMap = this.props.metadata.get(groupId);
+        if (mdMap) {
+            mdMap.set(Utils.GenerateGuid(), mdDoc);
+        } else {
+            mdMap = new Map();
+            mdMap.set(Utils.GenerateGuid(), mdDoc);
+        }
+
+        // add to internal representation of metadata
+        this.props.metadata.set(groupId, mdMap);
+
+        // add to internatal representation of group
+        let groupDoc = this.props.groups.get(groupId);
+        if (groupDoc) {
+            groupDoc.proto!.metadata = new List<Doc>(Array.from(mdMap.values()));
+            this.props.groups.set(groupId, groupDoc);
+        }
+
+        // add to link doc
+        let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
+        LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this.props.groups.values()));
+
+    }
+
+    // @action
+    // addMetadata = (groupId: string): void => {
+    //     let groupDoc = this.props.groups.get(groupId);
+    //     if (groupDoc) {
+    //         // create new document for metadata row
+    //         let metadata = Cast(groupDoc.metadata, listSpec(Doc), []);
+    //         let metadataDoc = Docs.TextDocument();
+    //         metadataDoc.proto!.title = "";
+    //         metadataDoc.proto!.value = "";
+    //         let metadataMap = new Map<string, 
+
+    //         this.props.metadata.set(groupId, new Map)
+
+    //         groupDoc.proto!.metadata = new List<Doc>([metadataDoc]); // TODO: append to metadata
+    //     }
+    // }
+
+    // @action
+    // editMetadataTitle = (groupId: string, mdId: string, value: string) => {
+    //     let group = this.props.metadata.get(groupId);
+    //     if (group) {
+    //         let mdDoc = group.get(mdId);
+    //         if (mdDoc) {
+    //             mdDoc.proto!.title = value;
+    //         }
+    //     }
+    // }
+
+    // @action
+    // editMetadataValue = (groupId: string, mdId: string, value: string) => {
+    //     let group = this.props.metadata.get(groupId);
+    //     if (group) {
+    //         let mdDoc = group.get(mdId);
+    //         if (mdDoc) {
+    //             mdDoc.proto!.value = value;
+    //         }
+    //     }
+    // }
+
+    @action
+    editMetadataTitle(groupId: string, mdId: string, value: string) {
+
+    }
+
+    @action
+    editMetadataValue(groupId: string, mdId: string, value: string) {
+
+    }
+
+    renderMetadata(groupId: string) {
+        let metadata: Array<JSX.Element> = [];
+        let metadataMap = this.props.metadata.get(groupId);
+        if (metadataMap) {
+            metadataMap.forEach((mdDoc, mdId) => {
+                metadata.push(
+                    <div key={mdId} className="linkEditor-metadata-row">
+                        <input type="text" value={StrCast(mdDoc.proto!.title)} onChange={e => this.editMetadataTitle(groupId, mdId, e.target.value)}></input>
+                        :
+                        <input type="text" value={StrCast(mdDoc.proto!.value)} onChange={e => this.editMetadataValue(groupId, mdId, e.target.value)}></input>
+                    </div>
+                )
+            })
+        }
+
+        return metadata;
+
+        // let metadataList: Array<JSX.Element> = [];
+        // metadata.forEach((mdDoc, mdId) => {
+        //     metadataList.push(
+        //         <div key={mdId} className="linkEditor-metadata-row">
+        //             <input type="text" value={StrCast(mdDoc.proto!.title)} onChange={e => this.editMetadataTitle(groupId, mdId, e.target.value)}></input>:
+        //             <input type="text" value={StrCast(mdDoc.proto!.value)} onChange={e => this.editMetadataValue(groupId, mdId, e.target.value)}></input>
+        //         </div>
+        //     )
+        // })
+    }
+
     renderGroups() {
         let groups: Array<JSX.Element> = [];
         this.props.groups.forEach((groupDoc, groupId) => {
-            groups.push(
-                <div>
-                    {this.renderGroup(groupId, groupDoc)}
-                </div>
-            )
+            groups.push(this.renderGroup(groupId, groupDoc))
         });
         return groups;
     }
 
-    onSaveButtonPressed = (e: React.PointerEvent): void => {
-        e.stopPropagation();
-
-        // let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-        // // linkDoc.title = this._title;
-        // // linkDoc.linkDescription = this._description;
-
-        this.props.showLinks();
-    }
-
     render() {
-        let destination = LinkManager.Instance.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
+        let destination = LinkUtils.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
 
         return (
-            <div className="edit-container">
-                <p>linked to: {destination.proto!.title}</p>
-                <b>Groups:</b>
+            <div className="linkEditor">
+                <button className="linkEditor-back" onPointerDown={() => this.props.showLinks()}><FontAwesomeIcon icon="arrow-left" size="sm" /></button>
+                <p className="linkEditor-linkedTo">editing link to: <b>{destination.proto!.title}</b></p>
+                <div className="linkEditor-groupsLabel">
+                    <b>Groups:</b>
+                    <button onClick={this.addGroup} title="Add Group">+</button>
+                </div>
                 {this.renderGroups()}
 
-                {/* <input onChange={this.onTitleChanged} className="name-input" type="text" value={this._title} placeholder="Name . . ."></input>
-                <textarea onChange={this.onDescriptionChanged} className="description-input" value={this._description} placeholder="Description . . ."></textarea> */}
-                {/* {this.renderTags()}
-                <button onClick={this.addTag}>+</button> */}
-                <div className="save-button" onPointerDown={this.onSaveButtonPressed}>SAVE</div>
             </div>
 
         );
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index affe35e2a..ab478feae 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -8,9 +8,10 @@ import React = require("react");
 import { Doc, DocListCast } from "../../../new_fields/Doc";
 import { Cast, FieldValue, StrCast } from "../../../new_fields/Types";
 import { Id } from "../../../new_fields/FieldSymbols";
-import { LinkManager } from "../../util/LinkManager";
-import { number } from "prop-types";
+import { LinkManager, LinkUtils } from "../../util/LinkManager";
+import { number, string } from "prop-types";
 import { listSpec } from "../../../new_fields/Schema";
+import { Utils } from "../../../Utils";
 
 interface Props {
     docView: DocumentView;
@@ -34,12 +35,11 @@ export class LinkMenu extends React.Component<Props> {
     renderLinkGroupItems(links: Doc[]) {
         let source = this.props.docView.Document;
         return links.map(link => {
-            // let destination = (link["linkedTo"] === source) ? link["linkedFrom"] : link["linkedTo"];
-            let destination = LinkManager.Instance.findOppositeAnchor(link, source);
+            let destination = LinkUtils.findOppositeAnchor(link, source);
             let doc = FieldValue(Cast(destination, Doc));
             if (doc) {
                 console.log(doc[Id] + source[Id], "source is", source[Id]);
-                return <LinkBox key={doc[Id] + source[Id]} linkDoc={link} linkName={"link"} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={""} />;
+                return <LinkBox key={doc[Id] + source[Id]} linkDoc={link} linkName={StrCast(destination.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={""} />;
             }
         });
     }
@@ -79,20 +79,28 @@ export class LinkMenu extends React.Component<Props> {
                 </div>
             );
         } else {
-            let counter = 0;
-            let groups = new Map<number, Doc>();
+            let groups = new Map<string, Doc>();
+            let metadata: Map<string, Map<string, Doc>> = new Map();
             let groupList = (Doc.AreProtosEqual(this.props.docView.props.Document, Cast(this._editingLink.anchor1, Doc, new Doc))) ?
                 Cast(this._editingLink.anchor1Groups, listSpec(Doc), []) : Cast(this._editingLink.anchor2Groups, listSpec(Doc), []);
-            groupList.forEach(group => {
-                if (group instanceof Doc) {
-                    console.log(counter);
-                    groups.set(counter, group);
-                    counter++;
+            groupList.forEach(groupDoc => {
+                if (groupDoc instanceof Doc) {
+                    let id = Utils.GenerateGuid();
+                    groups.set(id, groupDoc);
+
+                    let metadataMap = new Map<string, Doc>();
+                    let metadataDocs = Cast(groupDoc.proto!.metadata, listSpec(Doc), []);
+                    metadataDocs.forEach(mdDoc => {
+                        if (mdDoc && mdDoc instanceof Doc) { // TODO: handle promise doc
+                            metadataMap.set(Utils.GenerateGuid(), mdDoc);
+                        }
+                    })
+                    metadata.set(id, metadataMap);
                 }
             })
 
             return (
-                <LinkEditor groups={groups} sourceDoc={this.props.docView.props.Document} linkDoc={this._editingLink} showLinks={action(() => this._editingLink = undefined)}></LinkEditor>
+                <LinkEditor groups={groups} metadata={metadata} sourceDoc={this.props.docView.props.Document} linkDoc={this._editingLink} showLinks={action(() => this._editingLink = undefined)}></LinkEditor>
             );
         }
 
-- 
cgit v1.2.3-70-g09d2


From 074b4b2a3246ae86fda334629d40540dd2bbf633 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Tue, 11 Jun 2019 15:27:02 -0400
Subject: links can choose group type from preexisting group types

---
 src/client/util/LinkManager.ts         |   2 +-
 src/client/views/nodes/LinkEditor.scss |  26 +++
 src/client/views/nodes/LinkEditor.tsx  | 370 ++++++++++++++++++---------------
 src/client/views/nodes/LinkMenu.tsx    |  43 ++--
 4 files changed, 252 insertions(+), 189 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 5e8e0475b..99fb4c6c0 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -57,7 +57,7 @@ export class LinkManager {
     }
 
     @observable public allLinks: Array<Doc> = [];
-    @observable public allGroups: Map<string, Doc> = new Map();
+    @observable public allGroups: Map<string, Array<string>> = new Map();
 
     public findAllRelatedLinks(anchor: Doc): Array<Doc> {
         return LinkManager.Instance.allLinks.filter(
diff --git a/src/client/views/nodes/LinkEditor.scss b/src/client/views/nodes/LinkEditor.scss
index 52ed26442..d3ac8cf19 100644
--- a/src/client/views/nodes/LinkEditor.scss
+++ b/src/client/views/nodes/LinkEditor.scss
@@ -80,5 +80,31 @@
     }
     .linkEditor-metadata-row {
         display: flex;
+        justify-content: space-between;
+        input {
+            width: calc(50% - 2px);
+        }
+    }
+}
+
+.linkEditor-dropdown {
+    width: 100%;
+    position: relative;
+    .linkEditor-options-wrapper {
+        width: 100%;
+        position: absolute;
+        top: 19px;
+        left: 0;
+        display: flex;
+        flex-direction: column;
+    }
+    .linkEditor-option {
+        background-color: red;
+        border: 1px solid $intermediate-color;
+        border-top: 0;
+        cursor: pointer;
+        &:hover {
+            background-color:  $light-color-secondary;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkEditor.tsx b/src/client/views/nodes/LinkEditor.tsx
index 14fdd26df..481d3bf37 100644
--- a/src/client/views/nodes/LinkEditor.tsx
+++ b/src/client/views/nodes/LinkEditor.tsx
@@ -21,85 +21,119 @@ import { string } from "prop-types";
 library.add(faArrowLeft);
 library.add(faEllipsisV);
 
+// this dropdown could be generalizeds
+@observer
+class LinkGroupsDropdown extends React.Component<{ groupId: string, groupType: string, setGroup: (groupId: string, group: string) => void }> {
+    @observable private _searchTerm: string = "";
+    @observable private _groupType: string = this.props.groupType;
+
+    @action
+    setSearchTerm(value: string) {
+        this._searchTerm = value;
+    }
+
+    @action
+    setGroupType(value: string) {
+        this._groupType = value;
+    }
+
+    createGroup(value: string) {
+        LinkManager.Instance.allGroups.set(value, []);
+        this.props.setGroup(this.props.groupId, value);
+    }
+
+    renderOptions = (): JSX.Element[] => {
+        let allGroups: string[], searchTerm: string, results: string[], exactFound: boolean;
+        if (this._searchTerm !== "") {
+            allGroups = Array.from(LinkManager.Instance.allGroups.keys());
+            searchTerm = this._searchTerm.toUpperCase();
+            results = allGroups.filter(group => group.toUpperCase().indexOf(searchTerm) > -1);
+            exactFound = results.findIndex(group => group.toUpperCase() === searchTerm) > -1;
+        } else {
+            results = [];
+            exactFound = false;
+        }
+
+        let options = [];
+        results.forEach(result => {
+            options.push(<div key={result} className="linkEditor-option"
+                onClick={() => { this.props.setGroup(this.props.groupId, result); this.setGroupType(result); this.setSearchTerm("") }}>{result}</div>)
+        });
+
+        if (!exactFound && this._searchTerm !== "") {
+            options.push(<div key={""} className="linkEditor-option"
+                onClick={() => { this.createGroup(this._searchTerm); this.setGroupType(this._searchTerm); this.setSearchTerm("") }}>Create new "{this._searchTerm}" group</div>)
+        }
+
+        return options;
+    }
+
+    render() {
+        return (
+            <div className="linkEditor-dropdown">
+                <input type="text" value={this._groupType} placeholder="Search for a group or create a new group"
+                    onChange={e => { this.setSearchTerm(e.target.value); this.setGroupType(e.target.value) }}></input>
+                <div className="linkEditor-options-wrapper">
+                    {this.renderOptions()}
+                </div>
+            </div>
+        )
+    }
+}
+
+
 interface LinkEditorProps {
     sourceDoc: Doc;
     linkDoc: Doc;
-    groups: Map<string, Doc>;
-    metadata: Map<string, Map<string, Doc>>;
+    // groups: Map<string, Doc>;
+    // metadata: Map<string, Map<string, Doc>>;
     showLinks: () => void;
 }
 
 @observer
 export class LinkEditor extends React.Component<LinkEditorProps> {
 
-    // @observable private _groups: Map<string, Doc> = new Map();
-    // @observable private _metadata: Map<string, Map<string, Doc>> = new Map();
-
-    // // componentDidMount() {
-
-    // // }
-    // constructor(props: LinkEditorProps) {
-    //     super(props);
-
-    //     let groups = new Map<string, Doc>();
-    //     let metadata: Map<string, Map<string, Doc>> = new Map();
-    //     let groupList = (Doc.AreProtosEqual(props.docView.props.Document, Cast(this._editingLink.anchor1, Doc, new Doc))) ?
-    //         Cast(this._editingLink.anchor1Groups, listSpec(Doc), []) : Cast(this._editingLink.anchor2Groups, listSpec(Doc), []);
-    //     groupList.forEach(groupDoc => {
-    //         if (groupDoc instanceof Doc) {
-    //             let id = Utils.GenerateGuid();
-    //             groups.set(id, groupDoc);
-
-    //             let metadataMap = new Map<string, Doc>();
-    //             let metadataDocs = Cast(groupDoc.proto!.metadata, listSpec(Doc), []);
-    //             metadataDocs.forEach(mdDoc => {
-    //                 if (mdDoc && mdDoc instanceof Doc) { // TODO: handle promise doc
-    //                     metadataMap.set(Utils.GenerateGuid(), mdDoc);
-    //                 }
-    //             })
-    //             metadata.set(id, metadataMap);
-    //         }
-    //     })
-    // }
-
-    // @observable private _title: string = StrCast(this.props.linkDoc.title);
-    // @observable private _description: string = StrCast(this.props.linkDoc.linkDescription);
-    // @observable private _tags: Array<string> = Cast(this.props.linkDoc.linkTags, List);
-
-    // @action
-    // onTitleChanged = (e: React.ChangeEvent<HTMLInputElement>) => {
-    //     this._title = e.target.value;
-    // }
+    @observable private _groups: Map<string, Doc> = new Map();
+    @observable private _metadata: Map<string, Map<string, Doc>> = new Map();
+
+    constructor(props: LinkEditorProps) {
+        super(props);
+
+        let groups = new Map<string, Doc>();
+        let metadata: Map<string, Map<string, Doc>> = new Map();
+        let groupList = (Doc.AreProtosEqual(props.sourceDoc, Cast(props.linkDoc.anchor1, Doc, new Doc))) ?
+            Cast(props.linkDoc.anchor1Groups, listSpec(Doc), []) : Cast(props.linkDoc.anchor2Groups, listSpec(Doc), []);
+        groupList.forEach(groupDoc => {
+            if (groupDoc instanceof Doc) {
+                let id = Utils.GenerateGuid();
+                groups.set(id, groupDoc);
+
+                let metadataMap = new Map<string, Doc>();
+                let metadataDocs = Cast(groupDoc.proto!.metadata, listSpec(Doc), []);
+                metadataDocs.forEach(mdDoc => {
+                    if (mdDoc && mdDoc instanceof Doc) { // TODO: handle promise doc
+                        metadataMap.set(Utils.GenerateGuid(), mdDoc);
+                    }
+                })
+                metadata.set(id, metadataMap);
+            } else {
+                // promise doc
+            }
+        })
+        this._groups = groups;
+        this._metadata = metadata;
+    }
 
     // @action
-    // onDescriptionChanged = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
-    //     this._description = e.target.value;
-    // }
-
-    // renderTags() {
-    //     return this._tags.map(tag => {
-    //         if (tag === "") {
-    //             return <input type="text" placeholder="Tag"></input>;
-    //         } else {
-    //             return <input type="text" value={tag}></input>;
-    //         }
-    //     })
-    // }
-
-    // addTag = (): void => {
-    //     this._tags.push("");
+    // editGroup(groupId: string, value: string) {
+    //     let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
+    //     let groupDoc = this._groups.get(groupId);
+    //     if (groupDoc) {
+    //         groupDoc.proto!.type = value;
+    //         LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, [groupDoc]);
+    //     }
     // }
 
-    @action
-    editGroup(groupId: string, value: string) {
-        let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-        let groupDoc = this.props.groups.get(groupId);
-        if (groupDoc) {
-            groupDoc.proto!.type = value;
-            LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, [groupDoc]);
-        }
-    }
-
     @action
     addGroup = (e: React.MouseEvent): void => {
         // create new document for group
@@ -107,149 +141,150 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
         groupDoc.proto!.title = "";
         groupDoc.proto!.metadata = new List<Doc>([]);
 
-        this.props.groups.set(Utils.GenerateGuid(), groupDoc);
+        this._groups.set(Utils.GenerateGuid(), groupDoc);
+
+        let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
+        LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
+    }
 
+    @action
+    setGroup = (groupId: string, group: string): void => {
         let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-        LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this.props.groups.values()));
+        let groupDoc = this._groups.get(groupId);
+        if (groupDoc) {
+            groupDoc.proto!.type = group;
+            LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, [groupDoc]);
+        }
     }
 
     renderGroup(groupId: string, groupDoc: Doc) {
-        // let metadata = this.props.metadata.get(groupId);
-        // if (!metadata) {
-        //     metadata = new Map<string, Doc>();
-        // }
+        console.log("testing", groupDoc["strawberry"], groupDoc["type"]);
         return (
-            // <div key={groupId} className="linkEditor-group">
-            <div key={groupId} className="linkEditor-group-row">
-                <p className="linkEditor-group-row-label">type:</p>
-                <input key={groupId + "-type"} type="text" value={StrCast(groupDoc.proto!.type)} onChange={e => this.editGroup(groupId, e.target.value)}></input>
+            <div key={groupId} className="linkEditor-group">
+                <div className="linkEditor-group-row">
+                    <p className="linkEditor-group-row-label">type:</p>
+                    <LinkGroupsDropdown groupId={groupId} groupType={StrCast(groupDoc.proto!.type)} setGroup={this.setGroup} />
+                    {/* <input key={groupId + "-type"} type="text" value={StrCast(groupDoc.proto!.type)} onChange={e => this.editGroup(groupId, e.target.value)}></input> */}
+                    {/* <input key={groupId + "-type"} type="text" value={StrCast(groupDoc.proto!.type)} onChange={e => this.editGroup(groupId, e.target.value)}></input> */}
+                </div>
+                {this.renderMetadata(groupId)}
+                <button onClick={() => this.addMetadata(groupId)}>+</button>
             </div>
-            //         {/* {this.renderMetadata(groupId)} */ }
-            // {/* <button onPointerDown={() => this.addMetadata(groupId)}>+</button> */ }
-            //     // </div>
         )
     }
 
     @action
-    addMetadata = (groupId: string): void => {
-        // create new metadata doc
-        let mdDoc = Docs.TextDocument();
-        mdDoc.proto!.title = "";
-        mdDoc.proto!.value = "";
-
-        // append to map
-        let mdMap = this.props.metadata.get(groupId);
-        if (mdMap) {
-            mdMap.set(Utils.GenerateGuid(), mdDoc);
+    addMetadata = (groupType: string): void => {
+        let mdKeys = LinkManager.Instance.allGroups.get(groupType);
+        if (mdKeys) {
+            if (mdKeys.indexOf("new key") > -1) {
+                mdKeys.push("new key");
+            }
         } else {
-            mdMap = new Map();
-            mdMap.set(Utils.GenerateGuid(), mdDoc);
+            mdKeys = ["new key"];
         }
+        LinkManager.Instance.allGroups.set(groupType, mdKeys);
+        console.log("md added", groupType, LinkManager.Instance.allGroups.get(groupType), LinkManager.Instance.allGroups);
+
+        // // create new metadata doc
+        // let mdDoc = Docs.TextDocument();
+        // mdDoc.proto!.title = "";
+        // mdDoc.proto!.value = "";
+
+        // // append to map
+        // let mdMap = this._metadata.get(groupId);
+        // if (mdMap) {
+        //     mdMap.set(Utils.GenerateGuid(), mdDoc);
+        // } else {
+        //     mdMap = new Map();
+        //     mdMap.set(Utils.GenerateGuid(), mdDoc);
+        // }
 
-        // add to internal representation of metadata
-        this.props.metadata.set(groupId, mdMap);
-
-        // add to internatal representation of group
-        let groupDoc = this.props.groups.get(groupId);
-        if (groupDoc) {
-            groupDoc.proto!.metadata = new List<Doc>(Array.from(mdMap.values()));
-            this.props.groups.set(groupId, groupDoc);
-        }
+        // // add to internal representation of metadata
+        // this._metadata.set(groupId, mdMap);
 
-        // add to link doc
-        let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-        LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this.props.groups.values()));
+        // // add to internatal representation of group
+        // let groupDoc = this._groups.get(groupId);
+        // if (groupDoc) {
+        //     groupDoc.proto!.metadata = new List<Doc>(Array.from(mdMap.values()));
+        //     this._groups.set(groupId, groupDoc);
+        // }
 
+        // // add to link doc
+        // let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
+        // LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
     }
 
     // @action
-    // addMetadata = (groupId: string): void => {
-    //     let groupDoc = this.props.groups.get(groupId);
-    //     if (groupDoc) {
-    //         // create new document for metadata row
-    //         let metadata = Cast(groupDoc.metadata, listSpec(Doc), []);
-    //         let metadataDoc = Docs.TextDocument();
-    //         metadataDoc.proto!.title = "";
-    //         metadataDoc.proto!.value = "";
-    //         let metadataMap = new Map<string, 
-
-    //         this.props.metadata.set(groupId, new Map)
-
-    //         groupDoc.proto!.metadata = new List<Doc>([metadataDoc]); // TODO: append to metadata
-    //     }
-    // }
-
-    // @action
-    // editMetadataTitle = (groupId: string, mdId: string, value: string) => {
-    //     let group = this.props.metadata.get(groupId);
-    //     if (group) {
-    //         let mdDoc = group.get(mdId);
+    // editMetadataTitle(groupId: string, mdId: string, value: string) {
+    //     let groupMd = this._metadata.get(groupId);
+    //     if (groupMd) {
+    //         let mdDoc = groupMd.get(mdId);
     //         if (mdDoc) {
     //             mdDoc.proto!.title = value;
     //         }
     //     }
+    //     // set group and link?
     // }
 
     // @action
-    // editMetadataValue = (groupId: string, mdId: string, value: string) => {
-    //     let group = this.props.metadata.get(groupId);
-    //     if (group) {
-    //         let mdDoc = group.get(mdId);
+    // editMetadataValue(groupId: string, mdId: string, value: string) {
+    //     let groupMd = this._metadata.get(groupId);
+    //     if (groupMd) {
+    //         let mdDoc = groupMd.get(mdId);
     //         if (mdDoc) {
     //             mdDoc.proto!.value = value;
     //         }
     //     }
+    //     // set group and link?
     // }
 
-    @action
-    editMetadataTitle(groupId: string, mdId: string, value: string) {
-
-    }
-
-    @action
-    editMetadataValue(groupId: string, mdId: string, value: string) {
-
-    }
-
     renderMetadata(groupId: string) {
         let metadata: Array<JSX.Element> = [];
-        let metadataMap = this.props.metadata.get(groupId);
-        if (metadataMap) {
-            metadataMap.forEach((mdDoc, mdId) => {
-                metadata.push(
-                    <div key={mdId} className="linkEditor-metadata-row">
-                        <input type="text" value={StrCast(mdDoc.proto!.title)} onChange={e => this.editMetadataTitle(groupId, mdId, e.target.value)}></input>
-                        :
-                        <input type="text" value={StrCast(mdDoc.proto!.value)} onChange={e => this.editMetadataValue(groupId, mdId, e.target.value)}></input>
-                    </div>
-                )
-            })
+        let groupDoc = this._groups.get(groupId);
+        if (groupDoc) {
+            let mdDoc = Cast(groupDoc.proto!.metadata, Doc, new Doc);
+            let groupType = StrCast(groupDoc.proto!.type);
+            let groupMdKeys = LinkManager.Instance.allGroups.get(groupType);
+            console.log("rendering md", groupType, groupMdKeys, LinkManager.Instance.allGroups);
+            if (groupMdKeys) {
+                groupMdKeys.forEach(key => {
+                    metadata.push(
+                        <div key={key} className="linkEditor-metadata-row">
+                            <input type="text" value={key} placeholder="key"></input>
+                            :
+                            <input type="text" value={(mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])} placeholder="value"></input>
+                        </div>
+                    )
+                })
+            }
         }
 
-        return metadata;
 
-        // let metadataList: Array<JSX.Element> = [];
-        // metadata.forEach((mdDoc, mdId) => {
-        //     metadataList.push(
-        //         <div key={mdId} className="linkEditor-metadata-row">
-        //             <input type="text" value={StrCast(mdDoc.proto!.title)} onChange={e => this.editMetadataTitle(groupId, mdId, e.target.value)}></input>:
-        //             <input type="text" value={StrCast(mdDoc.proto!.value)} onChange={e => this.editMetadataValue(groupId, mdId, e.target.value)}></input>
-        //         </div>
-        //     )
-        // })
-    }
+        // let metadataMap = this._metadata.get(groupId);
+        // if (metadataMap) {
+        //     metadataMap.forEach((mdDoc, mdId) => {
+        //         metadata.push(
+        //             <div key={mdId} className="linkEditor-metadata-row">
+        //                 <input type="text" value={StrCast(mdDoc.proto!.title)} placeholder="key" onChange={e => this.editMetadataTitle(groupId, mdId, e.target.value)}></input>
+        //                 :
+        //                 <input type="text" value={StrCast(mdDoc.proto!.value)} placeholder="value" onChange={e => this.editMetadataValue(groupId, mdId, e.target.value)}></input>
+        //             </div>
+        //         )
+        //     })
+        // }
 
-    renderGroups() {
-        let groups: Array<JSX.Element> = [];
-        this.props.groups.forEach((groupDoc, groupId) => {
-            groups.push(this.renderGroup(groupId, groupDoc))
-        });
-        return groups;
+        return metadata;
     }
 
     render() {
         let destination = LinkUtils.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
 
+        let groups: Array<JSX.Element> = [];
+        this._groups.forEach((groupDoc, groupId) => {
+            groups.push(this.renderGroup(groupId, groupDoc))
+        });
+
         return (
             <div className="linkEditor">
                 <button className="linkEditor-back" onPointerDown={() => this.props.showLinks()}><FontAwesomeIcon icon="arrow-left" size="sm" /></button>
@@ -258,8 +293,7 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
                     <b>Groups:</b>
                     <button onClick={this.addGroup} title="Add Group">+</button>
                 </div>
-                {this.renderGroups()}
-
+                {groups}
             </div>
 
         );
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index ab478feae..e378ee1cb 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -48,7 +48,6 @@ export class LinkMenu extends React.Component<Props> {
         let linkItems: Array<JSX.Element> = [];
 
         links.forEach((links, group) => {
-            console.log("category is ", group);
             linkItems.push(
                 <div key={group} className="link-menu-group">
                     <p className="link-menu-group-name">{group}:</p>
@@ -59,6 +58,10 @@ export class LinkMenu extends React.Component<Props> {
             )
         });
 
+        if (linkItems.length === 0) {
+            linkItems.push(<p key="">no links have been created yet</p>);
+        }
+
         return linkItems;
     }
 
@@ -79,28 +82,28 @@ export class LinkMenu extends React.Component<Props> {
                 </div>
             );
         } else {
-            let groups = new Map<string, Doc>();
-            let metadata: Map<string, Map<string, Doc>> = new Map();
-            let groupList = (Doc.AreProtosEqual(this.props.docView.props.Document, Cast(this._editingLink.anchor1, Doc, new Doc))) ?
-                Cast(this._editingLink.anchor1Groups, listSpec(Doc), []) : Cast(this._editingLink.anchor2Groups, listSpec(Doc), []);
-            groupList.forEach(groupDoc => {
-                if (groupDoc instanceof Doc) {
-                    let id = Utils.GenerateGuid();
-                    groups.set(id, groupDoc);
+            // let groups = new Map<string, Doc>();
+            // let metadata: Map<string, Map<string, Doc>> = new Map();
+            // let groupList = (Doc.AreProtosEqual(this.props.docView.props.Document, Cast(this._editingLink.anchor1, Doc, new Doc))) ?
+            //     Cast(this._editingLink.anchor1Groups, listSpec(Doc), []) : Cast(this._editingLink.anchor2Groups, listSpec(Doc), []);
+            // groupList.forEach(groupDoc => {
+            //     if (groupDoc instanceof Doc) {
+            //         let id = Utils.GenerateGuid();
+            //         groups.set(id, groupDoc);
 
-                    let metadataMap = new Map<string, Doc>();
-                    let metadataDocs = Cast(groupDoc.proto!.metadata, listSpec(Doc), []);
-                    metadataDocs.forEach(mdDoc => {
-                        if (mdDoc && mdDoc instanceof Doc) { // TODO: handle promise doc
-                            metadataMap.set(Utils.GenerateGuid(), mdDoc);
-                        }
-                    })
-                    metadata.set(id, metadataMap);
-                }
-            })
+            //         let metadataMap = new Map<string, Doc>();
+            //         let metadataDocs = Cast(groupDoc.proto!.metadata, listSpec(Doc), []);
+            //         metadataDocs.forEach(mdDoc => {
+            //             if (mdDoc && mdDoc instanceof Doc) { // TODO: handle promise doc
+            //                 metadataMap.set(Utils.GenerateGuid(), mdDoc);
+            //             }
+            //         })
+            //         metadata.set(id, metadataMap);
+            //     }
+            // })
 
             return (
-                <LinkEditor groups={groups} metadata={metadata} sourceDoc={this.props.docView.props.Document} linkDoc={this._editingLink} showLinks={action(() => this._editingLink = undefined)}></LinkEditor>
+                <LinkEditor sourceDoc={this.props.docView.props.Document} linkDoc={this._editingLink} showLinks={action(() => this._editingLink = undefined)}></LinkEditor>
             );
         }
 
-- 
cgit v1.2.3-70-g09d2


From fbcbbb2dc3dcb59f3389de0e4cc11283a7e4d87a Mon Sep 17 00:00:00 2001
From: madelinegr <monika_hedman@brown.edu>
Date: Tue, 11 Jun 2019 18:07:38 -0400
Subject: end of day 6/11

---
 src/client/views/nodes/LinkMenu.tsx     |  3 +-
 src/client/views/search/SearchItem.scss | 54 ++++++++++++++++++++++++++++-----
 src/client/views/search/SearchItem.tsx  | 31 ++++++++++++++-----
 src/client/views/search/ToggleBar.scss  |  6 ++--
 4 files changed, 75 insertions(+), 19 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 3f09d6214..c34ccdccb 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -8,6 +8,7 @@ import React = require("react");
 import { Doc, DocListCast } from "../../../new_fields/Doc";
 import { Cast, FieldValue, StrCast } from "../../../new_fields/Types";
 import { Id } from "../../../new_fields/FieldSymbols";
+import { DocTypes } from "../../documents/Documents";
 
 interface Props {
     docView: DocumentView;
@@ -23,7 +24,7 @@ export class LinkMenu extends React.Component<Props> {
         return links.map(link => {
             let doc = FieldValue(Cast(link[key], Doc));
             if (doc) {
-                return <LinkBox key={doc[Id]} linkDoc={link} linkName={StrCast(link.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={type} />;
+                return <LinkBox key={doc[Id]} linkDoc={link} linkName={StrCast(link.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={DocTypes.LINK} />;
             }
         });
     }
diff --git a/src/client/views/search/SearchItem.scss b/src/client/views/search/SearchItem.scss
index 2d4c06a5c..5afb69164 100644
--- a/src/client/views/search/SearchItem.scss
+++ b/src/client/views/search/SearchItem.scss
@@ -12,7 +12,7 @@
 .search-info {
     display: flex;
     justify-content: flex-end;
-    width: 100%;
+    width: 40%;
 }
 
 .main-search-info {
@@ -29,20 +29,59 @@
 .search-title {
     text-transform: uppercase;
     text-align: left;
-    width: 8vw;
+    width: 80%;
     font-weight: bold;
 }
 
-.link-count {
-    height: 25px;
-    width: 25px;
-    border-radius: 50%;
+.link-container.item {
+    height: 26px;
+    width: 26px;
+    border-radius: 13px;
     background: $dark-color;
     color: $light-color-secondary;
     display: flex;
     justify-content: center;
     align-items: center;
     margin-right: 10px;
+    -webkit-transition: all 0.2s ease-in-out;
+    -moz-transition: all 0.2s ease-in-out;
+    -o-transition: all 0.2s ease-in-out;
+    transition: all 0.2s ease-in-out;
+    transform-origin: top right;
+    overflow: hidden;
+
+    .link-count {
+        opacity: 1;
+        position: absolute;
+        z-index: 1000;
+        -webkit-transition: opacity 0.2s ease-in-out;
+        -moz-transition: opacity 0.2s ease-in-out;
+        -o-transition: opacity 0.2s ease-in-out;
+        transition: opacity 0.2s ease-in-out;
+    }
+
+    .link-extended {
+        opacity: 0;
+        position: absolute;
+        z-index: 500;
+        overflow: hidden;
+        -webkit-transition: opacity 0.2s ease-in-out;
+        -moz-transition: opacity 0.2s ease-in-out;
+        -o-transition: opacity 0.2s ease-in-out;
+        transition: opacity 0.2s ease-in-out;
+    }
+}
+
+.link-container.item:hover{
+    width: 70px;
+}
+
+.link-container.item:hover .link-count{
+    opacity: 0;
+}
+
+.link-container.item:hover .link-extended{
+    opacity: 1;
 }
 
 .search-type {
@@ -85,7 +124,8 @@
 }
 
 .search-item:hover~.searchBox-instances,
-.searchBox-instances:hover,  .searchBox-instances:active{
+.searchBox-instances:hover,
+.searchBox-instances:active {
     opacity: 1;
     background: $lighter-alt-accent;
     -webkit-transform: scale(1);
diff --git a/src/client/views/search/SearchItem.tsx b/src/client/views/search/SearchItem.tsx
index 9b4170f4c..d470090f8 100644
--- a/src/client/views/search/SearchItem.tsx
+++ b/src/client/views/search/SearchItem.tsx
@@ -3,7 +3,7 @@ import { library } from '@fortawesome/fontawesome-svg-core';
 import { faCaretUp, faFilePdf, faFilm, faImage, faObjectGroup, faStickyNote, faMusic, faLink, faChartBar, faGlobeAsia } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Cast, NumCast } from "../../../new_fields/Types";
-import { observable, runInAction } from "mobx";
+import { observable, runInAction, computed } from "mobx";
 import { listSpec } from "../../../new_fields/Schema";
 import { Doc } from "../../../new_fields/Doc";
 import { DocumentManager } from "../../util/DocumentManager";
@@ -71,9 +71,9 @@ export class SelectorContextMenu extends React.Component<SearchItemProps> {
     render() {
         return (
             < div className="parents">
-                <p className = "contexts">Contexts:</p>
-                {this._docs.map(doc => <div className="collection"><a className= "title" onClick={this.getOnClick(doc)}>{doc.col.title}</a></div>)}
-                {this._otherDocs.map(doc => <div className="collection"><a className= "title" onClick={this.getOnClick(doc)}>{doc.col.title}</a></div>)}
+                <p className="contexts">Contexts:</p>
+                {this._docs.map(doc => <div className="collection"><a className="title" onClick={this.getOnClick(doc)}>{doc.col.title}</a></div>)}
+                {this._otherDocs.map(doc => <div className="collection"><a className="title" onClick={this.getOnClick(doc)}>{doc.col.title}</a></div>)}
             </div>
         );
     }
@@ -87,10 +87,12 @@ export class SearchItem extends React.Component<SearchItemProps> {
 
     onClick = () => {
         // DocumentManager.Instance.jumpToDocument(this.props.doc);
+        console.log(Cast(this.props.doc.type, "string", ""))
         CollectionDockingView.Instance.AddRightSplit(this.props.doc);
     }
 
-    public DocumentIcon() {
+    @computed
+    public get DocumentIcon() {
         let layoutresult = Cast(this.props.doc.type, "string", "");
 
         let button = layoutresult.indexOf(DocTypes.PDF) !== -1 ? faFilePdf :
@@ -117,10 +119,20 @@ export class SearchItem extends React.Component<SearchItemProps> {
         }
     }
 
-    linkCount = () => {
+    @computed
+    get linkCount() {
         return Cast(this.props.doc.linkedToDocs, listSpec(Doc), []).length + Cast(this.props.doc.linkedFromDocs, listSpec(Doc), []).length;
     }
 
+    @computed
+    get linkString(): string {
+        let num = this.linkCount;
+        if (num === 1) {
+            return num.toString() + " link";
+        }
+        return num.toString() + " links";
+    }
+
     render() {
         return (
             <div className="search-overview">
@@ -128,8 +140,11 @@ export class SearchItem extends React.Component<SearchItemProps> {
                     <div className="main-search-info">
                         <div className="search-title" id="result" >{this.props.doc.title}</div>
                         <div className="search-info">
-                            <div className="link-count">{this.linkCount()}</div>
-                            <div className="search-type" >{this.DocumentIcon()}</div>
+                            <div className="link-container item">
+                                <div className="link-count">{this.linkCount}</div>
+                                <div className = "link-extended">{this.linkString}</div>
+                            </div>
+                            <div className="search-type" >{this.DocumentIcon}</div>
                         </div>
                     </div>
                     <div className="found">Where Found: (i.e. title, body, etc)</div>
diff --git a/src/client/views/search/ToggleBar.scss b/src/client/views/search/ToggleBar.scss
index caae354ee..353db792d 100644
--- a/src/client/views/search/ToggleBar.scss
+++ b/src/client/views/search/ToggleBar.scss
@@ -13,9 +13,9 @@
         width: 100px;
         text-align: center;
         -webkit-transition: all 0.2s ease-in-out;
-    -moz-transition: all 0.2s ease-in-out;
-    -o-transition: all 0.2s ease-in-out;
-    transition: all 0.2s ease-in-out;
+        -moz-transition: all 0.2s ease-in-out;
+        -o-transition: all 0.2s ease-in-out;
+        transition: all 0.2s ease-in-out;
     }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 2c3b54d6e07c37a4f5fd52a49d6d60e7a8e5d2d2 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Tue, 11 Jun 2019 18:17:28 -0400
Subject: metadata types can be assigned to groups of links

---
 src/client/documents/Documents.ts     |  2 +-
 src/client/views/nodes/LinkEditor.tsx | 76 +++++++++++++++++++++++++++++------
 src/client/views/nodes/LinkMenu.tsx   |  1 -
 3 files changed, 64 insertions(+), 15 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 731490d97..9f1501265 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -91,7 +91,7 @@ export namespace DocUtils {
         UndoManager.RunInBatch(() => {
             let groupDoc = Docs.TextDocument();
             groupDoc.proto!.type = "*";
-            groupDoc.proto!.metadata = new List<Doc>([]);
+            groupDoc.proto!.metadata = Docs.TextDocument();
 
             let linkDoc = Docs.TextDocument({ width: 100, height: 30, borderRounding: -1 });
             //let linkDoc = new Doc;
diff --git a/src/client/views/nodes/LinkEditor.tsx b/src/client/views/nodes/LinkEditor.tsx
index 481d3bf37..8d12bc30f 100644
--- a/src/client/views/nodes/LinkEditor.tsx
+++ b/src/client/views/nodes/LinkEditor.tsx
@@ -37,6 +37,7 @@ class LinkGroupsDropdown extends React.Component<{ groupId: string, groupType: s
         this._groupType = value;
     }
 
+    @action
     createGroup(value: string) {
         LinkManager.Instance.allGroups.set(value, []);
         this.props.setGroup(this.props.groupId, value);
@@ -81,12 +82,49 @@ class LinkGroupsDropdown extends React.Component<{ groupId: string, groupType: s
     }
 }
 
+@observer
+class LinkMetadataEditor extends React.Component<{ groupType: string, mdDoc: Doc, mdKey: string, mdValue: string }> {
+    @observable private _key: string = this.props.mdKey;
+    @observable private _value: string = this.props.mdValue;
+
+    @action
+    editMetadataKey = (value: string): void => {
+        // TODO: check that metadata doesnt already exist in group
+        let groupMdKeys = new Array(...LinkManager.Instance.allGroups.get(this.props.groupType)!);
+        if (groupMdKeys) {
+            let index = groupMdKeys.indexOf(this._key);
+            if (index > -1) {
+                groupMdKeys[index] = value;
+            }
+            else {
+                console.log("OLD KEY WAS NOT FOUND", ...groupMdKeys)
+            }
+        }
+
+        this._key = value;
+        LinkManager.Instance.allGroups.set(this.props.groupType, groupMdKeys);
+    }
+
+    @action
+    editMetadataValue = (value: string): void => {
+        this.props.mdDoc[this._key] = value;
+        this._value = value;
+    }
+
+    render() {
+        return (
+            <div className="linkEditor-metadata-row">
+                <input type="text" value={this._key} placeholder="key" onChange={e => this.editMetadataKey(e.target.value)}></input>:
+                <input type="text" value={this._value} placeholder="value" onChange={e => this.editMetadataValue(e.target.value)}></input>
+            </div>
+        )
+    }
+}
+
 
 interface LinkEditorProps {
     sourceDoc: Doc;
     linkDoc: Doc;
-    // groups: Map<string, Doc>;
-    // metadata: Map<string, Map<string, Doc>>;
     showLinks: () => void;
 }
 
@@ -158,7 +196,6 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
     }
 
     renderGroup(groupId: string, groupDoc: Doc) {
-        console.log("testing", groupDoc["strawberry"], groupDoc["type"]);
         return (
             <div key={groupId} className="linkEditor-group">
                 <div className="linkEditor-group-row">
@@ -168,23 +205,28 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
                     {/* <input key={groupId + "-type"} type="text" value={StrCast(groupDoc.proto!.type)} onChange={e => this.editGroup(groupId, e.target.value)}></input> */}
                 </div>
                 {this.renderMetadata(groupId)}
-                <button onClick={() => this.addMetadata(groupId)}>+</button>
+                {groupDoc["type"] === "*" ? <></> : <button onClick={() => this.addMetadata(StrCast(groupDoc.proto!.type))}>add kvp</button>}
+                <button onClick={this.viewGroupAsTable}>view group as table</button>
+                {/* <button onClick={() => this.addMetadata(StrCast(groupDoc.proto!.type))}>+</button> */}
             </div>
         )
     }
 
+    viewGroupAsTable = (): void => {
+
+    }
+
     @action
     addMetadata = (groupType: string): void => {
         let mdKeys = LinkManager.Instance.allGroups.get(groupType);
         if (mdKeys) {
-            if (mdKeys.indexOf("new key") > -1) {
+            if (mdKeys.indexOf("new key") === -1) {
                 mdKeys.push("new key");
             }
         } else {
             mdKeys = ["new key"];
         }
         LinkManager.Instance.allGroups.set(groupType, mdKeys);
-        console.log("md added", groupType, LinkManager.Instance.allGroups.get(groupType), LinkManager.Instance.allGroups);
 
         // // create new metadata doc
         // let mdDoc = Docs.TextDocument();
@@ -239,6 +281,14 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
     //     // set group and link?
     // }
 
+    @action
+    editMetadataKey(groupId: string, value: string) {
+        let groupDoc = this._groups.get(groupId);
+        if (groupDoc) {
+
+        }
+    }
+
     renderMetadata(groupId: string) {
         let metadata: Array<JSX.Element> = [];
         let groupDoc = this._groups.get(groupId);
@@ -246,15 +296,15 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
             let mdDoc = Cast(groupDoc.proto!.metadata, Doc, new Doc);
             let groupType = StrCast(groupDoc.proto!.type);
             let groupMdKeys = LinkManager.Instance.allGroups.get(groupType);
-            console.log("rendering md", groupType, groupMdKeys, LinkManager.Instance.allGroups);
             if (groupMdKeys) {
-                groupMdKeys.forEach(key => {
+                groupMdKeys.forEach((key, index) => {
                     metadata.push(
-                        <div key={key} className="linkEditor-metadata-row">
-                            <input type="text" value={key} placeholder="key"></input>
-                            :
-                            <input type="text" value={(mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])} placeholder="value"></input>
-                        </div>
+                        <LinkMetadataEditor key={"mded-" + index} groupType={groupType} mdDoc={mdDoc} mdKey={key} mdValue={(mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])} />
+                        // <div key={key} className="linkEditor-metadata-row">
+                        //     <input type="text" value={key} placeholder="key"></input>
+                        //     :
+                        //     <input type="text" value={(mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])} placeholder="value"></input>
+                        // </div>
                     )
                 })
             }
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index e378ee1cb..21b5807ae 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -38,7 +38,6 @@ export class LinkMenu extends React.Component<Props> {
             let destination = LinkUtils.findOppositeAnchor(link, source);
             let doc = FieldValue(Cast(destination, Doc));
             if (doc) {
-                console.log(doc[Id] + source[Id], "source is", source[Id]);
                 return <LinkBox key={doc[Id] + source[Id]} linkDoc={link} linkName={StrCast(destination.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={""} />;
             }
         });
-- 
cgit v1.2.3-70-g09d2


From e1fd270f1806ffd51174c835b335ceb4ebb2fe56 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Wed, 12 Jun 2019 16:20:46 -0400
Subject: created remove handlers for link metadata and groups

---
 src/client/documents/Documents.ts      |  14 +-
 src/client/util/LinkManager.ts         | 110 ++++++++++-----
 src/client/views/nodes/LinkBox.tsx     |  38 ++---
 src/client/views/nodes/LinkEditor.scss |  32 ++++-
 src/client/views/nodes/LinkEditor.tsx  | 250 +++++++++++++++------------------
 src/client/views/nodes/LinkMenu.scss   |   2 +-
 src/client/views/nodes/LinkMenu.tsx    |  33 +----
 7 files changed, 251 insertions(+), 228 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 9f1501265..9517cbbda 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -89,9 +89,13 @@ export namespace DocUtils {
         // let protoSrc = source.proto ? source.proto : source;
         // let protoTarg = target.proto ? target.proto : target;
         UndoManager.RunInBatch(() => {
-            let groupDoc = Docs.TextDocument();
-            groupDoc.proto!.type = "*";
-            groupDoc.proto!.metadata = Docs.TextDocument();
+            // let groupDoc1 = Docs.TextDocument();
+            // groupDoc1.proto!.type = "*";
+            // groupDoc1.proto!.metadata = Docs.TextDocument();
+
+            // let groupDoc2 = Docs.TextDocument();
+            // groupDoc2.proto!.type = "*";
+            // groupDoc2.proto!.metadata = Docs.TextDocument();
 
             let linkDoc = Docs.TextDocument({ width: 100, height: 30, borderRounding: -1 });
             //let linkDoc = new Doc;
@@ -99,11 +103,11 @@ export namespace DocUtils {
             // linkDoc.proto!.linkDescription = "";
             linkDoc.proto!.anchor1 = source;
             linkDoc.proto!.anchor1Page = source.curPage;
-            linkDoc.proto!.anchor1Groups = new List<Doc>([groupDoc]);
+            linkDoc.proto!.anchor1Groups = new List<Doc>([]);
 
             linkDoc.proto!.anchor2 = target;
             linkDoc.proto!.anchor2Page = target.curPage;
-            linkDoc.proto!.anchor2Groups = new List<Doc>([groupDoc]);
+            linkDoc.proto!.anchor2Groups = new List<Doc>([]);
 
             // linkDoc.proto!.linkedTo = target;
             // linkDoc.proto!.linkedToPage = target.curPage;
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 99fb4c6c0..cc8617052 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -9,6 +9,7 @@ import { StrCast, Cast } from "../../new_fields/Types";
 import { Doc } from "../../new_fields/Doc";
 import { listSpec } from "../../new_fields/Schema";
 import { List } from "../../new_fields/List";
+import { string } from "prop-types";
 
 export namespace LinkUtils {
     export function findOppositeAnchor(link: Doc, anchor: Doc): Doc {
@@ -40,14 +41,48 @@ export namespace LinkUtils {
     // }
 
     export function setAnchorGroups(link: Doc, anchor: Doc, groups: Doc[]) {
+        // console.log("setting groups for anchor", anchor["title"]);
         if (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) {
             link.anchor1Groups = new List<Doc>(groups);
         } else {
             link.anchor2Groups = new List<Doc>(groups);
         }
     }
+
+    export function removeGroupFromAnchor(link: Doc, anchor: Doc, groupType: string) {
+        let groups = [];
+        if (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) {
+            groups = Cast(link["anchor1Groups"], listSpec(Doc), []);
+        } else {
+            groups = Cast(link["anchor2Groups"], listSpec(Doc), []);
+        }
+
+        let newGroups: Doc[] = [];
+        groups.forEach(groupDoc => {
+            if (groupDoc instanceof Doc && StrCast(groupDoc["type"]) !== groupType) {
+                newGroups.push(groupDoc);
+            }
+        })
+        LinkUtils.setAnchorGroups(link, anchor, newGroups);
+    }
 }
 
+/* 
+ * link doc: 
+ * - anchor1: doc
+ * - anchor1page: number
+ * - anchor1groups: list of group docs representing the groups anchor1 categorizes this link/anchor2 in 
+ * - anchor2: doc
+ * - anchor2page: number
+ * - anchor2groups: list of group docs representing the groups anchor2 categorizes this link/anchor1 in 
+ * 
+ * group doc:
+ * - type: string representing the group type/name/category
+ * - metadata: doc representing the metadata kvps
+ * 
+ * metadata doc:
+ * - user defined kvps 
+ */
 export class LinkManager {
     private static _instance: LinkManager;
     public static get Instance(): LinkManager {
@@ -56,60 +91,57 @@ export class LinkManager {
     private constructor() {
     }
 
-    @observable public allLinks: Array<Doc> = [];
-    @observable public allGroups: Map<string, Array<string>> = new Map();
+    @observable public allLinks: Array<Doc> = []; // list of link docs
+    @observable public allGroups: Map<string, Array<string>> = new Map(); // map of group type to list of its metadata keys
 
     public findAllRelatedLinks(anchor: Doc): Array<Doc> {
         return LinkManager.Instance.allLinks.filter(
             link => Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc)) || Doc.AreProtosEqual(anchor, Cast(link.anchor2, Doc, new Doc)));
     }
 
+    // returns map of group type to anchor's links in that group type
     public findRelatedGroupedLinks(anchor: Doc): Map<string, Array<Doc>> {
         let related = this.findAllRelatedLinks(anchor);
 
-        let anchorGroups = new Map();
+        let anchorGroups = new Map<string, Array<Doc>>();
         related.forEach(link => {
-            // get groups of given doc
-            let oppGroups = (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) ? Cast(link.anchor1Groups, listSpec(Doc), []) : Cast(link.anchor2Groups, listSpec(Doc), []);
-            if (oppGroups) {
-                if (oppGroups.length > 0) {
-                    oppGroups.forEach(groupDoc => {
-                        if (groupDoc instanceof Doc) {
-                            let groupType = StrCast(groupDoc.proto!.type);
-                            let group = anchorGroups.get(groupType); // TODO: clean this up lol
-                            if (group) group.push(link);
-                            else group = [link];
-                            anchorGroups.set(groupType, group);
-                        } else {
-                            // promise doc
-                        }
-
-                    })
-                }
-                else {
-                    // if link is in no groups then put it in default group
-                    let group = anchorGroups.get("*");
-                    if (group) group.push(link);
-                    else group = [link];
-                    anchorGroups.set("*", group);
-                }
-            }
 
+            // get groups of given anchor categorizes this link/opposite anchor in
+            let groups = (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) ? Cast(link.anchor1Groups, listSpec(Doc), []) : Cast(link.anchor2Groups, listSpec(Doc), []);
+            if (groups.length > 0) {
+                groups.forEach(groupDoc => {
+                    if (groupDoc instanceof Doc) {
+                        let groupType = StrCast(groupDoc["type"]);
+                        let group = anchorGroups.get(groupType); // TODO: clean this up lol
+                        if (group) group.push(link);
+                        else group = [link];
+                        anchorGroups.set(groupType, group);
+                    } else {
+                        // promise doc
+                    }
+
+                })
+            }
+            else {
+                // if link is in no groups then put it in default group
+                let group = anchorGroups.get("*");
+                if (group) group.push(link);
+                else group = [link];
+                anchorGroups.set("*", group);
+            }
 
-            //     let anchor = this.findOppositeAnchor(link, source);
-            //     let group = categories.get(link.linkTags);
-            //     if (group) group.push(link);
-            //     else group = [link];
-            //     categories.set(link.linkTags, group);
         })
         return anchorGroups;
     }
 
-
-
-
-    // public findAnchorTags(link: Doc, source: Doc): Doc[] {
-    //     if (source)
-    // }
+    public deleteGroup(groupType: string) {
+        let deleted = LinkManager.Instance.allGroups.delete(groupType);
+        if (deleted) {
+            LinkManager.Instance.allLinks.forEach(linkDoc => {
+                LinkUtils.removeGroupFromAnchor(linkDoc, Cast(linkDoc["anchor1"], Doc, new Doc), groupType);
+                LinkUtils.removeGroupFromAnchor(linkDoc, Cast(linkDoc["anchor2"], Doc, new Doc), groupType);
+            })
+        }
+    }
 
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkBox.tsx b/src/client/views/nodes/LinkBox.tsx
index ebca1dc69..5597bb1aa 100644
--- a/src/client/views/nodes/LinkBox.tsx
+++ b/src/client/views/nodes/LinkBox.tsx
@@ -41,23 +41,23 @@ export class LinkBox extends React.Component<Props> {
         this.props.showEditor();
     }
 
-    @action
-    onDeleteButtonPressed = async (e: React.PointerEvent): Promise<void> => {
-        e.stopPropagation();
-        const [linkedFrom, linkedTo] = await Promise.all([Cast(this.props.linkDoc.linkedFrom, Doc), Cast(this.props.linkDoc.linkedTo, Doc)]);
-        if (linkedFrom) {
-            const linkedToDocs = Cast(linkedFrom.linkedToDocs, listSpec(Doc));
-            if (linkedToDocs) {
-                linkedToDocs.splice(linkedToDocs.indexOf(this.props.linkDoc), 1);
-            }
-        }
-        if (linkedTo) {
-            const linkedFromDocs = Cast(linkedTo.linkedFromDocs, listSpec(Doc));
-            if (linkedFromDocs) {
-                linkedFromDocs.splice(linkedFromDocs.indexOf(this.props.linkDoc), 1);
-            }
-        }
-    }
+    // @action
+    // onDeleteButtonPressed = async (e: React.PointerEvent): Promise<void> => {
+    //     e.stopPropagation();
+    //     const [linkedFrom, linkedTo] = await Promise.all([Cast(this.props.linkDoc.linkedFrom, Doc), Cast(this.props.linkDoc.linkedTo, Doc)]);
+    //     if (linkedFrom) {
+    //         const linkedToDocs = Cast(linkedFrom.linkedToDocs, listSpec(Doc));
+    //         if (linkedToDocs) {
+    //             linkedToDocs.splice(linkedToDocs.indexOf(this.props.linkDoc), 1);
+    //         }
+    //     }
+    //     if (linkedTo) {
+    //         const linkedFromDocs = Cast(linkedTo.linkedFromDocs, listSpec(Doc));
+    //         if (linkedFromDocs) {
+    //             linkedFromDocs.splice(linkedFromDocs.indexOf(this.props.linkDoc), 1);
+    //         }
+    //     }
+    // }
 
     render() {
 
@@ -80,8 +80,8 @@ export class LinkBox extends React.Component<Props> {
                         <FontAwesomeIcon className="fa-icon" icon="arrow-right" size="sm" /></div>
                     <div title="Edit Link" className="button" onPointerDown={this.onEditButtonPressed}>
                         <FontAwesomeIcon className="fa-icon" icon="edit" size="sm" /></div>
-                    <div title="Delete Link" className="button" onPointerDown={this.onDeleteButtonPressed}>
-                        <FontAwesomeIcon className="fa-icon" icon="times" size="sm" /></div>
+                    {/* <div title="Delete Link" className="button" onPointerDown={this.onDeleteButtonPressed}>
+                        <FontAwesomeIcon className="fa-icon" icon="times" size="sm" /></div> */}
                 </div>
             </div>
         );
diff --git a/src/client/views/nodes/LinkEditor.scss b/src/client/views/nodes/LinkEditor.scss
index d3ac8cf19..b56f3046a 100644
--- a/src/client/views/nodes/LinkEditor.scss
+++ b/src/client/views/nodes/LinkEditor.scss
@@ -74,6 +74,7 @@
     }
     .linkEditor-group-row {
         display: flex;
+        margin-bottom: 6px;
         .linkEditor-group-row-label {
             margin-right: 6px;
         }
@@ -81,8 +82,17 @@
     .linkEditor-metadata-row {
         display: flex;
         justify-content: space-between;
+        margin-bottom: 6px;
         input {
-            width: calc(50% - 2px);
+            width: calc(50% - 18px);
+            height: 20px;
+        }
+        button {
+            width: 20px;
+            height: 20px;
+            margin-left: 6px;
+            padding: 0;
+            font-size: 14px;
         }
     }
 }
@@ -90,6 +100,7 @@
 .linkEditor-dropdown {
     width: 100%;
     position: relative;
+    z-index: 999;
     .linkEditor-options-wrapper {
         width: 100%;
         position: absolute;
@@ -107,4 +118,23 @@
             background-color:  $light-color-secondary;
         }
     }
+}
+
+.linkEditor-group-buttons {
+    height: 20px;
+    display: flex;
+    justify-content: space-between;
+    button {
+        width: 31%;
+        height: 20px;
+        margin-left: 6px;
+        padding: 0;
+        font-size: 10px;
+        &:first-child { // delete
+            font-size: 14px;
+        }
+        &:disabled { // delete
+            background-color: gray;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkEditor.tsx b/src/client/views/nodes/LinkEditor.tsx
index 8d12bc30f..05e05c2ee 100644
--- a/src/client/views/nodes/LinkEditor.tsx
+++ b/src/client/views/nodes/LinkEditor.tsx
@@ -1,11 +1,7 @@
 import { observable, computed, action } from "mobx";
 import React = require("react");
-import { SelectionManager } from "../../util/SelectionManager";
 import { observer } from "mobx-react";
 import './LinkEditor.scss';
-import { props } from "bluebird";
-import { DocumentView } from "./DocumentView";
-import { link } from "fs";
 import { StrCast, Cast } from "../../../new_fields/Types";
 import { Doc } from "../../../new_fields/Doc";
 import { List } from "../../../new_fields/List";
@@ -21,7 +17,7 @@ import { string } from "prop-types";
 library.add(faArrowLeft);
 library.add(faEllipsisV);
 
-// this dropdown could be generalizeds
+// this dropdown could be generalized
 @observer
 class LinkGroupsDropdown extends React.Component<{ groupId: string, groupType: string, setGroup: (groupId: string, group: string) => void }> {
     @observable private _searchTerm: string = "";
@@ -63,7 +59,7 @@ class LinkGroupsDropdown extends React.Component<{ groupId: string, groupType: s
 
         if (!exactFound && this._searchTerm !== "") {
             options.push(<div key={""} className="linkEditor-option"
-                onClick={() => { this.createGroup(this._searchTerm); this.setGroupType(this._searchTerm); this.setSearchTerm("") }}>Create new "{this._searchTerm}" group</div>)
+                onClick={() => { this.createGroup(this._searchTerm); this.setGroupType(this._searchTerm); this.setSearchTerm("") }}>Define new "{this._searchTerm}" relationship</div>)
         }
 
         return options;
@@ -82,6 +78,8 @@ class LinkGroupsDropdown extends React.Component<{ groupId: string, groupType: s
     }
 }
 
+
+
 @observer
 class LinkMetadataEditor extends React.Component<{ groupType: string, mdDoc: Doc, mdKey: string, mdValue: string }> {
     @observable private _key: string = this.props.mdKey;
@@ -111,11 +109,28 @@ class LinkMetadataEditor extends React.Component<{ groupType: string, mdDoc: Doc
         this._value = value;
     }
 
+    @action
+    removeMetadata = (): void => {
+        let groupMdKeys = new Array(...LinkManager.Instance.allGroups.get(this.props.groupType)!);
+        if (groupMdKeys) {
+            let index = groupMdKeys.indexOf(this._key);
+            if (index > -1) {
+                groupMdKeys.splice(index, 1);
+            }
+            else {
+                console.log("OLD KEY WAS NOT FOUND", ...groupMdKeys)
+            }
+        }
+        this._key = "";
+        LinkManager.Instance.allGroups.set(this.props.groupType, groupMdKeys);
+    }
+
     render() {
         return (
             <div className="linkEditor-metadata-row">
                 <input type="text" value={this._key} placeholder="key" onChange={e => this.editMetadataKey(e.target.value)}></input>:
                 <input type="text" value={this._value} placeholder="value" onChange={e => this.editMetadataValue(e.target.value)}></input>
+                <button onClick={() => this.removeMetadata()}>X</button>
             </div>
         )
     }
@@ -131,85 +146,129 @@ interface LinkEditorProps {
 @observer
 export class LinkEditor extends React.Component<LinkEditorProps> {
 
-    @observable private _groups: Map<string, Doc> = new Map();
-    @observable private _metadata: Map<string, Map<string, Doc>> = new Map();
+    @observable private _groups: Map<string, Doc> = new Map(); // map of temp group id to the corresponding group doc
 
     constructor(props: LinkEditorProps) {
         super(props);
 
         let groups = new Map<string, Doc>();
-        let metadata: Map<string, Map<string, Doc>> = new Map();
         let groupList = (Doc.AreProtosEqual(props.sourceDoc, Cast(props.linkDoc.anchor1, Doc, new Doc))) ?
             Cast(props.linkDoc.anchor1Groups, listSpec(Doc), []) : Cast(props.linkDoc.anchor2Groups, listSpec(Doc), []);
         groupList.forEach(groupDoc => {
             if (groupDoc instanceof Doc) {
                 let id = Utils.GenerateGuid();
                 groups.set(id, groupDoc);
-
-                let metadataMap = new Map<string, Doc>();
-                let metadataDocs = Cast(groupDoc.proto!.metadata, listSpec(Doc), []);
-                metadataDocs.forEach(mdDoc => {
-                    if (mdDoc && mdDoc instanceof Doc) { // TODO: handle promise doc
-                        metadataMap.set(Utils.GenerateGuid(), mdDoc);
-                    }
-                })
-                metadata.set(id, metadataMap);
             } else {
                 // promise doc
             }
         })
         this._groups = groups;
-        this._metadata = metadata;
     }
 
-    // @action
-    // editGroup(groupId: string, value: string) {
-    //     let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-    //     let groupDoc = this._groups.get(groupId);
-    //     if (groupDoc) {
-    //         groupDoc.proto!.type = value;
-    //         LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, [groupDoc]);
-    //     }
-    // }
-
     @action
-    addGroup = (e: React.MouseEvent): void => {
-        // create new document for group
-        let groupDoc = Docs.TextDocument();
-        groupDoc.proto!.title = "";
-        groupDoc.proto!.metadata = new List<Doc>([]);
+    addGroup = (): void => {
+        console.log("before adding", ...Array.from(this._groups.keys()));
+
+        let index = Array.from(this._groups.values()).findIndex(groupDoc => {
+            return groupDoc["type"] === "New Group";
+        })
+        if (index === -1) {
+            // create new document for group
+            let groupDoc = Docs.TextDocument();
+            groupDoc.proto!.type = "New Group";
+            groupDoc.proto!.metadata = Docs.TextDocument();
 
-        this._groups.set(Utils.GenerateGuid(), groupDoc);
+            this._groups.set(Utils.GenerateGuid(), groupDoc);
 
-        let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-        LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
+            let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
+            LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
+        }
+
+
+        // console.log("set anchor groups for", this.props.sourceDoc["title"]);
+        console.log("after adding", ...Array.from(this._groups.keys()));
     }
 
     @action
-    setGroup = (groupId: string, group: string): void => {
+    setGroupType = (groupId: string, groupType: string): void => {
+        console.log("setting for ", groupId);
         let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
         let groupDoc = this._groups.get(groupId);
         if (groupDoc) {
-            groupDoc.proto!.type = group;
-            LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, [groupDoc]);
+            console.log("found group doc");
+            groupDoc.proto!.type = groupType;
+
+            this._groups.set(groupId, groupDoc);
+
+            let gd = this._groups.get(groupId);
+            if (gd)
+                console.log("just created", StrCast(gd["type"]));
+
+            LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
+            console.log("set", Array.from(this._groups.values()).length)
+        }
+
+        let anchor1groups: string[] = [];
+        Cast(this.props.linkDoc.anchor1Groups, listSpec(Doc), []).forEach(doc => {
+            if (doc instanceof Doc) {
+                anchor1groups.push(StrCast(doc.proto!.type));
+            } else {
+                console.log("promise");
+            }
+        })
+        let anchor2groups: string[] = [];
+        Cast(this.props.linkDoc.anchor2Groups, listSpec(Doc), []).forEach(doc => {
+            if (doc instanceof Doc) {
+                anchor2groups.push(StrCast(doc.proto!.type));
+            } else {
+                console.log("promise");
+            }
+        })
+        console.log("groups for anchors; anchor1: [", ...anchor1groups, "] ; anchor2: [", ...anchor2groups, "]")
+    }
+
+    removeGroupFromLink = (groupId: string, groupType: string) => {
+        // this._groups.delete(groupId);
+        let groupDoc = this._groups.get(groupId);
+        if (groupDoc) {
+            LinkUtils.removeGroupFromAnchor(this.props.linkDoc, this.props.sourceDoc, groupType);
+            this._groups.delete(groupId);
+        }
+        // LinkUtils.setAnchorGroups(this.props.linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
+        console.log("\nremoved", groupId, "remaining", ...Array.from(this._groups.keys()), "\n");
+    }
+
+    deleteGroup = (groupId: string, groupType: string) => {
+        let groupDoc = this._groups.get(groupId);
+        if (groupDoc) {
+            LinkManager.Instance.deleteGroup(groupType);
+            this._groups.delete(groupId);
         }
     }
 
     renderGroup(groupId: string, groupDoc: Doc) {
-        return (
-            <div key={groupId} className="linkEditor-group">
-                <div className="linkEditor-group-row">
-                    <p className="linkEditor-group-row-label">type:</p>
-                    <LinkGroupsDropdown groupId={groupId} groupType={StrCast(groupDoc.proto!.type)} setGroup={this.setGroup} />
-                    {/* <input key={groupId + "-type"} type="text" value={StrCast(groupDoc.proto!.type)} onChange={e => this.editGroup(groupId, e.target.value)}></input> */}
-                    {/* <input key={groupId + "-type"} type="text" value={StrCast(groupDoc.proto!.type)} onChange={e => this.editGroup(groupId, e.target.value)}></input> */}
+        let type = StrCast(groupDoc["type"]);
+        if ((type && LinkManager.Instance.allGroups.get(type)) || type === "New Group") {
+            return (
+                <div key={groupId} className="linkEditor-group">
+                    <div className="linkEditor-group-row">
+                        <p className="linkEditor-group-row-label">type:</p>
+                        <LinkGroupsDropdown groupId={groupId} groupType={StrCast(groupDoc.proto!.type)} setGroup={this.setGroupType} />
+                    </div>
+                    {this.renderMetadata(groupId)}
+                    <div className="linkEditor-group-buttons">
+                        {groupDoc["type"] === "New Group" ? <button disabled={true} title="Add KVP">+</button> :
+                            <button onClick={() => this.addMetadata(StrCast(groupDoc.proto!.type))} title="Add KVP">+</button>}
+                        {/* <button onClick={this.viewGroupAsTable}>view group as table</button> */}
+                        <button onClick={() => this.copyGroup(groupId, type)} title="Copy group to opposite anchor">↔</button>
+                        <button onClick={() => this.removeGroupFromLink(groupId, type)} title="Remove group from link">x</button>
+                        <button onClick={() => this.deleteGroup(groupId, type)} title="Delete group">xx</button>
+                    </div>
                 </div>
-                {this.renderMetadata(groupId)}
-                {groupDoc["type"] === "*" ? <></> : <button onClick={() => this.addMetadata(StrCast(groupDoc.proto!.type))}>add kvp</button>}
-                <button onClick={this.viewGroupAsTable}>view group as table</button>
-                {/* <button onClick={() => this.addMetadata(StrCast(groupDoc.proto!.type))}>+</button> */}
-            </div>
-        )
+            )
+        } else {
+            return <></>
+        }
     }
 
     viewGroupAsTable = (): void => {
@@ -228,65 +287,6 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
         }
         LinkManager.Instance.allGroups.set(groupType, mdKeys);
 
-        // // create new metadata doc
-        // let mdDoc = Docs.TextDocument();
-        // mdDoc.proto!.title = "";
-        // mdDoc.proto!.value = "";
-
-        // // append to map
-        // let mdMap = this._metadata.get(groupId);
-        // if (mdMap) {
-        //     mdMap.set(Utils.GenerateGuid(), mdDoc);
-        // } else {
-        //     mdMap = new Map();
-        //     mdMap.set(Utils.GenerateGuid(), mdDoc);
-        // }
-
-        // // add to internal representation of metadata
-        // this._metadata.set(groupId, mdMap);
-
-        // // add to internatal representation of group
-        // let groupDoc = this._groups.get(groupId);
-        // if (groupDoc) {
-        //     groupDoc.proto!.metadata = new List<Doc>(Array.from(mdMap.values()));
-        //     this._groups.set(groupId, groupDoc);
-        // }
-
-        // // add to link doc
-        // let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-        // LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
-    }
-
-    // @action
-    // editMetadataTitle(groupId: string, mdId: string, value: string) {
-    //     let groupMd = this._metadata.get(groupId);
-    //     if (groupMd) {
-    //         let mdDoc = groupMd.get(mdId);
-    //         if (mdDoc) {
-    //             mdDoc.proto!.title = value;
-    //         }
-    //     }
-    //     // set group and link?
-    // }
-
-    // @action
-    // editMetadataValue(groupId: string, mdId: string, value: string) {
-    //     let groupMd = this._metadata.get(groupId);
-    //     if (groupMd) {
-    //         let mdDoc = groupMd.get(mdId);
-    //         if (mdDoc) {
-    //             mdDoc.proto!.value = value;
-    //         }
-    //     }
-    //     // set group and link?
-    // }
-
-    @action
-    editMetadataKey(groupId: string, value: string) {
-        let groupDoc = this._groups.get(groupId);
-        if (groupDoc) {
-
-        }
     }
 
     renderMetadata(groupId: string) {
@@ -300,30 +300,10 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
                 groupMdKeys.forEach((key, index) => {
                     metadata.push(
                         <LinkMetadataEditor key={"mded-" + index} groupType={groupType} mdDoc={mdDoc} mdKey={key} mdValue={(mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])} />
-                        // <div key={key} className="linkEditor-metadata-row">
-                        //     <input type="text" value={key} placeholder="key"></input>
-                        //     :
-                        //     <input type="text" value={(mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])} placeholder="value"></input>
-                        // </div>
                     )
                 })
             }
         }
-
-
-        // let metadataMap = this._metadata.get(groupId);
-        // if (metadataMap) {
-        //     metadataMap.forEach((mdDoc, mdId) => {
-        //         metadata.push(
-        //             <div key={mdId} className="linkEditor-metadata-row">
-        //                 <input type="text" value={StrCast(mdDoc.proto!.title)} placeholder="key" onChange={e => this.editMetadataTitle(groupId, mdId, e.target.value)}></input>
-        //                 :
-        //                 <input type="text" value={StrCast(mdDoc.proto!.value)} placeholder="value" onChange={e => this.editMetadataValue(groupId, mdId, e.target.value)}></input>
-        //             </div>
-        //         )
-        //     })
-        // }
-
         return metadata;
     }
 
@@ -340,10 +320,10 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
                 <button className="linkEditor-back" onPointerDown={() => this.props.showLinks()}><FontAwesomeIcon icon="arrow-left" size="sm" /></button>
                 <p className="linkEditor-linkedTo">editing link to: <b>{destination.proto!.title}</b></p>
                 <div className="linkEditor-groupsLabel">
-                    <b>Groups:</b>
-                    <button onClick={this.addGroup} title="Add Group">+</button>
+                    <b>Relationships:</b>
+                    <button onClick={() => this.addGroup()} title="Add Group">+</button>
                 </div>
-                {groups}
+                {groups.length > 0 ? groups : <div className="linkEditor-group">There are currently no relationships associated with this link.</div>}
             </div>
 
         );
diff --git a/src/client/views/nodes/LinkMenu.scss b/src/client/views/nodes/LinkMenu.scss
index 860f31d8a..7e031b897 100644
--- a/src/client/views/nodes/LinkMenu.scss
+++ b/src/client/views/nodes/LinkMenu.scss
@@ -40,7 +40,7 @@
             display: flex;
         }
         &:hover .link-menu-item-content {
-            width: calc(100% - 72px);
+            width: calc(100% - 42px);
         }
     }
     .link-menu-item-buttons {
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 21b5807ae..47bd6c3eb 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -32,7 +32,7 @@ export class LinkMenu extends React.Component<Props> {
     //     });
     // }
 
-    renderLinkGroupItems(links: Doc[]) {
+    renderGroup(links: Doc[]) {
         let source = this.props.docView.Document;
         return links.map(link => {
             let destination = LinkUtils.findOppositeAnchor(link, source);
@@ -43,7 +43,7 @@ export class LinkMenu extends React.Component<Props> {
         });
     }
 
-    renderLinkItems = (links: Map<string, Array<Doc>>): Array<JSX.Element> => {
+    renderLinks = (links: Map<string, Array<Doc>>): Array<JSX.Element> => {
         let linkItems: Array<JSX.Element> = [];
 
         links.forEach((links, group) => {
@@ -51,7 +51,7 @@ export class LinkMenu extends React.Component<Props> {
                 <div key={group} className="link-menu-group">
                     <p className="link-menu-group-name">{group}:</p>
                     <div className="link-menu-group-wrapper">
-                        {this.renderLinkGroupItems(links)}
+                        {this.renderGroup(links)}
                     </div>
                 </div>
             )
@@ -65,10 +65,7 @@ export class LinkMenu extends React.Component<Props> {
     }
 
     render() {
-        //get list of links from document
-        // let linkFrom = DocListCast(this.props.docView.props.Document.linkedFromDocs);
-        // let linkTo = DocListCast(this.props.docView.props.Document.linkedToDocs);
-        let related = LinkManager.Instance.findRelatedGroupedLinks(this.props.docView.props.Document);
+        let related: Map<string, Doc[]> = LinkManager.Instance.findRelatedGroupedLinks(this.props.docView.props.Document);
         if (this._editingLink === undefined) {
             return (
                 <div id="linkMenu-container">
@@ -76,31 +73,11 @@ export class LinkMenu extends React.Component<Props> {
                     <div id="linkMenu-list">
                         {/* {this.renderLinkItems(linkTo, "linkedTo", "Destination: ")}
                         {this.renderLinkItems(linkFrom, "linkedFrom", "Source: ")} */}
-                        {this.renderLinkItems(related)}
+                        {this.renderLinks(related)}
                     </div>
                 </div>
             );
         } else {
-            // let groups = new Map<string, Doc>();
-            // let metadata: Map<string, Map<string, Doc>> = new Map();
-            // let groupList = (Doc.AreProtosEqual(this.props.docView.props.Document, Cast(this._editingLink.anchor1, Doc, new Doc))) ?
-            //     Cast(this._editingLink.anchor1Groups, listSpec(Doc), []) : Cast(this._editingLink.anchor2Groups, listSpec(Doc), []);
-            // groupList.forEach(groupDoc => {
-            //     if (groupDoc instanceof Doc) {
-            //         let id = Utils.GenerateGuid();
-            //         groups.set(id, groupDoc);
-
-            //         let metadataMap = new Map<string, Doc>();
-            //         let metadataDocs = Cast(groupDoc.proto!.metadata, listSpec(Doc), []);
-            //         metadataDocs.forEach(mdDoc => {
-            //             if (mdDoc && mdDoc instanceof Doc) { // TODO: handle promise doc
-            //                 metadataMap.set(Utils.GenerateGuid(), mdDoc);
-            //             }
-            //         })
-            //         metadata.set(id, metadataMap);
-            //     }
-            // })
-
             return (
                 <LinkEditor sourceDoc={this.props.docView.props.Document} linkDoc={this._editingLink} showLinks={action(() => this._editingLink = undefined)}></LinkEditor>
             );
-- 
cgit v1.2.3-70-g09d2


From f54496c7aa930e385e77aaf37df8d51db733e3a2 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Fri, 14 Jun 2019 15:24:35 -0400
Subject: cleaned up link code

---
 src/client/util/LinkManager.ts         | 166 ++++++-----------
 src/client/views/nodes/LinkBox.scss    | 122 ++++++-------
 src/client/views/nodes/LinkBox.tsx     |  52 +-----
 src/client/views/nodes/LinkEditor.scss | 106 +++++------
 src/client/views/nodes/LinkEditor.tsx  | 319 +++++++++++++--------------------
 src/client/views/nodes/LinkMenu.scss   |  76 +-------
 src/client/views/nodes/LinkMenu.tsx    |  54 ++----
 7 files changed, 311 insertions(+), 584 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 929fcbf21..aaed7388d 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -1,71 +1,9 @@
-import { observable, computed, action } from "mobx";
-import React = require("react");
-import { SelectionManager } from "./SelectionManager";
-import { observer } from "mobx-react";
-import { props } from "bluebird";
-import { DocumentView } from "../views/nodes/DocumentView";
-import { link } from "fs";
+import { observable } from "mobx";
 import { StrCast, Cast } from "../../new_fields/Types";
-import { Doc } from "../../new_fields/Doc";
+import { Doc, DocListCast } from "../../new_fields/Doc";
 import { listSpec } from "../../new_fields/Schema";
 import { List } from "../../new_fields/List";
-import { string } from "prop-types";
-import { Docs } from "../documents/Documents";
 
-export namespace LinkUtils {
-    export function findOppositeAnchor(link: Doc, anchor: Doc): Doc {
-        if (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) {
-            return Cast(link.anchor2, Doc, new Doc);
-        } else {
-            return Cast(link.anchor1, Doc, new Doc);
-        }
-    }
-
-    export function setAnchorGroups(link: Doc, anchor: Doc, groups: Doc[]) {
-        // console.log("setting groups for anchor", anchor["title"]);
-        if (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) {
-            link.anchor1Groups = new List<Doc>(groups);
-
-            let print: string[] = [];
-            Cast(link.anchor1Groups, listSpec(Doc), []).forEach(doc => {
-                if (doc instanceof Doc) {
-                    print.push(StrCast(doc.type));
-                }
-            });
-            console.log("set anchor's groups as", print);
-        } else {
-            link.anchor2Groups = new List<Doc>(groups);
-
-            let print: string[] = [];
-            Cast(link.anchor2Groups, listSpec(Doc), []).forEach(doc => {
-                if (doc instanceof Doc) {
-                    print.push(StrCast(doc.type));
-                }
-            });
-            console.log("set anchor's groups as", print);
-        }
-    }
-
-    export function removeGroupFromAnchor(link: Doc, anchor: Doc, groupType: string) {
-        let groups = Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc)) ?
-            Cast(link.proto!.anchor1Groups, listSpec(Doc), []) : Cast(link.proto!.anchor2Groups, listSpec(Doc), []);
-
-        let newGroups: Doc[] = [];
-        groups.forEach(groupDoc => {
-            if (groupDoc instanceof Doc && StrCast(groupDoc.type) !== groupType) {
-                newGroups.push(groupDoc);
-            } // TODO: promise
-        });
-
-        // let grouptypes: string[] = [];
-        // newGroups.forEach(groupDoc => {
-        //     grouptypes.push(StrCast(groupDoc.type));
-        // });
-        // console.log("remove anchor's groups as", grouptypes);
-
-        LinkUtils.setAnchorGroups(link, anchor, newGroups);
-    }
-}
 
 /* 
  * link doc: 
@@ -94,6 +32,7 @@ export class LinkManager {
     @observable public allLinks: Array<Doc> = []; // list of link docs
     @observable public groupMetadataKeys: Map<string, Array<string>> = new Map(); // map of group type to list of its metadata keys
 
+    // finds all links that contain the given anchor
     public findAllRelatedLinks(anchor: Doc): Array<Doc> {
         return LinkManager.Instance.allLinks.filter(
             link => Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc)) || Doc.AreProtosEqual(anchor, Cast(link.anchor2, Doc, new Doc)));
@@ -102,27 +41,19 @@ export class LinkManager {
     // returns map of group type to anchor's links in that group type
     public findRelatedGroupedLinks(anchor: Doc): Map<string, Array<Doc>> {
         let related = this.findAllRelatedLinks(anchor);
-
         let anchorGroups = new Map<string, Array<Doc>>();
         related.forEach(link => {
+            let groups = LinkManager.Instance.getAnchorGroups(link, anchor);
 
-            // get groups of given anchor categorizes this link/opposite anchor in
-            let groups = (Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc))) ? Cast(link.anchor1Groups, listSpec(Doc), []) : Cast(link.anchor2Groups, listSpec(Doc), []);
             if (groups.length > 0) {
                 groups.forEach(groupDoc => {
-                    if (groupDoc instanceof Doc) {
-                        let groupType = StrCast(groupDoc.type);
-                        let group = anchorGroups.get(groupType); // TODO: clean this up lol
-                        if (group) group.push(link);
-                        else group = [link];
-                        anchorGroups.set(groupType, group);
-                    } else {
-                        // promise doc
-                    }
-
+                    let groupType = StrCast(groupDoc.type);
+                    let group = anchorGroups.get(groupType);
+                    if (group) group.push(link);
+                    else group = [link];
+                    anchorGroups.set(groupType, group);
                 });
-            }
-            else {
+            } else {
                 // if link is in no groups then put it in default group
                 let group = anchorGroups.get("*");
                 if (group) group.push(link);
@@ -134,52 +65,38 @@ export class LinkManager {
         return anchorGroups;
     }
 
-    public findMetadataInGroup(groupType: string) {
+    // returns a list of all metadata docs associated with the given group type
+    public findAllMetadataDocsInGroup(groupType: string): Array<Doc> {
         let md: Doc[] = [];
         let allLinks = LinkManager.Instance.allLinks;
-        // for every link find its groups
-        // allLinks.forEach(linkDoc => {
-        //     let anchor1groups = LinkManager.Instance.findRelatedGroupedLinks(Cast(linkDoc["anchor1"], Doc, new Doc));
-        //     if (anchor1groups.get(groupType)) {
-        //         md.push(linkDoc["anchor1"]["group"])
-        //     }
-        // })
         allLinks.forEach(linkDoc => {
-            let anchor1Groups = Cast(linkDoc.anchor1Groups, listSpec(Doc), []);
-            let anchor2Groups = Cast(linkDoc.anchor2Groups, listSpec(Doc), []);
-            anchor1Groups.forEach(groupDoc => {
-                if (groupDoc instanceof Doc) {
-                    if (StrCast(groupDoc.type) === groupType) {
-                        md.push(Cast(groupDoc.metadata, Doc, new Doc));
-                    }
-                } else {
-                    // TODO: promise
-                }
-            });
-            anchor2Groups.forEach(groupDoc => {
-                if (groupDoc instanceof Doc) {
-                    if (StrCast(groupDoc.type) === groupType) {
-                        md.push(Cast(groupDoc.metadata, Doc, new Doc));
-                    }
-                } else {
-                    // TODO: promise
-                }
-            });
-
+            let anchor1Groups = LinkManager.Instance.getAnchorGroups(linkDoc, Cast(linkDoc.anchor1, Doc, new Doc));
+            let anchor2Groups = LinkManager.Instance.getAnchorGroups(linkDoc, Cast(linkDoc.anchor2, Doc, new Doc));
+            anchor1Groups.forEach(groupDoc => { if (StrCast(groupDoc.type).toUpperCase() === groupType.toUpperCase()) md.push(Cast(groupDoc.metadata, Doc, new Doc)); });
+            anchor2Groups.forEach(groupDoc => { if (StrCast(groupDoc.type).toUpperCase() === groupType.toUpperCase()) md.push(Cast(groupDoc.metadata, Doc, new Doc)); });
         });
         return md;
     }
 
-    public deleteGroup(groupType: string) {
+    // removes all group docs from all links with the given group type
+    public deleteGroup(groupType: string): void {
         let deleted = LinkManager.Instance.groupMetadataKeys.delete(groupType);
         if (deleted) {
             LinkManager.Instance.allLinks.forEach(linkDoc => {
-                LinkUtils.removeGroupFromAnchor(linkDoc, Cast(linkDoc.anchor1, Doc, new Doc), groupType);
-                LinkUtils.removeGroupFromAnchor(linkDoc, Cast(linkDoc.anchor2, Doc, new Doc), groupType);
+                LinkManager.Instance.removeGroupFromAnchor(linkDoc, Cast(linkDoc.anchor1, Doc, new Doc), groupType);
+                LinkManager.Instance.removeGroupFromAnchor(linkDoc, Cast(linkDoc.anchor2, Doc, new Doc), groupType);
             });
         }
     }
 
+    // removes group doc of given group type only from given anchor on given link
+    public removeGroupFromAnchor(linkDoc: Doc, anchor: Doc, groupType: string) {
+        let groups = LinkManager.Instance.getAnchorGroups(linkDoc, anchor);
+        let newGroups = groups.filter(groupDoc => StrCast(groupDoc.type).toUpperCase() !== groupType.toUpperCase());
+        LinkManager.Instance.setAnchorGroups(linkDoc, anchor, newGroups);
+    }
+
+    // checks if a link with the given anchors exists
     public doesLinkExist(anchor1: Doc, anchor2: Doc) {
         let allLinks = LinkManager.Instance.allLinks;
         let index = allLinks.findIndex(linkDoc => {
@@ -189,4 +106,31 @@ export class LinkManager {
         return index !== -1;
     }
 
+    // finds the opposite anchor of a given anchor in a link
+    public findOppositeAnchor(linkDoc: Doc, anchor: Doc): Doc {
+        if (Doc.AreProtosEqual(anchor, Cast(linkDoc.anchor1, Doc, new Doc))) {
+            return Cast(linkDoc.anchor2, Doc, new Doc);
+        } else {
+            return Cast(linkDoc.anchor1, Doc, new Doc);
+        }
+    }
+
+    // gets the groups associates with an anchor in a link
+    public getAnchorGroups(linkDoc: Doc, anchor: Doc): Array<Doc> {
+        if (Doc.AreProtosEqual(anchor, Cast(linkDoc.anchor1, Doc, new Doc))) {
+            return DocListCast(linkDoc.anchor1Groups);
+        } else {
+            return DocListCast(linkDoc.anchor2Groups);
+        }
+    }
+
+    // sets the groups of the given anchor in the given link
+    public setAnchorGroups(linkDoc: Doc, anchor: Doc, groups: Doc[]) {
+        if (Doc.AreProtosEqual(anchor, Cast(linkDoc.anchor1, Doc, new Doc))) {
+            linkDoc.anchor1Groups = new List<Doc>(groups);
+        } else {
+            linkDoc.anchor2Groups = new List<Doc>(groups);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkBox.scss b/src/client/views/nodes/LinkBox.scss
index 639f83b38..08fefaf4d 100644
--- a/src/client/views/nodes/LinkBox.scss
+++ b/src/client/views/nodes/LinkBox.scss
@@ -1,66 +1,62 @@
 @import "../globalCssVariables";
-.link-container {
-    width: 100%;
-    height: 50px;
+.link-menu-item {
+    border-top: 0.5px solid $light-color-secondary; 
+    padding: 6px;
+    position: relative;
     display: flex;
-    flex-direction: row;
-    border-top: 0.5px solid #bababa;
-}
-
-.info-container {
-    width: 65%;
-    padding-top: 5px;
-    padding-left: 5px;
-    display: flex;
-    flex-direction: column
-}
-
-.link-name {
-    font-size: 11px;
-}
-
-.doc-name {
-    font-size: 8px;
-}
-
-.button-container {
-    width: 35%;
-    padding-top: 8px;
-    display: flex;
-    flex-direction: row;
-}
-
-.button {
-    height: 20px;
-    width: 20px;
-    margin: 8px 4px;
-    border-radius: 50%;
-    opacity: 0.9;
-    pointer-events: auto;
-    background-color: $dark-color;
-    color: $light-color;
-    text-transform: uppercase;
-    letter-spacing: 2px;
-    font-size: 60%;
-    transition: transform 0.2s;
-}
-
-.button:hover {
-    background: $main-accent;
-    cursor: pointer;
-}
-
-// .fa-icon-view {
-//     margin-left: 3px;
-//     margin-top: 5px;
-// }
-
-.fa-icon-edit {
-    margin-left: 6px;
-    margin-top: 6px;
-}
-
-.fa-icon-delete {
-    margin-left: 7px;
-    margin-top: 6px;
+    font-size: 12px;
+
+    .link-menu-item-content {
+        width: 100%;
+    }
+
+    &:last-child {
+        border-bottom: 0.5px solid $light-color-secondary;
+    }
+    &:hover {
+        .link-menu-item-buttons {
+            display: flex;
+        }
+        .link-menu-item-content {
+            width: calc(100% - 42px);
+        }
+    }
+}
+
+.link-menu-item-buttons {
+    display: none;
+    position: absolute;
+    top: 50%;
+    right: 0;
+    transform: translateY(-50%);
+
+    .button {
+        width: 20px;
+        height: 20px;
+        margin: 0;
+        margin-right: 6px;
+        border-radius: 50%;
+        cursor: pointer;
+        pointer-events: auto;
+        background-color: $dark-color;
+        color: $light-color;
+        font-size: 65%;
+        transition: transform 0.2s;
+        text-align: center;
+        position: relative;
+
+        .fa-icon {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+        }
+
+        &:last-child {
+            margin-right: 0;
+        }
+        &:hover {
+            background: $main-accent;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkBox.tsx b/src/client/views/nodes/LinkBox.tsx
index 5597bb1aa..1a7cce4a3 100644
--- a/src/client/views/nodes/LinkBox.tsx
+++ b/src/client/views/nodes/LinkBox.tsx
@@ -4,13 +4,10 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { observer } from "mobx-react";
 import { DocumentManager } from "../../util/DocumentManager";
 import { undoBatch } from "../../util/UndoManager";
-import { CollectionDockingView } from "../collections/CollectionDockingView";
 import './LinkBox.scss';
 import React = require("react");
 import { Doc } from '../../../new_fields/Doc';
-import { Cast, NumCast } from '../../../new_fields/Types';
-import { listSpec } from '../../../new_fields/Schema';
-import { action } from 'mobx';
+import { StrCast } from '../../../new_fields/Types';
 
 
 library.add(faEye);
@@ -20,9 +17,8 @@ library.add(faArrowRight);
 
 interface Props {
     linkDoc: Doc;
-    linkName: String;
-    pairedDoc: Doc;
-    type: String;
+    sourceDoc: Doc;
+    destinationDoc: Doc;
     showEditor: () => void;
 }
 
@@ -30,58 +26,28 @@ interface Props {
 export class LinkBox extends React.Component<Props> {
 
     @undoBatch
-    followLink = async (e: React.PointerEvent): Promise<void> => {
+    onFollowLink = async (e: React.PointerEvent): Promise<void> => {
         e.stopPropagation();
-        DocumentManager.Instance.jumpToDocument(this.props.pairedDoc, e.altKey);
+        DocumentManager.Instance.jumpToDocument(this.props.destinationDoc, e.altKey);
     }
 
-    onEditButtonPressed = (e: React.PointerEvent): void => {
+    onEdit = (e: React.PointerEvent): void => {
         e.stopPropagation();
-
         this.props.showEditor();
     }
 
-    // @action
-    // onDeleteButtonPressed = async (e: React.PointerEvent): Promise<void> => {
-    //     e.stopPropagation();
-    //     const [linkedFrom, linkedTo] = await Promise.all([Cast(this.props.linkDoc.linkedFrom, Doc), Cast(this.props.linkDoc.linkedTo, Doc)]);
-    //     if (linkedFrom) {
-    //         const linkedToDocs = Cast(linkedFrom.linkedToDocs, listSpec(Doc));
-    //         if (linkedToDocs) {
-    //             linkedToDocs.splice(linkedToDocs.indexOf(this.props.linkDoc), 1);
-    //         }
-    //     }
-    //     if (linkedTo) {
-    //         const linkedFromDocs = Cast(linkedTo.linkedFromDocs, listSpec(Doc));
-    //         if (linkedFromDocs) {
-    //             linkedFromDocs.splice(linkedFromDocs.indexOf(this.props.linkDoc), 1);
-    //         }
-    //     }
-    // }
-
     render() {
-
         return (
-            //<LinkEditor linkBox={this} linkDoc={this.props.linkDoc} />
             <div className="link-menu-item">
                 <div className="link-menu-item-content">
                     <div className="link-name">
-                        <p>{this.props.linkName}</p>
-                    </div>
-                    <div className="doc-name">
-                        <p>{this.props.type}{this.props.pairedDoc.Title}</p>
+                        <p>{StrCast(this.props.destinationDoc.title)}</p>
                     </div>
                 </div>
 
                 <div className="link-menu-item-buttons">
-                    {/* <div title="Follow Link" className="button" onPointerDown={this.onViewButtonPressed}>
-                        <FontAwesomeIcon className="fa-icon-view" icon="eye" size="sm" /></div> */}
-                    <div title="Follow Link" className="button" onPointerDown={this.followLink}>
-                        <FontAwesomeIcon className="fa-icon" icon="arrow-right" size="sm" /></div>
-                    <div title="Edit Link" className="button" onPointerDown={this.onEditButtonPressed}>
-                        <FontAwesomeIcon className="fa-icon" icon="edit" size="sm" /></div>
-                    {/* <div title="Delete Link" className="button" onPointerDown={this.onDeleteButtonPressed}>
-                        <FontAwesomeIcon className="fa-icon" icon="times" size="sm" /></div> */}
+                    <div title="Edit link" className="button" onPointerDown={this.onEdit}><FontAwesomeIcon className="fa-icon" icon="edit" size="sm" /></div>
+                    <div title="Follow link" className="button" onPointerDown={this.onFollowLink}><FontAwesomeIcon className="fa-icon" icon="arrow-right" size="sm" /></div>
                 </div>
             </div>
         );
diff --git a/src/client/views/nodes/LinkEditor.scss b/src/client/views/nodes/LinkEditor.scss
index 01f0cb82a..6aac39f45 100644
--- a/src/client/views/nodes/LinkEditor.scss
+++ b/src/client/views/nodes/LinkEditor.scss
@@ -1,92 +1,63 @@
 @import "../globalCssVariables";
-.edit-container {
+
+.linkEditor {
     width: 100%;
     height: auto;
-    display: flex;
-    flex-direction: column;
+    font-size: 12px; // TODO
 }
 
-.name-input {
-    margin-bottom: 10px;
-    padding: 5px;
-    font-size: 12px;
-    border: 1px solid #bababa;
+.linkEditor-back {
+    margin-bottom: 6px;
 }
 
-.description-input {
-    font-size: 11px;
-    padding: 5px;
-    margin-bottom: 10px;
-    border: 1px solid #bababa;
-}
+.linkEditor-groupsLabel {
+    display: flex;
+    justify-content: space-between;
 
-.save-button {
-    width: 50px;
-    height: 22px;
-    pointer-events: auto;
-    background-color: $dark-color;
-    color: $light-color;
-    text-transform: uppercase;
-    letter-spacing: 2px;
-    padding: 2px;
-    font-size: 10px;
-    margin: 0 auto;
-    transition: transform 0.2s;
-    text-align: center;
-    line-height: 20px;
+    button {
+        width: 20px;
+        height: 20px;
+        margin-left: 6px;
+        padding: 0;
+        font-size: 14px;
+    }
 }
 
-.save-button:hover {
-    background: $main-accent;
-    cursor: pointer;
+.linkEditor-linkedTo {
+    border-bottom: 0.5px solid $light-color-secondary; 
+    padding-bottom: 6px;
+    margin-bottom: 6px;
 }
 
-.linkEditor {
-    font-size: 12px; // TODO
-
-    .linkEditor-back {
-        // background-color: $dark-color;
-        // color: $light-color;
-        margin-bottom: 6px;
-    }
+.linkEditor-group {
+    background-color: $light-color-secondary; 
+    padding: 6px;
+    margin: 3px 0;
+    border-radius: 3px;
 
-    .linkEditor-groupsLabel {
-        display: flex;
-        justify-content: space-between;
-        button {
-            width: 20px;
-            height: 20px;
-            margin-left: 6px;
-            padding: 0;
-            font-size: 14px;
-        }
-    }
-    .linkEditor-linkedTo {
-        border-bottom: 0.5px solid $light-color-secondary; 
-        padding-bottom: 6px;
-        margin-bottom: 6px;
-    }
-    .linkEditor-group {
-        background-color: $light-color-secondary; 
-        padding: 6px;
-        margin: 3px 0;
-        border-radius: 3px;
-    }
     .linkEditor-group-row {
         display: flex;
         margin-bottom: 6px;
+
         .linkEditor-group-row-label {
             margin-right: 6px;
         }
     }
+
     .linkEditor-metadata-row {
         display: flex;
         justify-content: space-between;
         margin-bottom: 6px;
+
+        .linkEditor-error {
+            border-color: red;
+        }
+
         input {
             width: calc(50% - 18px);
             height: 20px;
         }
+
         button {
             width: 20px;
             height: 20px;
@@ -97,10 +68,12 @@
     }
 }
 
+
 .linkEditor-dropdown {
     width: 100%;
     position: relative;
     z-index: 999;
+
     .linkEditor-options-wrapper {
         width: 100%;
         position: absolute;
@@ -109,12 +82,14 @@
         display: flex;
         flex-direction: column;
     }
+
     .linkEditor-option {
         background-color: $light-color-secondary;
         border: 1px solid $intermediate-color;
         border-top: 0;
         padding: 3px;
         cursor: pointer;
+
         &:hover {
             background-color: $intermediate-color;
             font-weight: bold;
@@ -126,19 +101,18 @@
     height: 20px;
     display: flex;
     justify-content: space-between;
+
     .linkEditor-groupOpts {
         width: calc(20% - 3px);
         height: 20px;
-        // margin-left: 6px;
         padding: 0;
         font-size: 10px;
-        &:first-child { // delete
-            font-size: 14px;
-        }
-        &:disabled { // delete
+
+        &:disabled {
             background-color: gray;
         }
     }
+
     .linkEditor-groupOpts button {
         width: 100%;
         height: 20px;
diff --git a/src/client/views/nodes/LinkEditor.tsx b/src/client/views/nodes/LinkEditor.tsx
index 5097d625e..484682c22 100644
--- a/src/client/views/nodes/LinkEditor.tsx
+++ b/src/client/views/nodes/LinkEditor.tsx
@@ -4,61 +4,52 @@ import { observer } from "mobx-react";
 import './LinkEditor.scss';
 import { StrCast, Cast } from "../../../new_fields/Types";
 import { Doc } from "../../../new_fields/Doc";
-import { List } from "../../../new_fields/List";
-import { listSpec } from "../../../new_fields/Schema";
-import { LinkManager, LinkUtils } from "../../util/LinkManager";
+import { LinkManager } from "../../util/LinkManager";
 import { Docs } from "../../documents/Documents";
 import { Utils } from "../../../Utils";
 import { faArrowLeft, faEllipsisV, faTable } from '@fortawesome/free-solid-svg-icons';
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { string } from "prop-types";
 import { SetupDrag } from "../../util/DragManager";
 
 library.add(faArrowLeft);
 library.add(faEllipsisV);
 library.add(faTable);
 
+
+interface GroupTypesDropdownProps {
+    groupId: string;
+    groupType: string;
+    setGroup: (groupId: string, group: string) => void;
+}
 // this dropdown could be generalized
 @observer
-class LinkGroupsDropdown extends React.Component<{ groupId: string, groupType: string, setGroup: (groupId: string, group: string) => void }> {
+class GroupTypesDropdown extends React.Component<GroupTypesDropdownProps> {
     @observable private _searchTerm: string = "";
     @observable private _groupType: string = this.props.groupType;
 
-    @action
-    setSearchTerm(value: string) {
-        this._searchTerm = value;
-    }
+    @action setSearchTerm = (value: string): void => { this._searchTerm = value; };
+    @action setGroupType = (value: string): void => { this._groupType = value; };
 
     @action
-    setGroupType(value: string) {
-        this._groupType = value;
+    createGroup = (groupType: string): void => {
+        this.props.setGroup(this.props.groupId, groupType);
+        LinkManager.Instance.groupMetadataKeys.set(groupType, []);
     }
 
-    @action
-    createGroup(value: string) {
-        LinkManager.Instance.groupMetadataKeys.set(value, []);
-        this.props.setGroup(this.props.groupId, value);
-    }
+    renderOptions = (): JSX.Element[] | JSX.Element => {
+        if (this._searchTerm === "") return <></>;
 
-    renderOptions = (): JSX.Element[] => {
-        let allGroups: string[], searchTerm: string, results: string[], exactFound: boolean;
-        if (this._searchTerm !== "") {
-            allGroups = Array.from(LinkManager.Instance.groupMetadataKeys.keys());
-            searchTerm = this._searchTerm.toUpperCase();
-            results = allGroups.filter(group => group.toUpperCase().indexOf(searchTerm) > -1);
-            exactFound = results.findIndex(group => group.toUpperCase() === searchTerm) > -1;
-        } else {
-            results = [];
-            exactFound = false;
-        }
+        let allGroupTypes = Array.from(LinkManager.Instance.groupMetadataKeys.keys());
+        let groupOptions = allGroupTypes.filter(groupType => groupType.toUpperCase().indexOf(this._searchTerm.toUpperCase()) > -1);
+        let exactFound = groupOptions.findIndex(groupType => groupType.toUpperCase() === this._searchTerm.toUpperCase()) > -1;
 
-        let options = [];
-        results.forEach(result => {
-            options.push(<div key={result} className="linkEditor-option"
-                onClick={() => { this.props.setGroup(this.props.groupId, result); this.setGroupType(result); this.setSearchTerm(""); }}>{result}</div>);
+        let options = groupOptions.map(groupType => {
+            return <div key={groupType} className="linkEditor-option"
+                onClick={() => { this.props.setGroup(this.props.groupId, groupType); this.setGroupType(groupType); this.setSearchTerm(""); }}>{groupType}</div>;
         });
 
+        // if search term does not already exist as a group type, give option to create new group type
         if (!exactFound && this._searchTerm !== "") {
             options.push(<div key={""} className="linkEditor-option"
                 onClick={() => { this.createGroup(this._searchTerm); this.setGroupType(this._searchTerm); this.setSearchTerm(""); }}>Define new "{this._searchTerm}" relationship</div>);
@@ -81,57 +72,66 @@ class LinkGroupsDropdown extends React.Component<{ groupId: string, groupType: s
 }
 
 
-
+interface LinkMetadataEditorProps {
+    groupType: string;
+    mdDoc: Doc;
+    mdKey: string;
+    mdValue: string;
+}
 @observer
-class LinkMetadataEditor extends React.Component<{ groupType: string, mdDoc: Doc, mdKey: string, mdValue: string }> {
+class LinkMetadataEditor extends React.Component<LinkMetadataEditorProps> {
     @observable private _key: string = this.props.mdKey;
     @observable private _value: string = this.props.mdValue;
+    @observable private _keyError: boolean = false;
 
     @action
-    editMetadataKey = (value: string): void => {
-        // TODO: check that metadata doesnt already exist in group
+    setMetadataKey = (value: string): void => {
         let groupMdKeys = new Array(...LinkManager.Instance.groupMetadataKeys.get(this.props.groupType)!);
-        if (groupMdKeys) {
-            let index = groupMdKeys.indexOf(this._key);
-            if (index > -1) {
-                groupMdKeys[index] = value;
-            }
-            else {
-                console.log("OLD KEY WAS NOT FOUND", ...groupMdKeys);
-            }
+
+        // don't allow user to create existing key
+        let newIndex = groupMdKeys.findIndex(key => key.toUpperCase() === value.toUpperCase());
+        if (newIndex > -1) {
+            this._keyError = true;
+            this._key = value;
+            return;
+        } else {
+            this._keyError = false;
         }
 
+        // set new value for key
+        let currIndex = groupMdKeys.findIndex(key => key.toUpperCase() === this._key.toUpperCase());
+        if (currIndex === -1) console.error("LinkMetadataEditor: key was not found");
+        groupMdKeys[currIndex] = value;
+
         this._key = value;
         LinkManager.Instance.groupMetadataKeys.set(this.props.groupType, groupMdKeys);
     }
 
     @action
-    editMetadataValue = (value: string): void => {
-        this.props.mdDoc[this._key] = value;
-        this._value = value;
+    setMetadataValue = (value: string): void => {
+        if (!this._keyError) {
+            this._value = value;
+            this.props.mdDoc[this._key] = value;
+        }
     }
 
     @action
     removeMetadata = (): void => {
         let groupMdKeys = new Array(...LinkManager.Instance.groupMetadataKeys.get(this.props.groupType)!);
-        if (groupMdKeys) {
-            let index = groupMdKeys.indexOf(this._key);
-            if (index > -1) {
-                groupMdKeys.splice(index, 1);
-            }
-            else {
-                console.log("OLD KEY WAS NOT FOUND", ...groupMdKeys);
-            }
-        }
-        this._key = "";
+
+        let index = groupMdKeys.findIndex(key => key.toUpperCase() === this._key.toUpperCase());
+        if (index === -1) console.error("LinkMetadataEditor: key was not found");
+        groupMdKeys.splice(index, 1);
+
         LinkManager.Instance.groupMetadataKeys.set(this.props.groupType, groupMdKeys);
+        this._key = "";
     }
 
     render() {
         return (
             <div className="linkEditor-metadata-row">
-                <input type="text" value={this._key} placeholder="key" onChange={e => this.editMetadataKey(e.target.value)}></input>:
-                <input type="text" value={this._value} placeholder="value" onChange={e => this.editMetadataValue(e.target.value)}></input>
+                <input className={this._keyError ? "linkEditor-error" : ""} type="text" value={this._key} placeholder="key" onChange={e => this.setMetadataKey(e.target.value)}></input>:
+                <input type="text" value={this._value} placeholder="value" onChange={e => this.setMetadataValue(e.target.value)}></input>
                 <button onClick={() => this.removeMetadata()}>x</button>
             </div>
         );
@@ -144,175 +144,127 @@ interface LinkEditorProps {
     linkDoc: Doc;
     showLinks: () => void;
 }
-
 @observer
 export class LinkEditor extends React.Component<LinkEditorProps> {
 
-    @observable private _groups: Map<string, Doc> = new Map(); // map of temp group id to the corresponding group doc
+    // map of temporary group id to the corresponding group doc
+    @observable private _groups: Map<string, Doc> = new Map();
 
     constructor(props: LinkEditorProps) {
         super(props);
 
         let groups = new Map<string, Doc>();
-        let groupList = (Doc.AreProtosEqual(props.sourceDoc, Cast(props.linkDoc.anchor1, Doc, new Doc))) ?
-            Cast(props.linkDoc.anchor1Groups, listSpec(Doc), []) : Cast(props.linkDoc.anchor2Groups, listSpec(Doc), []);
+        let groupList = LinkManager.Instance.getAnchorGroups(props.linkDoc, props.sourceDoc);
         groupList.forEach(groupDoc => {
-            if (groupDoc instanceof Doc) {
-                let id = Utils.GenerateGuid();
-                groups.set(id, groupDoc);
-            } else {
-                // promise doc
-            }
+            let id = Utils.GenerateGuid();
+            groups.set(id, groupDoc);
         });
         this._groups = groups;
     }
 
     @action
     addGroup = (): void => {
-        console.log("before adding", ...Array.from(this._groups.keys()));
-
         // new group only gets added if there is not already a group with type "new group"
         let index = Array.from(this._groups.values()).findIndex(groupDoc => {
             return groupDoc.type === "New Group";
         });
-        if (index === -1) {
-            // create new document for group
-            let mdDoc = Docs.TextDocument();
-            mdDoc.proto!.anchor1 = this.props.sourceDoc.title;
-            mdDoc.proto!.anchor2 = LinkUtils.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc).title;
+        if (index > -1) return;
 
-            let groupDoc = Docs.TextDocument();
-            groupDoc.proto!.type = "New Group";
-            groupDoc.proto!.metadata = mdDoc;
+        // create new metadata document for group
+        let mdDoc = Docs.TextDocument();
+        mdDoc.proto!.anchor1 = this.props.sourceDoc.title;
+        mdDoc.proto!.anchor2 = LinkManager.Instance.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc).title;
 
-            this._groups.set(Utils.GenerateGuid(), groupDoc);
+        // create new group document
+        let groupDoc = Docs.TextDocument();
+        groupDoc.proto!.type = "New Group";
+        groupDoc.proto!.metadata = mdDoc;
 
-            let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-            LinkUtils.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
-        }
+        this._groups.set(Utils.GenerateGuid(), groupDoc);
 
-
-        // console.log("set anchor groups for", this.props.sourceDoc["title"]);
-        console.log("after adding", ...Array.from(this._groups.keys()));
+        let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
+        LinkManager.Instance.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
     }
 
     @action
     setGroupType = (groupId: string, groupType: string): void => {
-        console.log("setting for ", groupId);
-        // let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
         let groupDoc = this._groups.get(groupId);
         if (groupDoc) {
-            console.log("found group doc");
             groupDoc.proto!.type = groupType;
-
             this._groups.set(groupId, groupDoc);
-
-
-            LinkUtils.setAnchorGroups(this.props.linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
-            console.log("set", Array.from(this._groups.values()).length);
+            LinkManager.Instance.setAnchorGroups(this.props.linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
         }
-
-        let anchor1groups: string[] = [];
-        Cast(this.props.linkDoc.anchor1Groups, listSpec(Doc), []).forEach(doc => {
-            if (doc instanceof Doc) {
-                anchor1groups.push(StrCast(doc.proto!.type));
-            } else {
-                console.log("promise");
-            }
-        });
-        let anchor2groups: string[] = [];
-        Cast(this.props.linkDoc.anchor2Groups, listSpec(Doc), []).forEach(doc => {
-            if (doc instanceof Doc) {
-                anchor2groups.push(StrCast(doc.proto!.type));
-            } else {
-                console.log("promise");
-            }
-        });
-        console.log("groups for anchors; anchor1: [", ...anchor1groups, "] ; anchor2: [", ...anchor2groups, "]");
     }
 
-    removeGroupFromLink = (groupId: string, groupType: string) => {
-        // this._groups.delete(groupId);
+    removeGroupFromLink = (groupId: string, groupType: string): void => {
         let groupDoc = this._groups.get(groupId);
-        if (groupDoc) {
-            LinkUtils.removeGroupFromAnchor(this.props.linkDoc, this.props.sourceDoc, groupType);
-            this._groups.delete(groupId);
-        }
-        // LinkUtils.setAnchorGroups(this.props.linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
-        console.log("\nremoved", groupId, "remaining", ...Array.from(this._groups.keys()), "\n");
+        if (!groupDoc) console.error("LinkEditor: group not found");
+        LinkManager.Instance.removeGroupFromAnchor(this.props.linkDoc, this.props.sourceDoc, groupType);
+        this._groups.delete(groupId);
     }
 
-    deleteGroup = (groupId: string, groupType: string) => {
+    deleteGroup = (groupId: string, groupType: string): void => {
         let groupDoc = this._groups.get(groupId);
-        if (groupDoc) {
-            LinkManager.Instance.deleteGroup(groupType);
-            this._groups.delete(groupId);
-        }
+        if (!groupDoc) console.error("LinkEditor: group not found");
+        LinkManager.Instance.deleteGroup(groupType);
+        this._groups.delete(groupId);
     }
 
-    copyGroup = (groupId: string, groupType: string) => {
-        let oppAnchor = LinkUtils.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
-        let groupList = (Doc.AreProtosEqual(oppAnchor, Cast(this.props.linkDoc.anchor1, Doc, new Doc))) ?
-            Cast(this.props.linkDoc.anchor1Groups, listSpec(Doc), []) : Cast(this.props.linkDoc.anchor2Groups, listSpec(Doc), []);
-        // if group already exists on opposite anchor, copy value
-        let index = groupList.findIndex(groupDoc => {
-            if (groupDoc instanceof Doc) {
-                return StrCast(groupDoc.type) === groupType;
-            } else {
-                return false;
-            }
-        });
-        // TODO: clean
-        // if (index > 0) {
-        //     let thisGroupDoc = this._groups.get(groupId);
-        //     let oppGroupDoc = groupList[index];
-        //     let keys = LinkManager.Instance.allGroups.get(groupType);
-        //     if (keys) {
-        //         keys.forEach(key => {
-        //             if (thisGroupDoc && oppGroupDoc instanceof Doc) { // TODO: clean
-        //                 let val = thisGroupDoc[key] === undefined ? "" : StrCast(thisGroupDoc[key]);
-        //                 oppGroupDoc[key] = val;
-        //             }
-        //             //     mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])
-        //             // oppGroupDoc[key] = thisGroupDoc[key];
-        //         })
-        //     }
-        //     // LinkUtils.setAnchorGroups(this.props.linkDoc, oppAnchor, [oppGroupDoc]);
-        // } else {
-        let thisGroupDoc = this._groups.get(groupId);
-        let thisMdDoc = Cast(thisGroupDoc!.metadata, Doc, new Doc);
-        let newGroupDoc = Docs.TextDocument();
-        let newMdDoc = Docs.TextDocument();
-        newMdDoc.proto!.anchor1 = StrCast(thisMdDoc.anchor2);
-        newMdDoc.proto!.anchor2 = StrCast(thisMdDoc.anchor1);
+    copyGroup = (groupId: string, groupType: string): void => {
+        let sourceGroupDoc = this._groups.get(groupId);
+        let sourceMdDoc = Cast(sourceGroupDoc!.metadata, Doc, new Doc);
+        let destDoc = LinkManager.Instance.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
+        let destGroupList = LinkManager.Instance.getAnchorGroups(this.props.linkDoc, destDoc);
         let keys = LinkManager.Instance.groupMetadataKeys.get(groupType);
+
+        // create new metadata doc with copied kvp
+        let destMdDoc = Docs.TextDocument();
+        destMdDoc.proto!.anchor1 = StrCast(sourceMdDoc.anchor2);
+        destMdDoc.proto!.anchor2 = StrCast(sourceMdDoc.anchor1);
         if (keys) {
             keys.forEach(key => {
-                if (thisGroupDoc) { // TODO: clean
-                    let val = thisMdDoc[key] === undefined ? "" : StrCast(thisMdDoc[key]);
-                    newMdDoc[key] = val;
-                }
-                //     mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])
-                // oppGroupDoc[key] = thisGroupDoc[key];
+                let val = sourceMdDoc[key] === undefined ? "" : StrCast(sourceMdDoc[key]);
+                destMdDoc[key] = val;
             });
         }
-        newGroupDoc.proto!.type = groupType;
-        newGroupDoc.proto!.metadata = newMdDoc;
 
-        LinkUtils.setAnchorGroups(this.props.linkDoc, oppAnchor, [newGroupDoc]); // TODO: fix to append to list
-        // }
+        // create new group doc with new metadata doc
+        let destGroupDoc = Docs.TextDocument();
+        destGroupDoc.proto!.type = groupType;
+        destGroupDoc.proto!.metadata = destMdDoc;
 
-        // else create group on opposite anchor
+        // if group does not already exist on opposite anchor, create group doc
+        let index = destGroupList.findIndex(groupDoc => { StrCast(groupDoc.type).toUpperCase() === groupType.toUpperCase(); });
+        if (index > -1) {
+            destGroupList[index] = destGroupDoc;
+        } else {
+            destGroupList.push(destGroupDoc);
+        }
+
+        LinkManager.Instance.setAnchorGroups(this.props.linkDoc, destDoc, destGroupList);
+    }
+
+    viewGroupAsTable = (groupId: string, groupType: string): JSX.Element => {
+        let keys = LinkManager.Instance.groupMetadataKeys.get(groupType);
+        let groupDoc = this._groups.get(groupId);
+        if (keys && groupDoc) {
+            let docs: Doc[] = LinkManager.Instance.findAllMetadataDocsInGroup(groupType);
+            let createTable = action(() => Docs.SchemaDocument(["anchor1", "anchor2", ...keys!], docs, { width: 200, height: 200, title: groupType + " table" }));
+            let ref = React.createRef<HTMLDivElement>();
+            return <div className="linkEditor-groupOpts" ref={ref}><button onPointerDown={SetupDrag(ref, createTable)}><FontAwesomeIcon icon="table" size="sm" /></button></div>;
+        } else {
+            return <button className="linkEditor-groupOpts" disabled><FontAwesomeIcon icon="table" size="sm" /></button>;
+        }
     }
 
-    renderGroup(groupId: string, groupDoc: Doc) {
+    renderGroup = (groupId: string, groupDoc: Doc): JSX.Element => {
         let type = StrCast(groupDoc.type);
         if ((type && LinkManager.Instance.groupMetadataKeys.get(type)) || type === "New Group") {
             return (
                 <div key={groupId} className="linkEditor-group">
                     <div className="linkEditor-group-row">
                         <p className="linkEditor-group-row-label">type:</p>
-                        <LinkGroupsDropdown groupId={groupId} groupType={StrCast(groupDoc.proto!.type)} setGroup={this.setGroupType} />
+                        <GroupTypesDropdown groupId={groupId} groupType={StrCast(groupDoc.proto!.type)} setGroup={this.setGroupType} />
                     </div>
                     {this.renderMetadata(groupId)}
                     <div className="linkEditor-group-buttons">
@@ -330,35 +282,20 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
         }
     }
 
-    viewGroupAsTable(groupId: string, groupType: string) {
-        let keys = LinkManager.Instance.groupMetadataKeys.get(groupType);
-        let groupDoc = this._groups.get(groupId);
-        if (keys && groupDoc) {
-            console.log("keys:", ...keys);
-            let docs: Doc[] = LinkManager.Instance.findMetadataInGroup(groupType);
-            let createTable = action(() => Docs.SchemaDocument(["anchor1", "anchor2", ...keys!], docs, { width: 200, height: 200, title: groupType + " table" }));
-            let ref = React.createRef<HTMLDivElement>();
-            return <div className="linkEditor-groupOpts" ref={ref}><button onPointerDown={SetupDrag(ref, createTable)}><FontAwesomeIcon icon="table" size="sm" /></button></div>;
-        } else {
-            return <button className="linkEditor-groupOpts" disabled><FontAwesomeIcon icon="table" size="sm" /></button>;
-        }
-    }
-
 
     @action
     addMetadata = (groupType: string): void => {
         let mdKeys = LinkManager.Instance.groupMetadataKeys.get(groupType);
         if (mdKeys) {
-            if (mdKeys.indexOf("new key") === -1) {
-                mdKeys.push("new key");
-            }
+            // only add "new key" if there is no other key with value "new key"; prevents spamming
+            if (mdKeys.indexOf("new key") === -1) mdKeys.push("new key");
         } else {
             mdKeys = ["new key"];
         }
         LinkManager.Instance.groupMetadataKeys.set(groupType, mdKeys);
     }
 
-    renderMetadata(groupId: string) {
+    renderMetadata = (groupId: string): JSX.Element[] => {
         let metadata: Array<JSX.Element> = [];
         let groupDoc = this._groups.get(groupId);
         if (groupDoc) {
@@ -377,7 +314,7 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
     }
 
     render() {
-        let destination = LinkUtils.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
+        let destination = LinkManager.Instance.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
 
         let groups: Array<JSX.Element> = [];
         this._groups.forEach((groupDoc, groupId) => {
diff --git a/src/client/views/nodes/LinkMenu.scss b/src/client/views/nodes/LinkMenu.scss
index 7e031b897..09a830c9e 100644
--- a/src/client/views/nodes/LinkMenu.scss
+++ b/src/client/views/nodes/LinkMenu.scss
@@ -1,84 +1,14 @@
 @import "../globalCssVariables";
 
-#linkMenu-container {
+.linkMenu {
     width: 100%;
     height: auto;
-    display: flex;
-    flex-direction: column;
 }
 
-#linkMenu-searchBar {
-    width: 100%;
-    padding: 5px;
-    margin-bottom: 10px;
-    font-size: 12px;
-    border: 1px solid #bababa;
-}
-
-#linkMenu-list {
-    margin-top: 5px;
-    width: 100%;
-    height: 100px;
+.linkMenu-list {
+    max-height: 200px;
     overflow-y: scroll;
 }
 
-.link-menu-group {
-    .link-menu-item {
-        border-top: 0.5px solid $light-color-secondary; 
-        padding: 6px;
-        position: relative;
-        display: flex;
-
-        .link-menu-item-content {
-            width: 100%;
-        }
 
-        &:last-child {
-            border-bottom: 0.5px solid $light-color-secondary;
-        }
-        &:hover .link-menu-item-buttons {
-            display: flex;
-        }
-        &:hover .link-menu-item-content {
-            width: calc(100% - 42px);
-        }
-    }
-    .link-menu-item-buttons {
-        display: none;
-        position: absolute;
-        top: 50%;
-        right: 0;
-        transform: translateY(-50%);
-
-        .button {
-            width: 20px;
-            height: 20px;
-            margin: 0;
-            margin-right: 6px;
-            border-radius: 50%;
-            cursor: pointer;
-            pointer-events: auto;
-            background-color: $dark-color;
-            color: $light-color;
-            font-size: 65%;
-            transition: transform 0.2s;
-            text-align: center;
-            position: relative;
-
-            .fa-icon {
-                position: absolute;
-                top: 50%;
-                left: 50%;
-                transform: translate(-50%, -50%);
-            }
-
-            &:last-child {
-                margin-right: 0;
-            }
-            &:hover {
-                background: $main-accent;
-            }
-        }
-    }
-}
 
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 47bd6c3eb..ebca54c92 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -6,12 +6,8 @@ import { LinkEditor } from "./LinkEditor";
 import './LinkMenu.scss';
 import React = require("react");
 import { Doc, DocListCast } from "../../../new_fields/Doc";
-import { Cast, FieldValue, StrCast } from "../../../new_fields/Types";
 import { Id } from "../../../new_fields/FieldSymbols";
 import { LinkManager, LinkUtils } from "../../util/LinkManager";
-import { number, string } from "prop-types";
-import { listSpec } from "../../../new_fields/Schema";
-import { Utils } from "../../../Utils";
 
 interface Props {
     docView: DocumentView;
@@ -23,57 +19,42 @@ export class LinkMenu extends React.Component<Props> {
 
     @observable private _editingLink?: Doc;
 
-    // renderLinkItems(links: Doc[], key: string, type: string) {
-    //     return links.map(link => {
-    //         let doc = FieldValue(Cast(link[key], Doc));
-    //         if (doc) {
-    //             return <LinkBox key={doc[Id]} linkDoc={link} linkName={StrCast(link.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={type} />;
-    //         }
-    //     });
-    // }
-
-    renderGroup(links: Doc[]) {
+    renderGroup = (group: Doc[]): Array<JSX.Element> => {
         let source = this.props.docView.Document;
-        return links.map(link => {
-            let destination = LinkUtils.findOppositeAnchor(link, source);
-            let doc = FieldValue(Cast(destination, Doc));
-            if (doc) {
-                return <LinkBox key={doc[Id] + source[Id]} linkDoc={link} linkName={StrCast(destination.title)} pairedDoc={doc} showEditor={action(() => this._editingLink = link)} type={""} />;
-            }
+        return group.map(linkDoc => {
+            let destination = LinkUtils.findOppositeAnchor(linkDoc, source);
+            return <LinkBox key={destination[Id] + source[Id]} linkDoc={linkDoc} sourceDoc={source} destinationDoc={destination} showEditor={action(() => this._editingLink = linkDoc)} />;
         });
     }
 
-    renderLinks = (links: Map<string, Array<Doc>>): Array<JSX.Element> => {
+    renderAllGroups = (groups: Map<string, Array<Doc>>): Array<JSX.Element> => {
         let linkItems: Array<JSX.Element> = [];
-
-        links.forEach((links, group) => {
+        groups.forEach((group, groupType) => {
             linkItems.push(
-                <div key={group} className="link-menu-group">
-                    <p className="link-menu-group-name">{group}:</p>
+                <div key={groupType} className="link-menu-group">
+                    <p className="link-menu-group-name">{groupType}:</p>
                     <div className="link-menu-group-wrapper">
-                        {this.renderGroup(links)}
+                        {this.renderGroup(group)}
                     </div>
                 </div>
-            )
+            );
         });
 
-        if (linkItems.length === 0) {
-            linkItems.push(<p key="">no links have been created yet</p>);
-        }
+        // source doc has no links
+        if (linkItems.length === 0) linkItems.push(<p key="">No links have been created yet. Drag the linking button onto another document to create a link.</p>);
 
         return linkItems;
     }
 
     render() {
-        let related: Map<string, Doc[]> = LinkManager.Instance.findRelatedGroupedLinks(this.props.docView.props.Document);
+        let sourceDoc = this.props.docView.props.Document;
+        let groups: Map<string, Doc[]> = LinkManager.Instance.findRelatedGroupedLinks(sourceDoc);
         if (this._editingLink === undefined) {
             return (
-                <div id="linkMenu-container">
+                <div className="linkMenu">
                     {/* <input id="linkMenu-searchBar" type="text" placeholder="Search..."></input> */}
-                    <div id="linkMenu-list">
-                        {/* {this.renderLinkItems(linkTo, "linkedTo", "Destination: ")}
-                        {this.renderLinkItems(linkFrom, "linkedFrom", "Source: ")} */}
-                        {this.renderLinks(related)}
+                    <div className="linkMenu-list">
+                        {this.renderAllGroups(groups)}
                     </div>
                 </div>
             );
@@ -82,6 +63,5 @@ export class LinkMenu extends React.Component<Props> {
                 <LinkEditor sourceDoc={this.props.docView.props.Document} linkDoc={this._editingLink} showLinks={action(() => this._editingLink = undefined)}></LinkEditor>
             );
         }
-
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2


From 05f0f145269fffc5dfada98a5f20bbc8e204bd28 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Fri, 14 Jun 2019 15:30:22 -0400
Subject: cleaned up more link code

---
 src/client/util/DocumentManager.ts  | 42 ++++---------------------------------
 src/client/util/DragManager.ts      | 17 ++++++---------
 src/client/views/nodes/LinkMenu.tsx |  4 ++--
 3 files changed, 12 insertions(+), 51 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 2acbb3ad4..6271220e4 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -9,7 +9,7 @@ import { CollectionView } from '../views/collections/CollectionView';
 import { CollectionPDFView } from '../views/collections/CollectionPDFView';
 import { CollectionVideoView } from '../views/collections/CollectionVideoView';
 import { Id } from '../../new_fields/FieldSymbols';
-import { LinkManager, LinkUtils } from './LinkManager';
+import { LinkManager } from './LinkManager';
 
 
 export class DocumentManager {
@@ -86,53 +86,19 @@ export class DocumentManager {
     public get LinkedDocumentViews() {
         let linked = DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false)).reduce((pairs, dv) => {
 
-
             let linksList = LinkManager.Instance.findAllRelatedLinks(dv.props.Document);
             if (linksList && linksList.length) {
                 pairs.push(...linksList.reduce((pairs, link) => {
                     if (link) {
-                        // let destination = (link["linkedTo"] === dv.props.Document) ? link["linkedFrom"] : link["linkedTo"];
-
-                        let destination = LinkUtils.findOppositeAnchor(link, dv.props.Document);
-                        let linkToDoc = FieldValue(Cast(destination, Doc));
-                        // let linkToDoc = FieldValue(Cast(link.linkedTo, Doc));
-                        if (linkToDoc) {
-                            DocumentManager.Instance.getDocumentViews(linkToDoc).map(docView1 =>
+                        let destination = LinkManager.Instance.findOppositeAnchor(link, dv.props.Document);
+                        if (destination) {
+                            DocumentManager.Instance.getDocumentViews(destination).map(docView1 =>
                                 pairs.push({ a: dv, b: docView1, l: link }));
                         }
                     }
                     return pairs;
                 }, [] as { a: DocumentView, b: DocumentView, l: Doc }[]));
             }
-
-            // let linksList = DocListCast(dv.props.Document.linkedToDocs);
-            // console.log("to links", linksList.length);
-            // if (linksList && linksList.length) {
-            //     pairs.push(...linksList.reduce((pairs, link) => {
-            //         if (link) {
-            //             let linkToDoc = FieldValue(Cast(link.linkedTo, Doc));
-            //             if (linkToDoc) {
-            //                 DocumentManager.Instance.getDocumentViews(linkToDoc).map(docView1 =>
-            //                     pairs.push({ a: dv, b: docView1, l: link }));
-            //             }
-            //         }
-            //         return pairs;
-            //     }, [] as { a: DocumentView, b: DocumentView, l: Doc }[]));
-            // }
-            // linksList = DocListCast(dv.props.Document.linkedFromDocs);
-            // console.log("from links", linksList.length);
-            // if (linksList && linksList.length) {
-            //     pairs.push(...linksList.reduce((pairs, link) => {
-            //         if (link) {
-            //             let linkFromDoc = FieldValue(Cast(link.linkedFrom, Doc));
-            //             if (linkFromDoc) {
-            //                 DocumentManager.Instance.getDocumentViews(linkFromDoc).map(docView1 =>
-            //                     pairs.push({ a: dv, b: docView1, l: link }));
-            //             }
-            //         }
-            //         return pairs;
-            //     }, pairs));
-            // }
             return pairs;
         }, [] as { a: DocumentView, b: DocumentView, l: Doc }[]);
         return linked;
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 9ac421fbf..b4acbcffa 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -4,7 +4,7 @@ import { Cast } from "../../new_fields/Types";
 import { emptyFunction } from "../../Utils";
 import { CollectionDockingView } from "../views/collections/CollectionDockingView";
 import * as globalCssVariables from "../views/globalCssVariables.scss";
-import { LinkManager, LinkUtils } from "./LinkManager";
+import { LinkManager } from "./LinkManager";
 
 export type dropActionType = "alias" | "copy" | undefined;
 export function SetupDrag(_reference: React.RefObject<HTMLElement>, docFunc: () => Doc | Promise<Doc>, moveFunc?: DragManager.MoveFunction, dropAction?: dropActionType) {
@@ -42,18 +42,13 @@ export function SetupDrag(_reference: React.RefObject<HTMLElement>, docFunc: ()
 export async function DragLinksAsDocuments(dragEle: HTMLElement, x: number, y: number, sourceDoc: Doc) {
     let srcTarg = sourceDoc.proto;
     let draggedDocs: Doc[] = [];
-    // let draggedFromDocs: Doc[] = [];
     if (srcTarg) {
-        // let linkToDocs = await DocListCastAsync(srcTarg.linkedToDocs);
-        // let linkFromDocs = await DocListCastAsync(srcTarg.linkedFromDocs);
         let linkDocs = LinkManager.Instance.findAllRelatedLinks(srcTarg);
-        if (linkDocs) draggedDocs = linkDocs.map(link => {
-            return LinkUtils.findOppositeAnchor(link, sourceDoc);
-        });
-
-
-        // if (linkToDocs) draggedDocs = linkToDocs.map(linkDoc => Cast(linkDoc.linkedTo, Doc) as Doc);
-        // if (linkFromDocs) draggedFromDocs = linkFromDocs.map(linkDoc => Cast(linkDoc.linkedFrom, Doc) as Doc);
+        if (linkDocs) {
+            draggedDocs = linkDocs.map(link => {
+                return LinkManager.Instance.findOppositeAnchor(link, sourceDoc);
+            });
+        }
     }
     // draggedDocs.push(...draggedFromDocs);
     if (draggedDocs.length) {
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index ebca54c92..2fcbd25fa 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -7,7 +7,7 @@ import './LinkMenu.scss';
 import React = require("react");
 import { Doc, DocListCast } from "../../../new_fields/Doc";
 import { Id } from "../../../new_fields/FieldSymbols";
-import { LinkManager, LinkUtils } from "../../util/LinkManager";
+import { LinkManager } from "../../util/LinkManager";
 
 interface Props {
     docView: DocumentView;
@@ -22,7 +22,7 @@ export class LinkMenu extends React.Component<Props> {
     renderGroup = (group: Doc[]): Array<JSX.Element> => {
         let source = this.props.docView.Document;
         return group.map(linkDoc => {
-            let destination = LinkUtils.findOppositeAnchor(linkDoc, source);
+            let destination = LinkManager.Instance.findOppositeAnchor(linkDoc, source);
             return <LinkBox key={destination[Id] + source[Id]} linkDoc={linkDoc} sourceDoc={source} destinationDoc={destination} showEditor={action(() => this._editingLink = linkDoc)} />;
         });
     }
-- 
cgit v1.2.3-70-g09d2


From 1afb8d18e0f63e7e9ab05ccf79f5f34533fdec05 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Fri, 14 Jun 2019 16:38:25 -0400
Subject: links can be expanded in menu to view metadata

---
 src/client/views/nodes/LinkBox.scss | 30 ++++++++++++++++------
 src/client/views/nodes/LinkBox.tsx  | 51 +++++++++++++++++++++++++++----------
 src/client/views/nodes/LinkMenu.tsx |  8 +++---
 3 files changed, 64 insertions(+), 25 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/views/nodes/LinkBox.scss b/src/client/views/nodes/LinkBox.scss
index 08fefaf4d..77462f611 100644
--- a/src/client/views/nodes/LinkBox.scss
+++ b/src/client/views/nodes/LinkBox.scss
@@ -1,29 +1,43 @@
 @import "../globalCssVariables";
-.link-menu-item {
-    border-top: 0.5px solid $light-color-secondary; 
+.linkMenu-item {
+    border-top: 0.5px solid $main-accent; 
     padding: 6px;
     position: relative;
     display: flex;
     font-size: 12px;
 
-    .link-menu-item-content {
+    .linkMenu-item-content {
         width: 100%;
     }
+    
+    .link-metadata {
+        margin-top: 6px;
+        padding: 3px;
+        border-top: 0.5px solid $light-color-secondary;
+        .link-metadata-row {
+            margin-left: 6px;
+        }
+    }
 
     &:last-child {
-        border-bottom: 0.5px solid $light-color-secondary;
+        border-bottom: 0.5px solid $main-accent;
     }
     &:hover {
-        .link-menu-item-buttons {
+        .linkMenu-item-buttons {
             display: flex;
         }
-        .link-menu-item-content {
-            width: calc(100% - 42px);
+        .linkMenu-item-content {
+            &.expand-two {
+                width: calc(100% - 46px);
+            }
+            &.expand-three {
+                width: calc(100% - 78px);
+            }
         }
     }
 }
 
-.link-menu-item-buttons {
+.linkMenu-item-buttons {
     display: none;
     position: absolute;
     top: 50%;
diff --git a/src/client/views/nodes/LinkBox.tsx b/src/client/views/nodes/LinkBox.tsx
index 1a7cce4a3..9fbe83126 100644
--- a/src/client/views/nodes/LinkBox.tsx
+++ b/src/client/views/nodes/LinkBox.tsx
@@ -1,5 +1,5 @@
 import { library } from '@fortawesome/fontawesome-svg-core';
-import { faEdit, faEye, faTimes, faArrowRight } from '@fortawesome/free-solid-svg-icons';
+import { faEdit, faEye, faTimes, faArrowRight, faChevronDown, faChevronUp } from '@fortawesome/free-solid-svg-icons';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { observer } from "mobx-react";
 import { DocumentManager } from "../../util/DocumentManager";
@@ -7,15 +7,14 @@ import { undoBatch } from "../../util/UndoManager";
 import './LinkBox.scss';
 import React = require("react");
 import { Doc } from '../../../new_fields/Doc';
-import { StrCast } from '../../../new_fields/Types';
+import { StrCast, Cast } from '../../../new_fields/Types';
+import { observable, action } from 'mobx';
+import { LinkManager } from '../../util/LinkManager';
+library.add(faEye, faEdit, faTimes, faArrowRight, faChevronDown, faChevronUp);
 
 
-library.add(faEye);
-library.add(faEdit);
-library.add(faTimes);
-library.add(faArrowRight);
-
 interface Props {
+    groupType: string;
     linkDoc: Doc;
     sourceDoc: Doc;
     destinationDoc: Doc;
@@ -24,6 +23,8 @@ interface Props {
 
 @observer
 export class LinkBox extends React.Component<Props> {
+    @observable private _showMore: boolean = false;
+    @action toggleShowMore() { this._showMore = !this._showMore; }
 
     @undoBatch
     onFollowLink = async (e: React.PointerEvent): Promise<void> => {
@@ -36,19 +37,43 @@ export class LinkBox extends React.Component<Props> {
         this.props.showEditor();
     }
 
+    renderMetadata = (): JSX.Element => {
+        let groups = LinkManager.Instance.getAnchorGroups(this.props.linkDoc, this.props.sourceDoc);
+        let index = groups.findIndex(groupDoc => StrCast(groupDoc.type).toUpperCase() === this.props.groupType.toUpperCase());
+        let groupDoc = index > -1 ? groups[index] : undefined;
+
+        let mdRows: Array<JSX.Element> = [];
+        if (groupDoc) {
+            let mdDoc = Cast(groupDoc.metadata, Doc, new Doc);
+            let keys = LinkManager.Instance.groupMetadataKeys.get(this.props.groupType);
+            mdRows = keys!.map(key => {
+                return (<div key={key} className="link-metadata-row"><b>{key}</b>: {StrCast(mdDoc[key])}</div>);
+            });
+        }
+
+        return (<div className="link-metadata">{mdRows}</div>);
+    }
+
     render() {
+
+        let keys = LinkManager.Instance.groupMetadataKeys.get(this.props.groupType);
+        let canExpand = keys ? keys.length > 0 : false;
+
         return (
-            <div className="link-menu-item">
-                <div className="link-menu-item-content">
+            <div className="linkMenu-item">
+                <div className={canExpand ? "linkMenu-item-content expand-three" : "linkMenu-item-content expand-two"}>
                     <div className="link-name">
                         <p>{StrCast(this.props.destinationDoc.title)}</p>
+                        <div className="linkMenu-item-buttons">
+                            {canExpand ? <div title="Show more" className="button" onPointerDown={() => this.toggleShowMore()}>
+                                <FontAwesomeIcon className="fa-icon" icon={this._showMore ? "chevron-up" : "chevron-down"} size="sm" /></div> : <></>}
+                            <div title="Edit link" className="button" onPointerDown={this.onEdit}><FontAwesomeIcon className="fa-icon" icon="edit" size="sm" /></div>
+                            <div title="Follow link" className="button" onPointerDown={this.onFollowLink}><FontAwesomeIcon className="fa-icon" icon="arrow-right" size="sm" /></div>
+                        </div>
                     </div>
+                    {this._showMore ? this.renderMetadata() : <></>}
                 </div>
 
-                <div className="link-menu-item-buttons">
-                    <div title="Edit link" className="button" onPointerDown={this.onEdit}><FontAwesomeIcon className="fa-icon" icon="edit" size="sm" /></div>
-                    <div title="Follow link" className="button" onPointerDown={this.onFollowLink}><FontAwesomeIcon className="fa-icon" icon="arrow-right" size="sm" /></div>
-                </div>
             </div>
         );
     }
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 2fcbd25fa..aef56df67 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -19,11 +19,11 @@ export class LinkMenu extends React.Component<Props> {
 
     @observable private _editingLink?: Doc;
 
-    renderGroup = (group: Doc[]): Array<JSX.Element> => {
+    renderGroup = (group: Doc[], groupType: string): Array<JSX.Element> => {
         let source = this.props.docView.Document;
         return group.map(linkDoc => {
             let destination = LinkManager.Instance.findOppositeAnchor(linkDoc, source);
-            return <LinkBox key={destination[Id] + source[Id]} linkDoc={linkDoc} sourceDoc={source} destinationDoc={destination} showEditor={action(() => this._editingLink = linkDoc)} />;
+            return <LinkBox key={destination[Id] + source[Id]} groupType={groupType} linkDoc={linkDoc} sourceDoc={source} destinationDoc={destination} showEditor={action(() => this._editingLink = linkDoc)} />;
         });
     }
 
@@ -34,13 +34,13 @@ export class LinkMenu extends React.Component<Props> {
                 <div key={groupType} className="link-menu-group">
                     <p className="link-menu-group-name">{groupType}:</p>
                     <div className="link-menu-group-wrapper">
-                        {this.renderGroup(group)}
+                        {this.renderGroup(group, groupType)}
                     </div>
                 </div>
             );
         });
 
-        // source doc has no links
+        // if source doc has no links push message
         if (linkItems.length === 0) linkItems.push(<p key="">No links have been created yet. Drag the linking button onto another document to create a link.</p>);
 
         return linkItems;
-- 
cgit v1.2.3-70-g09d2


From c5e401cb0a7fec2279ceecbc8d1429dcdd2f04b9 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Wed, 19 Jun 2019 22:27:21 -0400
Subject: buttons on cut links functional except for when dragged from link
 menu

---
 src/client/documents/Documents.ts                  |  47 +++++++--
 src/client/util/DragManager.ts                     |   7 ++
 src/client/util/LinkManager.ts                     |  15 ++-
 .../CollectionFreeFormLinkView.scss                |  59 ++++++++---
 .../CollectionFreeFormLinkView.tsx                 |   2 +-
 .../CollectionFreeFormLinkWithProxyView.tsx        | 109 +++++++++++++++++----
 .../CollectionFreeFormLinksView.tsx                |  42 +++++---
 src/client/views/nodes/DocumentContentsView.tsx    |   3 +-
 src/client/views/nodes/DocumentView.tsx            |  14 ++-
 src/client/views/nodes/FieldView.tsx               |   6 ++
 src/client/views/nodes/LinkBox.scss                |  76 --------------
 src/client/views/nodes/LinkBox.tsx                 | 107 --------------------
 src/client/views/nodes/LinkButtonBox.scss          |  18 ++++
 src/client/views/nodes/LinkButtonBox.tsx           |  63 ++++++++++++
 src/client/views/nodes/LinkMenu.tsx                |   4 +-
 src/client/views/nodes/LinkMenuItem.scss           |  76 ++++++++++++++
 src/client/views/nodes/LinkMenuItem.tsx            | 107 ++++++++++++++++++++
 src/new_fields/LinkButtonField.ts                  |  35 +++++++
 18 files changed, 548 insertions(+), 242 deletions(-)
 delete mode 100644 src/client/views/nodes/LinkBox.scss
 delete mode 100644 src/client/views/nodes/LinkBox.tsx
 create mode 100644 src/client/views/nodes/LinkButtonBox.scss
 create mode 100644 src/client/views/nodes/LinkButtonBox.tsx
 create mode 100644 src/client/views/nodes/LinkMenuItem.scss
 create mode 100644 src/client/views/nodes/LinkMenuItem.tsx
 create mode 100644 src/new_fields/LinkButtonField.ts

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 79ba433c8..4d4fa2645 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -26,7 +26,7 @@ import { OmitKeys } from "../../Utils";
 import { ImageField, VideoField, AudioField, PdfField, WebField } from "../../new_fields/URLField";
 import { HtmlField } from "../../new_fields/HtmlField";
 import { List } from "../../new_fields/List";
-import { Cast, NumCast } from "../../new_fields/Types";
+import { Cast, NumCast, StrCast } from "../../new_fields/Types";
 import { IconField } from "../../new_fields/IconField";
 import { listSpec } from "../../new_fields/Schema";
 import { DocServer } from "../DocServer";
@@ -36,6 +36,10 @@ import { DateField } from "../../new_fields/DateField";
 import { UndoManager } from "../util/UndoManager";
 import { RouteStore } from "../../server/RouteStore";
 import { LinkManager } from "../util/LinkManager";
+import { LinkButtonBox } from "../views/nodes/LinkButtonBox";
+import { LinkButtonField, LinkButtonData } from "../../new_fields/LinkButtonField";
+import { DocumentManager } from "../util/DocumentManager";
+import { Id } from "../../new_fields/FieldSymbols";
 var requestImageSize = require('request-image-size');
 var path = require('path');
 
@@ -102,14 +106,32 @@ export namespace DocUtils {
 
             linkDocProto.context = targetContext;
 
-            let proxy1 = Docs.TextDocument({ width: 300, height: 100, borderRounding: 0 });
-            let proxy1Proto = Doc.GetProto(proxy1);
-            let proxy2 = Docs.TextDocument({ width: 300, height: 100, borderRounding: 0 });
-            let proxy2Proto = Doc.GetProto(proxy2);
+            let sourceViews = DocumentManager.Instance.getDocumentViews(source);
+            let targetViews = DocumentManager.Instance.getDocumentViews(target);
+            sourceViews.forEach(sv => {
+                targetViews.forEach(tv => {
 
-            linkDocProto.proxy1 = proxy1; // src: 1 targ: 2
-            linkDocProto.proxy2 = proxy2; // src: 2 targ: 1
+                    // TODO: do only for when diff contexts
+                    let proxy1 = Docs.LinkButtonDocument(
+                        { sourceViewId: StrCast(sv.props.Document[Id]), targetViewId: StrCast(tv.props.Document[Id]) },
+                        { width: 200, height: 100, borderRounding: 0 });
+                    let proxy1Proto = Doc.GetProto(proxy1);
+                    proxy1Proto.sourceViewId = StrCast(sv.props.Document[Id]);
+                    proxy1Proto.targetViewId = StrCast(tv.props.Document[Id]);
+                    proxy1Proto.isLinkButton = true;
 
+                    let proxy2 = Docs.LinkButtonDocument(
+                        { sourceViewId: StrCast(tv.props.Document[Id]), targetViewId: StrCast(sv.props.Document[Id]) },
+                        { width: 200, height: 100, borderRounding: 0 });
+                    let proxy2Proto = Doc.GetProto(proxy2);
+                    proxy2Proto.sourceViewId = StrCast(tv.props.Document[Id]);
+                    proxy2Proto.targetViewId = StrCast(sv.props.Document[Id]);
+                    proxy2Proto.isLinkButton = true;
+
+                    LinkManager.Instance.linkProxies.push(proxy1);
+                    LinkManager.Instance.linkProxies.push(proxy2);
+                });
+            });
 
             LinkManager.Instance.allLinks.push(linkDoc);
 
@@ -131,6 +153,7 @@ export namespace Docs {
     let audioProto: Doc;
     let pdfProto: Doc;
     let iconProto: Doc;
+    let linkProto: Doc;
     const textProtoId = "textProto";
     const histoProtoId = "histoProto";
     const pdfProtoId = "pdfProto";
@@ -141,6 +164,7 @@ export namespace Docs {
     const videoProtoId = "videoProto";
     const audioProtoId = "audioProto";
     const iconProtoId = "iconProto";
+    const linkProtoId = "linkProto";
 
     export function initProtos(): Promise<void> {
         return DocServer.GetRefFields([textProtoId, histoProtoId, collProtoId, imageProtoId, webProtoId, kvpProtoId, videoProtoId, audioProtoId, pdfProtoId, iconProtoId]).then(fields => {
@@ -154,6 +178,7 @@ export namespace Docs {
             audioProto = fields[audioProtoId] as Doc || CreateAudioPrototype();
             pdfProto = fields[pdfProtoId] as Doc || CreatePdfPrototype();
             iconProto = fields[iconProtoId] as Doc || CreateIconPrototype();
+            linkProto = fields[linkProtoId] as Doc || CreateLinkPrototype();
         });
     }
 
@@ -186,6 +211,11 @@ export namespace Docs {
             { x: 0, y: 0, width: Number(MINIMIZED_ICON_SIZE), height: Number(MINIMIZED_ICON_SIZE) });
         return iconProto;
     }
+    function CreateLinkPrototype(): Doc {
+        let linkProto = setupPrototypeOptions(linkProtoId, "LINK_PROTO", LinkButtonBox.LayoutString(),
+            { x: 0, y: 0, width: 300 });
+        return linkProto;
+    }
     function CreateTextPrototype(): Doc {
         let textProto = setupPrototypeOptions(textProtoId, "TEXT_PROTO", FormattedTextBox.LayoutString(),
             { x: 0, y: 0, width: 300, backgroundColor: "#f1efeb" });
@@ -272,6 +302,9 @@ export namespace Docs {
     export function IconDocument(icon: string, options: DocumentOptions = {}) {
         return CreateInstance(iconProto, new IconField(icon), options);
     }
+    export function LinkButtonDocument(data: LinkButtonData, options: DocumentOptions = {}) {
+        return CreateInstance(linkProto, new LinkButtonField(data), options);
+    }
     export function PdfDocument(url: string, options: DocumentOptions = {}) {
         return CreateInstance(pdfProto, new PdfField(new URL(url)), options);
     }
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 4787ac40f..be00778e7 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -7,6 +7,8 @@ import * as globalCssVariables from "../views/globalCssVariables.scss";
 import { LinkManager } from "./LinkManager";
 import { URLField } from "../../new_fields/URLField";
 import { SelectionManager } from "./SelectionManager";
+import { Docs } from "../documents/Documents";
+import { DocumentManager } from "./DocumentManager";
 
 export type dropActionType = "alias" | "copy" | undefined;
 export function SetupDrag(_reference: React.RefObject<HTMLElement>, docFunc: () => Doc | Promise<Doc>, moveFunc?: DragManager.MoveFunction, dropAction?: dropActionType, options?: any, dontHideOnDrop?: boolean) {
@@ -223,6 +225,11 @@ export namespace DragManager {
         StartDrag([ele], dragData, downX, downY, options);
     }
 
+    export function StartLinkProxyDrag(ele: HTMLElement, dragData: DocumentDragData, downX: number, downY: number, options?: DragOptions) {
+        runInAction(() => StartDragFunctions.map(func => func()));
+        StartDrag([ele], dragData, downX, downY, options);
+    }
+
     export let AbortDrag: () => void = emptyFunction;
 
     function StartDrag(eles: HTMLElement[], dragData: { [id: string]: any }, downX: number, downY: number, options?: DragOptions, finishDrag?: (dropData: { [id: string]: any }) => void) {
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 23ba9d2e4..544f2edda 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -1,4 +1,4 @@
-import { observable } from "mobx";
+import { observable, action } from "mobx";
 import { StrCast, Cast } from "../../new_fields/Types";
 import { Doc, DocListCast } from "../../new_fields/Doc";
 import { listSpec } from "../../new_fields/Schema";
@@ -32,6 +32,7 @@ export class LinkManager {
     @observable public allLinks: Array<Doc> = []; // list of link docs
     @observable public groupMetadataKeys: Map<string, Array<string>> = new Map();
     // map of group type to list of its metadata keys; serves as a dictionary of groups to what kind of metadata it hodls
+    @observable public linkProxies: Array<Doc> = []; // list of linkbutton docs - used to visualize link when an anchors are not in the same context
 
     // finds all links that contain the given anchor
     public findAllRelatedLinks(anchor: Doc): Array<Doc> {
@@ -134,4 +135,16 @@ export class LinkManager {
         }
     }
 
+    @action
+    public addLinkProxy(proxy: Doc) {
+        LinkManager.Instance.linkProxies.push(proxy);
+    }
+
+    public findLinkProxy(sourceViewId: string, targetViewId: string): Doc | undefined {
+        let index = LinkManager.Instance.linkProxies.findIndex(p => {
+            return StrCast(p.sourceViewId) === sourceViewId && StrCast(p.targetViewId) === targetViewId;
+        });
+        return index > -1 ? LinkManager.Instance.linkProxies[index] : undefined;
+    }
+
 }
\ No newline at end of file
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.scss b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.scss
index fc5212edd..d8d518147 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.scss
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.scss
@@ -1,19 +1,50 @@
-.collectionfreeformlinkview-linkLine {
-    stroke: black;
+// .collectionfreeformlinkview-linkLine {
+//     stroke: black;
+//     transform: translate(10000px,10000px);
+//     opacity: 0.5;
+//     pointer-events: all;
+// }
+// .collectionfreeformlinkview-linkCircle {
+//     stroke: rgb(0,0,0);
+//     opacity: 0.5;
+//     transform: translate(10000px,10000px);
+//     pointer-events: all;
+//     cursor: pointer;
+// }
+// .collectionfreeformlinkview-linkText {
+//     stroke: rgb(0,0,0);
+//     opacity: 0.5;
+//     transform: translate(10000px,10000px);
+//     pointer-events: all;
+// }
+
+.linkview-ele {
     transform: translate(10000px,10000px);
-    opacity: 0.5;
     pointer-events: all;
+
+    &.linkview-line {
+        stroke: black;
+        stroke-width: 2px;
+        opacity: 0.5;
+    }
 }
-.collectionfreeformlinkview-linkCircle {
-    stroke: rgb(0,0,0);
-    opacity: 0.5;
-    transform: translate(10000px,10000px);
-    pointer-events: all;
+
+.linkview-button {
+    width: 200px;
+    height: 100px;
+    border-radius: 5px;
+    padding: 10px;
+    position: relative;
+    background-color: black;
     cursor: pointer;
-}
-.collectionfreeformlinkview-linkText {
-    stroke: rgb(0,0,0);
-    opacity: 0.5;
-    transform: translate(10000px,10000px);
-    pointer-events: all;
+
+    p {
+        width: calc(100% - 20px);
+        color: white;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+    }
+
 }
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
index f995a35e3..13b5dc575 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
@@ -57,7 +57,7 @@ export class CollectionFreeFormLinkView extends React.Component<CollectionFreeFo
 
         return (
             <>
-                <line className="collectionfreeformlinkview-linkLine"
+                <line className="linkview-line linkview-ele"
                     style={{ strokeWidth: `${2 * 1 / 2}` }}
                     x1={`${x1}`} y1={`${y1}`}
                     x2={`${x2}`} y2={`${y2}`} />
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkWithProxyView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkWithProxyView.tsx
index 81a00ba95..a4d122af2 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkWithProxyView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkWithProxyView.tsx
@@ -7,13 +7,17 @@ import React = require("react");
 import v5 = require("uuid/v5");
 import { DocumentView } from "../../nodes/DocumentView";
 import { Docs } from "../../../documents/Documents";
-import { observable } from "mobx";
+import { observable, action } from "mobx";
+import { CollectionDockingView } from "../CollectionDockingView";
+import { dropActionType, DragManager } from "../../../util/DragManager";
+import { emptyFunction } from "../../../../Utils";
+import { DocumentManager } from "../../../util/DocumentManager";
 
 export interface CollectionFreeFormLinkViewProps {
     sourceView: DocumentView;
     targetView: DocumentView;
     proxyDoc: Doc;
-    addDocTab: (document: Doc, where: string) => void;
+    // addDocTab: (document: Doc, where: string) => void;
 }
 
 @observer
@@ -21,37 +25,104 @@ export class CollectionFreeFormLinkWithProxyView extends React.Component<Collect
 
     // @observable private _proxyX: number = NumCast(this.props.proxyDoc.x);
     // @observable private _proxyY: number = NumCast(this.props.proxyDoc.y);
+    private _ref = React.createRef<HTMLDivElement>();
+    private _downX: number = 0;
+    private _downY: number = 0;
+    @observable _x: number = 0;
+    @observable _y: number = 0;
+    // @observable private _proxyDoc: Doc = Docs.TextDocument(); // used for positioning
+
+    @action
+    componentDidMount() {
+        let a2 = this.props.proxyDoc;
+        this._x = NumCast(a2.x) + (BoolCast(a2.isMinimized, false) ? 5 : NumCast(a2.width) / NumCast(a2.zoomBasis, 1) / 2);
+        this._y = NumCast(a2.y) + (BoolCast(a2.isMinimized, false) ? 5 : NumCast(a2.height) / NumCast(a2.zoomBasis, 1) / 2);
+    }
+
 
     followButton = (e: React.PointerEvent): void => {
-        // TODO: would be nicer to open docview in context
         e.stopPropagation();
-        console.log("follow");
-        this.props.addDocTab(this.props.targetView.props.Document, "onRight");
+        let open = this.props.targetView.props.ContainingCollectionView ? this.props.targetView.props.ContainingCollectionView.props.Document : this.props.targetView.props.Document;
+        CollectionDockingView.Instance.AddRightSplit(open);
+        DocumentManager.Instance.jumpToDocument(this.props.targetView.props.Document, e.altKey);
+    }
+
+    @action
+    setPosition(x: number, y: number) {
+        this._x = x;
+        this._y = y;
+    }
+
+    startDragging(x: number, y: number) {
+        if (this._ref.current) {
+            let dragData = new DragManager.DocumentDragData([this.props.proxyDoc]);
+
+            DragManager.StartLinkProxyDrag(this._ref.current, dragData, x, y, {
+                handlers: {
+                    dragComplete: action(() => {
+                        let a2 = this.props.proxyDoc;
+                        let offset = NumCast(a2.width) / NumCast(a2.zoomBasis, 1) / 2;
+                        let x = NumCast(a2.x);// + NumCast(a2.width) / NumCast(a2.zoomBasis, 1) / 2;
+                        let y = NumCast(a2.y);// + NumCast(a2.height) / NumCast(a2.zoomBasis, 1) / 2;
+                        this.setPosition(x, y);
+
+                        // this is a hack :'( theres prob a better way to make the input doc not render
+                        let views = DocumentManager.Instance.getDocumentViews(this.props.proxyDoc);
+                        views.forEach(dv => {
+                            dv.props.removeDocument && dv.props.removeDocument(dv.props.Document);
+                        });
+                    }),
+                },
+                hideSource: true //?
+            });
+        }
+    }
+
+    onPointerDown = (e: React.PointerEvent): void => {
+        this._downX = e.clientX;
+        this._downY = e.clientY;
+
+        e.stopPropagation();
+        document.removeEventListener("pointermove", this.onPointerMove);
+        document.addEventListener("pointermove", this.onPointerMove);
+        document.removeEventListener("pointerup", this.onPointerUp);
+        document.addEventListener("pointerup", this.onPointerUp);
+    }
+
+    onPointerMove = (e: PointerEvent): void => {
+        if (Math.abs(this._downX - e.clientX) > 3 || Math.abs(this._downY - e.clientY) > 3) {
+            document.removeEventListener("pointermove", this.onPointerMove);
+            document.removeEventListener("pointerup", this.onPointerUp);
+            this.startDragging(this._downX, this._downY);
+        }
+        e.stopPropagation();
+        e.preventDefault();
+    }
+    onPointerUp = (e: PointerEvent): void => {
+        document.removeEventListener("pointermove", this.onPointerMove);
+        document.removeEventListener("pointerup", this.onPointerUp);
     }
 
     render() {
         let a1 = this.props.sourceView;
-        let a2 = this.props.proxyDoc;
         let x1 = NumCast(a1.Document.x) + (BoolCast(a1.Document.isMinimized, false) ? 5 : NumCast(a1.Document.width) / NumCast(a1.Document.zoomBasis, 1) / 2);
         let y1 = NumCast(a1.Document.y) + (BoolCast(a1.Document.isMinimized, false) ? 5 : NumCast(a1.Document.height) / NumCast(a1.Document.zoomBasis, 1) / 2);
 
-        let x2 = NumCast(a2.x) + (BoolCast(a2.isMinimized, false) ? 5 : NumCast(a2.width) / NumCast(a2.zoomBasis, 1) / 2);
-        let y2 = NumCast(a2.y) + (BoolCast(a2.isMinimized, false) ? 5 : NumCast(a2.height) / NumCast(a2.zoomBasis, 1) / 2);
-
-        // let containing = "";
-        // if (this.props.targetView.props.ContainingCollectionView) {
-        //     containing = StrCast(this.props.targetView.props.ContainingCollectionView.props.Document.title);
-        // }
+        let context = this.props.targetView.props.ContainingCollectionView ?
+            (" in the context of " + StrCast(this.props.targetView.props.ContainingCollectionView.props.Document.title)) : "";
+        let text = "link to " + StrCast(this.props.targetView.props.Document.title) + context;
 
-        // let text = "link to " + StrCast(this.props.targetView.props.Document.title) + (containing === "" ? "" : (" in the context of " + containing));
         return (
             <>
-                <line className="collectionfreeformlinkview-linkLine"
-                    style={{ strokeWidth: `${2 * 1 / 2}` }}
+                <line className="linkview-line linkview-ele"
+                    // style={{ strokeWidth: `${2 * 1 / 2}` }}
                     x1={`${x1}`} y1={`${y1}`}
-                    x2={`${x2}`} y2={`${y2}`} />
-                {/* <circle className="collectionfreeformlinkview-linkCircle" cx={x2} cy={y2} r={20} ></circle>
-                <text textAnchor="middle" className="collectionfreeformlinkview-linkText" x={`${x2}`} y={`${y2}`}> {text}</text> */}
+                    x2={`${this._x}`} y2={`${this._y}`} />
+                <foreignObject className="linkview-button-wrapper linkview-ele" width={200} height={100} x={this._x - 100} y={this._y - 50}>
+                    <div className="linkview-button" onPointerDown={this.onPointerDown} onPointerUp={this.followButton} ref={this._ref}>
+                        <p>{text}</p>
+                    </div>
+                </foreignObject>
             </>
         );
     }
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
index eaef1f32a..bde68001b 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
@@ -1,4 +1,4 @@
-import { computed, IReactionDisposer, reaction } from "mobx";
+import { computed, IReactionDisposer, reaction, action } from "mobx";
 import { observer } from "mobx-react";
 import { Doc, DocListCast } from "../../../../new_fields/Doc";
 import { Id } from "../../../../new_fields/FieldSymbols";
@@ -13,6 +13,8 @@ import { CollectionFreeFormLinkView } from "./CollectionFreeFormLinkView";
 import React = require("react");
 import { CollectionFreeFormLinkWithProxyView } from "./CollectionFreeFormLinkWithProxyView";
 import { Docs } from "../../../documents/Documents";
+import { LinkButtonField } from "../../../../new_fields/LinkButtonField";
+import { LinkManager } from "../../../util/LinkManager";
 
 @observer
 export class CollectionFreeFormLinksView extends React.Component<CollectionViewProps> {
@@ -195,18 +197,32 @@ export class CollectionFreeFormLinksView extends React.Component<CollectionViewP
                 if (sameContext) {
                     uniqueList.push(<CollectionFreeFormLinkView key={key} sourceView={u.sourceView} targetView={u.targetView} />);
                 } else {
-                    let proxyKey = Doc.AreProtosEqual(u.sourceView.Document, Cast(u.linkDoc.anchor1, Doc, new Doc)) ? "proxy1" : "proxy2";
-                    let proxy = Cast(u.linkDoc[proxyKey], Doc, new Doc);
-
-                    let context = u.targetView.props.ContainingCollectionView ? (" in the context of " + StrCast(u.targetView.props.ContainingCollectionView.props.Document.title)) : "";
-                    let text = proxyKey + " link to " + StrCast(u.targetView.props.Document.title) + context;
-
-                    let proxyProto = Doc.GetProto(proxy);
-                    proxyProto.data = text;
-
-                    this.props.addDocument(proxy, false);
-                    uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView}
-                        proxyDoc={proxy} addDocTab={this.props.addDocTab} />);
+                    let proxy = LinkManager.Instance.findLinkProxy(StrCast(u.sourceView.props.Document[Id]), StrCast(u.targetView.props.Document[Id]));
+                    if (!proxy) {
+                        proxy = Docs.LinkButtonDocument(
+                            { sourceViewId: StrCast(u.sourceView.props.Document[Id]), targetViewId: StrCast(u.targetView.props.Document[Id]) },
+                            { width: 200, height: 100, borderRounding: 0 });
+                        let proxy1Proto = Doc.GetProto(proxy);
+                        proxy1Proto.sourceViewId = StrCast(u.sourceView.props.Document[Id]);
+                        proxy1Proto.targetViewId = StrCast(u.targetView.props.Document[Id]);
+                        proxy1Proto.isLinkButton = true;
+
+                        // LinkManager.Instance.linkProxies.push(proxy);
+                        LinkManager.Instance.addLinkProxy(proxy);
+                    }
+                    uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView} proxyDoc={proxy} />);
+
+                    // let proxy = LinkManager.Instance.findLinkProxy(StrCast(u.sourceView.props.Document[Id]), StrCast(u.targetView.props.Document[Id]));
+                    // if (proxy) {
+                    //     this.props.addDocument(proxy, false);
+                    //     uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView} />);
+                    // }
+                    // let proxyKey = Doc.AreProtosEqual(u.sourceView.Document, Cast(u.linkDoc.anchor1, Doc, new Doc)) ? "proxy1" : "proxy2";
+                    // let proxy = Cast(u.linkDoc[proxyKey], Doc, new Doc);
+                    // this.props.addDocument(proxy, false);
+
+                    // uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView}
+                    //     proxyDoc={proxy} addDocTab={this.props.addDocTab} />);
                 }
             }
         });
diff --git a/src/client/views/nodes/DocumentContentsView.tsx b/src/client/views/nodes/DocumentContentsView.tsx
index 02396c3af..940b00a90 100644
--- a/src/client/views/nodes/DocumentContentsView.tsx
+++ b/src/client/views/nodes/DocumentContentsView.tsx
@@ -12,6 +12,7 @@ import "./DocumentView.scss";
 import { FormattedTextBox } from "./FormattedTextBox";
 import { ImageBox } from "./ImageBox";
 import { IconBox } from "./IconBox";
+import { LinkButtonBox } from "./LinkButtonBox";
 import { KeyValueBox } from "./KeyValueBox";
 import { PDFBox } from "./PDFBox";
 import { VideoBox } from "./VideoBox";
@@ -103,7 +104,7 @@ export class DocumentContentsView extends React.Component<DocumentViewProps & {
     render() {
         if (!this.layout && (this.props.layoutKey !== "overlayLayout" || !this.templates.length)) return (null);
         return <ObserverJsxParser
-            components={{ FormattedTextBox, ImageBox, IconBox, FieldView, CollectionFreeFormView, CollectionDockingView, CollectionSchemaView, CollectionView, CollectionPDFView, CollectionVideoView, WebBox, KeyValueBox, PDFBox, VideoBox, AudioBox, HistogramBox }}
+            components={{ FormattedTextBox, ImageBox, IconBox, FieldView, CollectionFreeFormView, CollectionDockingView, CollectionSchemaView, CollectionView, CollectionPDFView, CollectionVideoView, WebBox, KeyValueBox, PDFBox, VideoBox, AudioBox, HistogramBox, LinkButtonBox }}
             bindings={this.CreateBindings()}
             jsx={this.finalLayout}
             showWarnings={true}
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index e98392a18..c424384a4 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -462,6 +462,17 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
         var scaling = this.props.ContentScaling();
         var nativeHeight = this.nativeHeight > 0 ? `${this.nativeHeight}px` : "100%";
         var nativeWidth = this.nativeWidth > 0 ? `${this.nativeWidth}px` : "100%";
+
+        // // for linkbutton docs
+        // let isLinkButton = BoolCast(this.props.Document.isLinkButton);
+        // let activeDvs = DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false));
+        // let display = isLinkButton ? activeDvs.reduce((found, dv) => {
+        //     let matchSv = this.props.Document.sourceViewId === StrCast(dv.props.Document[Id]);
+        //     let matchTv = this.props.Document.targetViewId === StrCast(dv.props.Document[Id]);
+        //     let match = matchSv || matchTv;
+        //     return match || found;
+        // }, false) : true;
+
         return (
             <div className={`documentView-node${this.props.isTopMost ? "-topmost" : ""}`}
                 ref={this._mainCont}
@@ -476,7 +487,8 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
                     background: this.Document.backgroundColor || "",
                     width: nativeWidth,
                     height: nativeHeight,
-                    transform: `scale(${scaling}, ${scaling})`
+                    transform: `scale(${scaling}, ${scaling})`,
+                    // display: display ? "block" : "none"
                 }}
                 onDrop={this.onDrop} onContextMenu={this.onContextMenu} onPointerDown={this.onPointerDown} onClick={this.onClick}
 
diff --git a/src/client/views/nodes/FieldView.tsx b/src/client/views/nodes/FieldView.tsx
index 5a83de8e3..6fecb34d7 100644
--- a/src/client/views/nodes/FieldView.tsx
+++ b/src/client/views/nodes/FieldView.tsx
@@ -18,6 +18,8 @@ import { FormattedTextBox } from "./FormattedTextBox";
 import { IconBox } from "./IconBox";
 import { ImageBox } from "./ImageBox";
 import { VideoBox } from "./VideoBox";
+import { LinkButtonBox } from "./LinkButtonBox";
+import { LinkButtonField } from "../../../new_fields/LinkButtonField";
 
 
 //
@@ -49,6 +51,7 @@ export interface FieldViewProps {
 @observer
 export class FieldView extends React.Component<FieldViewProps> {
     public static LayoutString(fieldType: { name: string }, fieldStr: string = "data") {
+        console.log("LAYOUT STRING", fieldType.name, fieldStr);
         return `<${fieldType.name} {...props} fieldKey={"${fieldStr}"} />`;
     }
 
@@ -74,6 +77,9 @@ export class FieldView extends React.Component<FieldViewProps> {
         else if (field instanceof IconField) {
             return <IconBox {...this.props} />;
         }
+        else if (field instanceof LinkButtonField) {
+            return <LinkButtonBox {...this.props} />;
+        }
         else if (field instanceof VideoField) {
             return <VideoBox {...this.props} />;
         }
diff --git a/src/client/views/nodes/LinkBox.scss b/src/client/views/nodes/LinkBox.scss
deleted file mode 100644
index 77462f611..000000000
--- a/src/client/views/nodes/LinkBox.scss
+++ /dev/null
@@ -1,76 +0,0 @@
-@import "../globalCssVariables";
-.linkMenu-item {
-    border-top: 0.5px solid $main-accent; 
-    padding: 6px;
-    position: relative;
-    display: flex;
-    font-size: 12px;
-
-    .linkMenu-item-content {
-        width: 100%;
-    }
-    
-    .link-metadata {
-        margin-top: 6px;
-        padding: 3px;
-        border-top: 0.5px solid $light-color-secondary;
-        .link-metadata-row {
-            margin-left: 6px;
-        }
-    }
-
-    &:last-child {
-        border-bottom: 0.5px solid $main-accent;
-    }
-    &:hover {
-        .linkMenu-item-buttons {
-            display: flex;
-        }
-        .linkMenu-item-content {
-            &.expand-two {
-                width: calc(100% - 46px);
-            }
-            &.expand-three {
-                width: calc(100% - 78px);
-            }
-        }
-    }
-}
-
-.linkMenu-item-buttons {
-    display: none;
-    position: absolute;
-    top: 50%;
-    right: 0;
-    transform: translateY(-50%);
-
-    .button {
-        width: 20px;
-        height: 20px;
-        margin: 0;
-        margin-right: 6px;
-        border-radius: 50%;
-        cursor: pointer;
-        pointer-events: auto;
-        background-color: $dark-color;
-        color: $light-color;
-        font-size: 65%;
-        transition: transform 0.2s;
-        text-align: center;
-        position: relative;
-
-        .fa-icon {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%, -50%);
-        }
-
-        &:last-child {
-            margin-right: 0;
-        }
-        &:hover {
-            background: $main-accent;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkBox.tsx b/src/client/views/nodes/LinkBox.tsx
deleted file mode 100644
index 8d07547ed..000000000
--- a/src/client/views/nodes/LinkBox.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-import { library } from '@fortawesome/fontawesome-svg-core';
-import { faEdit, faEye, faTimes, faArrowRight, faChevronDown, faChevronUp } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { observer } from "mobx-react";
-import { DocumentManager } from "../../util/DocumentManager";
-import { undoBatch } from "../../util/UndoManager";
-import './LinkBox.scss';
-import React = require("react");
-import { Doc } from '../../../new_fields/Doc';
-import { StrCast, Cast } from '../../../new_fields/Types';
-import { observable, action } from 'mobx';
-import { LinkManager } from '../../util/LinkManager';
-import { DragLinksAsDocuments, DragLinkAsDocument } from '../../util/DragManager';
-import { SelectionManager } from '../../util/SelectionManager';
-library.add(faEye, faEdit, faTimes, faArrowRight, faChevronDown, faChevronUp);
-
-
-interface Props {
-    groupType: string;
-    linkDoc: Doc;
-    sourceDoc: Doc;
-    destinationDoc: Doc;
-    showEditor: () => void;
-}
-
-@observer
-export class LinkBox extends React.Component<Props> {
-    private _drag = React.createRef<HTMLDivElement>();
-    @observable private _showMore: boolean = false;
-    @action toggleShowMore() { this._showMore = !this._showMore; }
-
-    @undoBatch
-    onFollowLink = async (e: React.PointerEvent): Promise<void> => {
-        e.stopPropagation();
-        DocumentManager.Instance.jumpToDocument(this.props.destinationDoc, e.altKey);
-    }
-
-    onEdit = (e: React.PointerEvent): void => {
-        e.stopPropagation();
-        this.props.showEditor();
-    }
-
-    renderMetadata = (): JSX.Element => {
-        let groups = LinkManager.Instance.getAnchorGroups(this.props.linkDoc, this.props.sourceDoc);
-        let index = groups.findIndex(groupDoc => StrCast(groupDoc.type).toUpperCase() === this.props.groupType.toUpperCase());
-        let groupDoc = index > -1 ? groups[index] : undefined;
-
-        let mdRows: Array<JSX.Element> = [];
-        if (groupDoc) {
-            let mdDoc = Cast(groupDoc.metadata, Doc, new Doc);
-            let keys = LinkManager.Instance.groupMetadataKeys.get(this.props.groupType);
-            mdRows = keys!.map(key => {
-                return (<div key={key} className="link-metadata-row"><b>{key}</b>: {StrCast(mdDoc[key])}</div>);
-            });
-        }
-
-        return (<div className="link-metadata">{mdRows}</div>);
-    }
-
-    onLinkButtonDown = (e: React.PointerEvent): void => {
-        e.stopPropagation();
-        document.removeEventListener("pointermove", this.onLinkButtonMoved);
-        document.addEventListener("pointermove", this.onLinkButtonMoved);
-        document.removeEventListener("pointerup", this.onLinkButtonUp);
-        document.addEventListener("pointerup", this.onLinkButtonUp);
-    }
-
-    onLinkButtonUp = (e: PointerEvent): void => {
-        document.removeEventListener("pointermove", this.onLinkButtonMoved);
-        document.removeEventListener("pointerup", this.onLinkButtonUp);
-        e.stopPropagation();
-    }
-
-    onLinkButtonMoved = async (e: PointerEvent) => {
-        if (this._drag.current !== null && (e.movementX > 1 || e.movementY > 1)) {
-            document.removeEventListener("pointermove", this.onLinkButtonMoved);
-            document.removeEventListener("pointerup", this.onLinkButtonUp);
-
-            DragLinkAsDocument(this._drag.current, e.x, e.y, this.props.linkDoc, this.props.sourceDoc);
-        }
-        e.stopPropagation();
-    }
-
-    render() {
-
-        let keys = LinkManager.Instance.groupMetadataKeys.get(this.props.groupType);
-        let canExpand = keys ? keys.length > 0 : false;
-
-        return (
-            <div className="linkMenu-item">
-                <div className={canExpand ? "linkMenu-item-content expand-three" : "linkMenu-item-content expand-two"}>
-                    <div className="link-name">
-                        <p>{StrCast(this.props.destinationDoc.title)}</p>
-                        <div className="linkMenu-item-buttons">
-                            {canExpand ? <div title="Show more" className="button" onPointerDown={() => this.toggleShowMore()}>
-                                <FontAwesomeIcon className="fa-icon" icon={this._showMore ? "chevron-up" : "chevron-down"} size="sm" /></div> : <></>}
-                            <div title="Edit link" className="button" onPointerDown={this.onEdit}><FontAwesomeIcon className="fa-icon" icon="edit" size="sm" /></div>
-                            <div title="Follow link" className="button" ref={this._drag} onPointerDown={this.onLinkButtonDown} onPointerUp={this.onFollowLink}><FontAwesomeIcon className="fa-icon" icon="arrow-right" size="sm" /></div>
-                        </div>
-                    </div>
-                    {this._showMore ? this.renderMetadata() : <></>}
-                </div>
-
-            </div >
-        );
-    }
-}
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkButtonBox.scss b/src/client/views/nodes/LinkButtonBox.scss
new file mode 100644
index 000000000..24bfd2c9f
--- /dev/null
+++ b/src/client/views/nodes/LinkButtonBox.scss
@@ -0,0 +1,18 @@
+.linkBox-cont {
+    width: 200px;
+    height: 100px;
+    background-color: black;
+    text-align: center;
+    color: white;
+    padding: 10px;
+    border-radius: 5px;
+    position: relative;
+
+    .linkBox-cont-wrapper {
+        width: calc(100% - 20px);
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+    }
+}
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkButtonBox.tsx b/src/client/views/nodes/LinkButtonBox.tsx
new file mode 100644
index 000000000..8a7c1ed8b
--- /dev/null
+++ b/src/client/views/nodes/LinkButtonBox.tsx
@@ -0,0 +1,63 @@
+import React = require("react");
+import { library } from '@fortawesome/fontawesome-svg-core';
+import { faCaretUp, faFilePdf, faFilm, faImage, faObjectGroup, faStickyNote } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { computed, observable, runInAction } from "mobx";
+import { observer } from "mobx-react";
+import { FieldView, FieldViewProps } from './FieldView';
+import "./LinkButtonBox.scss";
+import { DocumentView } from "./DocumentView";
+import { Doc } from "../../../new_fields/Doc";
+import { LinkButtonField } from "../../../new_fields/LinkButtonField";
+import { Cast, StrCast, BoolCast } from "../../../new_fields/Types";
+import { CollectionDockingView } from "../collections/CollectionDockingView";
+import { DocumentManager } from "../../util/DocumentManager";
+import { Id } from "../../../new_fields/FieldSymbols";
+
+library.add(faCaretUp);
+library.add(faObjectGroup);
+library.add(faStickyNote);
+library.add(faFilePdf);
+library.add(faFilm);
+
+@observer
+export class LinkButtonBox extends React.Component<FieldViewProps> {
+    public static LayoutString() { return FieldView.LayoutString(LinkButtonBox); }
+
+    followLink = (): void => {
+        console.log("follow link???");
+        let field = Cast(this.props.Document[this.props.fieldKey], LinkButtonField, new LinkButtonField({ sourceViewId: "-1", targetViewId: "-1" }));
+        let targetView = DocumentManager.Instance.getDocumentViewById(field.data.targetViewId);
+        if (targetView && targetView.props.ContainingCollectionView) {
+            CollectionDockingView.Instance.AddRightSplit(targetView.props.ContainingCollectionView.props.Document);
+        }
+    }
+
+    render() {
+
+        let field = Cast(this.props.Document[this.props.fieldKey], LinkButtonField, new LinkButtonField({ sourceViewId: "-1", targetViewId: "-1" }));
+        let targetView = DocumentManager.Instance.getDocumentViewById(field.data.targetViewId);
+
+        let text = "Could not find link";
+        if (targetView) {
+            let context = targetView.props.ContainingCollectionView ? (" in the context of " + StrCast(targetView.props.ContainingCollectionView.props.Document.title)) : "";
+            text = "Link to " + StrCast(targetView.props.Document.title) + context;
+        }
+
+        let activeDvs = DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false));
+        let display = activeDvs.reduce((found, dv) => {
+            let matchSv = field.data.sourceViewId === StrCast(dv.props.Document[Id]);
+            let matchTv = field.data.targetViewId === StrCast(dv.props.Document[Id]);
+            let match = matchSv || matchTv;
+            return match || found;
+        }, false);
+
+        return (
+            <div className="linkBox-cont" style={{ display: display ? "block" : "none" }}>
+                <div className="linkBox-cont-wrapper">
+                    <p>{text}</p>
+                </div>
+            </div >
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index aef56df67..7e4c15312 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -1,7 +1,7 @@
 import { action, observable } from "mobx";
 import { observer } from "mobx-react";
 import { DocumentView } from "./DocumentView";
-import { LinkBox } from "./LinkBox";
+import { LinkMenuItem } from "./LinkMenuItem";
 import { LinkEditor } from "./LinkEditor";
 import './LinkMenu.scss';
 import React = require("react");
@@ -23,7 +23,7 @@ export class LinkMenu extends React.Component<Props> {
         let source = this.props.docView.Document;
         return group.map(linkDoc => {
             let destination = LinkManager.Instance.findOppositeAnchor(linkDoc, source);
-            return <LinkBox key={destination[Id] + source[Id]} groupType={groupType} linkDoc={linkDoc} sourceDoc={source} destinationDoc={destination} showEditor={action(() => this._editingLink = linkDoc)} />;
+            return <LinkMenuItem key={destination[Id] + source[Id]} groupType={groupType} linkDoc={linkDoc} sourceDoc={source} destinationDoc={destination} showEditor={action(() => this._editingLink = linkDoc)} />;
         });
     }
 
diff --git a/src/client/views/nodes/LinkMenuItem.scss b/src/client/views/nodes/LinkMenuItem.scss
new file mode 100644
index 000000000..77462f611
--- /dev/null
+++ b/src/client/views/nodes/LinkMenuItem.scss
@@ -0,0 +1,76 @@
+@import "../globalCssVariables";
+.linkMenu-item {
+    border-top: 0.5px solid $main-accent; 
+    padding: 6px;
+    position: relative;
+    display: flex;
+    font-size: 12px;
+
+    .linkMenu-item-content {
+        width: 100%;
+    }
+    
+    .link-metadata {
+        margin-top: 6px;
+        padding: 3px;
+        border-top: 0.5px solid $light-color-secondary;
+        .link-metadata-row {
+            margin-left: 6px;
+        }
+    }
+
+    &:last-child {
+        border-bottom: 0.5px solid $main-accent;
+    }
+    &:hover {
+        .linkMenu-item-buttons {
+            display: flex;
+        }
+        .linkMenu-item-content {
+            &.expand-two {
+                width: calc(100% - 46px);
+            }
+            &.expand-three {
+                width: calc(100% - 78px);
+            }
+        }
+    }
+}
+
+.linkMenu-item-buttons {
+    display: none;
+    position: absolute;
+    top: 50%;
+    right: 0;
+    transform: translateY(-50%);
+
+    .button {
+        width: 20px;
+        height: 20px;
+        margin: 0;
+        margin-right: 6px;
+        border-radius: 50%;
+        cursor: pointer;
+        pointer-events: auto;
+        background-color: $dark-color;
+        color: $light-color;
+        font-size: 65%;
+        transition: transform 0.2s;
+        text-align: center;
+        position: relative;
+
+        .fa-icon {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+        }
+
+        &:last-child {
+            margin-right: 0;
+        }
+        &:hover {
+            background: $main-accent;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkMenuItem.tsx b/src/client/views/nodes/LinkMenuItem.tsx
new file mode 100644
index 000000000..c68365584
--- /dev/null
+++ b/src/client/views/nodes/LinkMenuItem.tsx
@@ -0,0 +1,107 @@
+import { library } from '@fortawesome/fontawesome-svg-core';
+import { faEdit, faEye, faTimes, faArrowRight, faChevronDown, faChevronUp } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { observer } from "mobx-react";
+import { DocumentManager } from "../../util/DocumentManager";
+import { undoBatch } from "../../util/UndoManager";
+import './LinkMenuItem.scss';
+import React = require("react");
+import { Doc } from '../../../new_fields/Doc';
+import { StrCast, Cast } from '../../../new_fields/Types';
+import { observable, action } from 'mobx';
+import { LinkManager } from '../../util/LinkManager';
+import { DragLinksAsDocuments, DragLinkAsDocument } from '../../util/DragManager';
+import { SelectionManager } from '../../util/SelectionManager';
+library.add(faEye, faEdit, faTimes, faArrowRight, faChevronDown, faChevronUp);
+
+
+interface LinkMenuItemProps {
+    groupType: string;
+    linkDoc: Doc;
+    sourceDoc: Doc;
+    destinationDoc: Doc;
+    showEditor: () => void;
+}
+
+@observer
+export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
+    private _drag = React.createRef<HTMLDivElement>();
+    @observable private _showMore: boolean = false;
+    @action toggleShowMore() { this._showMore = !this._showMore; }
+
+    @undoBatch
+    onFollowLink = async (e: React.PointerEvent): Promise<void> => {
+        e.stopPropagation();
+        DocumentManager.Instance.jumpToDocument(this.props.destinationDoc, e.altKey);
+    }
+
+    onEdit = (e: React.PointerEvent): void => {
+        e.stopPropagation();
+        this.props.showEditor();
+    }
+
+    renderMetadata = (): JSX.Element => {
+        let groups = LinkManager.Instance.getAnchorGroups(this.props.linkDoc, this.props.sourceDoc);
+        let index = groups.findIndex(groupDoc => StrCast(groupDoc.type).toUpperCase() === this.props.groupType.toUpperCase());
+        let groupDoc = index > -1 ? groups[index] : undefined;
+
+        let mdRows: Array<JSX.Element> = [];
+        if (groupDoc) {
+            let mdDoc = Cast(groupDoc.metadata, Doc, new Doc);
+            let keys = LinkManager.Instance.groupMetadataKeys.get(this.props.groupType);
+            mdRows = keys!.map(key => {
+                return (<div key={key} className="link-metadata-row"><b>{key}</b>: {StrCast(mdDoc[key])}</div>);
+            });
+        }
+
+        return (<div className="link-metadata">{mdRows}</div>);
+    }
+
+    onLinkButtonDown = (e: React.PointerEvent): void => {
+        e.stopPropagation();
+        document.removeEventListener("pointermove", this.onLinkButtonMoved);
+        document.addEventListener("pointermove", this.onLinkButtonMoved);
+        document.removeEventListener("pointerup", this.onLinkButtonUp);
+        document.addEventListener("pointerup", this.onLinkButtonUp);
+    }
+
+    onLinkButtonUp = (e: PointerEvent): void => {
+        document.removeEventListener("pointermove", this.onLinkButtonMoved);
+        document.removeEventListener("pointerup", this.onLinkButtonUp);
+        e.stopPropagation();
+    }
+
+    onLinkButtonMoved = async (e: PointerEvent) => {
+        if (this._drag.current !== null && (e.movementX > 1 || e.movementY > 1)) {
+            document.removeEventListener("pointermove", this.onLinkButtonMoved);
+            document.removeEventListener("pointerup", this.onLinkButtonUp);
+
+            DragLinkAsDocument(this._drag.current, e.x, e.y, this.props.linkDoc, this.props.sourceDoc);
+        }
+        e.stopPropagation();
+    }
+
+    render() {
+
+        let keys = LinkManager.Instance.groupMetadataKeys.get(this.props.groupType);
+        let canExpand = keys ? keys.length > 0 : false;
+
+        return (
+            <div className="linkMenu-item">
+                <div className={canExpand ? "linkMenu-item-content expand-three" : "linkMenu-item-content expand-two"}>
+                    <div className="link-name">
+                        <p>{StrCast(this.props.destinationDoc.title)}</p>
+                        <div className="linkMenu-item-buttons">
+                            {canExpand ? <div title="Show more" className="button" onPointerDown={() => this.toggleShowMore()}>
+                                <FontAwesomeIcon className="fa-icon" icon={this._showMore ? "chevron-up" : "chevron-down"} size="sm" /></div> : <></>}
+                            <div title="Edit link" className="button" onPointerDown={this.onEdit}><FontAwesomeIcon className="fa-icon" icon="edit" size="sm" /></div>
+                            <div title="Follow link" className="button" ref={this._drag} onPointerDown={this.onLinkButtonDown} onPointerUp={this.onFollowLink}><FontAwesomeIcon className="fa-icon" icon="arrow-right" size="sm" /></div>
+                        </div>
+                    </div>
+                    {this._showMore ? this.renderMetadata() : <></>}
+                </div>
+
+            </div >
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/new_fields/LinkButtonField.ts b/src/new_fields/LinkButtonField.ts
new file mode 100644
index 000000000..92e1ed922
--- /dev/null
+++ b/src/new_fields/LinkButtonField.ts
@@ -0,0 +1,35 @@
+import { Deserializable } from "../client/util/SerializationHelper";
+import { serializable, primitive, createSimpleSchema, object } from "serializr";
+import { ObjectField } from "./ObjectField";
+import { Copy, ToScriptString } from "./FieldSymbols";
+import { Doc } from "./Doc";
+import { DocumentView } from "../client/views/nodes/DocumentView";
+
+export type LinkButtonData = {
+    sourceViewId: string,
+    targetViewId: string
+};
+
+const LinkButtonSchema = createSimpleSchema({
+    sourceViewId: true,
+    targetViewId: true
+});
+
+@Deserializable("linkButton")
+export class LinkButtonField extends ObjectField {
+    @serializable(object(LinkButtonSchema))
+    readonly data: LinkButtonData;
+
+    constructor(data: LinkButtonData) {
+        super();
+        this.data = data;
+    }
+
+    [Copy]() {
+        return new LinkButtonField(this.data);
+    }
+
+    [ToScriptString]() {
+        return "invalid";
+    }
+}
-- 
cgit v1.2.3-70-g09d2


From b1a2871fcca57ce934b8613b315a08eede188669 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Thu, 20 Jun 2019 19:03:16 -0400
Subject: link menu styling

---
 src/client/views/nodes/LinkMenu.scss     | 13 +++++++++++++
 src/client/views/nodes/LinkMenu.tsx      |  6 +++---
 src/client/views/nodes/LinkMenuItem.scss | 30 +++++++++++++++++-------------
 3 files changed, 33 insertions(+), 16 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/views/nodes/LinkMenu.scss b/src/client/views/nodes/LinkMenu.scss
index 09a830c9e..d2e411c3d 100644
--- a/src/client/views/nodes/LinkMenu.scss
+++ b/src/client/views/nodes/LinkMenu.scss
@@ -10,5 +10,18 @@
     overflow-y: scroll;
 }
 
+.linkMenu-group {
+    margin-bottom: 10px;
+
+    &:last-child {
+        margin-bottom: 0;
+    }
+
+    .linkMenu-group-name {
+        border-bottom: 0.5px solid lightgray; 
+        margin-bottom: 4px;
+    }
+}
+
 
 
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 7e4c15312..8aca130a5 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -31,9 +31,9 @@ export class LinkMenu extends React.Component<Props> {
         let linkItems: Array<JSX.Element> = [];
         groups.forEach((group, groupType) => {
             linkItems.push(
-                <div key={groupType} className="link-menu-group">
-                    <p className="link-menu-group-name">{groupType}:</p>
-                    <div className="link-menu-group-wrapper">
+                <div key={groupType} className="linkMenu-group">
+                    <p className="linkMenu-group-name">{groupType}:</p>
+                    <div className="linkMenu-group-wrapper">
                         {this.renderGroup(group, groupType)}
                     </div>
                 </div>
diff --git a/src/client/views/nodes/LinkMenuItem.scss b/src/client/views/nodes/LinkMenuItem.scss
index 16a1df331..25d167231 100644
--- a/src/client/views/nodes/LinkMenuItem.scss
+++ b/src/client/views/nodes/LinkMenuItem.scss
@@ -1,13 +1,19 @@
 @import "../globalCssVariables";
 .linkMenu-item {
-    border-top: 0.5px solid $main-accent; 
-    padding: 6px;
+    // border-top: 0.5px solid $main-accent; 
     position: relative;
     display: flex;
     font-size: 12px;
+    
 
     .link-name {
         position: relative;
+
+        p {
+            padding: 4px 6px;
+            line-height: 12px;
+            border-radius: 5px;
+        }
     }
 
     .linkMenu-item-content {
@@ -15,27 +21,25 @@
     }
     
     .link-metadata {
-        margin-top: 6px;
-        padding: 3px;
-        border-top: 0.5px solid $light-color-secondary;
-        .link-metadata-row {
-            margin-left: 6px;
-        }
+        padding: 0 10px 0 16px;
+        margin-bottom: 4px;
+        color: $main-accent;
+        font-style: italic;
+        font-size: 10.5px;
     }
 
-    &:last-child {
-        border-bottom: 0.5px solid $main-accent;
-    }
     &:hover {
         .linkMenu-item-buttons {
             display: flex;
         }
         .linkMenu-item-content {
             &.expand-two p {
-                width: calc(100% - 46px);
+                width: calc(100% - 52px);
+                background-color: lightgray;
             }
             &.expand-three p {
-                width: calc(100% - 78px);
+                width: calc(100% - 84px);
+                background-color: lightgray;
             }
         }
     }
-- 
cgit v1.2.3-70-g09d2


From a4b34adcb34184728be0b69b33a561f6d10f0a98 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Fri, 21 Jun 2019 16:27:03 -0400
Subject: can drag just a group of links on a doc

---
 src/client/documents/Documents.ts                  |   4 +-
 src/client/util/DocumentManager.ts                 |  46 ++-----
 src/client/util/DragManager.ts                     |  47 ++++++-
 .../CollectionFreeFormLinkView.scss                |  38 +++---
 .../CollectionFreeFormLinkView.tsx                 |  88 ++++++------
 .../CollectionFreeFormLinksView.tsx                | 148 +++------------------
 src/client/views/nodes/DocumentView.tsx            |   2 +
 src/client/views/nodes/LinkMenu.scss               |  15 ++-
 src/client/views/nodes/LinkMenu.tsx                |  18 +--
 src/client/views/nodes/LinkMenuGroup.tsx           |  74 +++++++++++
 src/client/views/nodes/LinkMenuItem.tsx            |   8 +-
 src/new_fields/Doc.ts                              |  16 ++-
 12 files changed, 243 insertions(+), 261 deletions(-)
 create mode 100644 src/client/views/nodes/LinkMenuGroup.tsx

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index df5c39562..7cef48b98 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -91,7 +91,9 @@ export namespace DocUtils {
     //     let protoSrc = source.proto ? source.proto : source;
     //     let protoTarg = target.proto ? target.proto : target;
     export function MakeLink(source: Doc, target: Doc, targetContext?: Doc) {
-        if (LinkManager.Instance.doesLinkExist(source, target)) return;
+        if (LinkManager.Instance.doesLinkExist(source, target)) {
+            console.log("LINK EXISTS"); return;
+        }
 
         UndoManager.RunInBatch(() => {
 
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 325f4894d..c4cb6721a 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -85,51 +85,25 @@ export class DocumentManager {
 
     @computed
     public get LinkedDocumentViews() {
-        // console.log("linked");
-        // let docs = DocListCast(CurrentUserUtils.UserDocument.data);
-        // docs.forEach(d => {
-        //     console.log("d", StrCast(d.title));
-
-        // });
-
-        // let d = Cast(CurrentUserUtils.UserDocument.activeWorkspace, Doc, new Doc);
-        // console.log("DOC", StrCast(d.title));
-
-
-
-        let linked = DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false)).reduce((pairs, dv) => {
-            // console.log("FINDING LINKED DVs FOR", StrCast(dv.props.Document.title));
+        return DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false)).reduce((pairs, dv) => {
             let linksList = LinkManager.Instance.findAllRelatedLinks(dv.props.Document);
+            // let linksList = DocListCast(dv.props.Document.linkedToDocs);
             if (linksList && linksList.length) {
                 pairs.push(...linksList.reduce((pairs, link) => {
-                    // if (link) {
-                    let destination = LinkManager.Instance.findOppositeAnchor(link, dv.props.Document);
-                    // console.log("FINDING FOR", StrCast(dv.Document.title), StrCast(destination.title));
-
-                    if (destination) {
-                        let dvs = DocumentManager.Instance.getDocumentViews(destination);
-                        if (dvs.length > 0) {
-                            dvs.map(docView1 => {
-                                // console.log("PUSHING LINK BETWEEN", StrCast(dv.props.Document.title), StrCast(docView1.props.Document.title));
-                                // TODO: if any docviews are not in the same context, draw a proxy
-                                // let sameContent = dv.props.ContainingCollectionView === docView1.props.ContainingCollectionView;
-                                pairs.push({ anchor1View: dv, anchor2View: docView1, linkDoc: link });
-                                // console.log("PUSHED", StrCast(dv.props.Document.title), StrCast(docView1.Document.title));
-                            });
-                        } else {
-                            let dv = DocumentManager.Instance.getDocumentView(destination);
-                            dv ? console.log(StrCast(dv.props.Document.title)) : console.log("cant find");
-                        }
+                    if (link) {
+                        let linkToDoc = LinkManager.Instance.findOppositeAnchor(link, dv.props.Document);
+                        // console.log("FOUND ", DocumentManager.Instance.getDocumentViews(linkToDoc).length, "DOCVIEWS FOR", StrCast(linkToDoc.title), "WITH SOURCE", StrCast(dv.props.Document.title));
+                        DocumentManager.Instance.getDocumentViews(linkToDoc).map(docView1 =>
+                            pairs.push({ a: dv, b: docView1, l: link }));
                     }
-                    // }
                     return pairs;
-                }, [] as { anchor1View: DocumentView, anchor2View: DocumentView, linkDoc: Doc }[]));
+                }, [] as { a: DocumentView, b: DocumentView, l: Doc }[]));
             }
             return pairs;
-        }, [] as { anchor1View: DocumentView, anchor2View: DocumentView, linkDoc: Doc }[]);
-        return linked;
+        }, [] as { a: DocumentView, b: DocumentView, l: Doc }[]);
     }
 
+
     @undoBatch
     public jumpToDocument = async (docDelegate: Doc, forceDockFunc: boolean = false, dockFunc?: (doc: Doc) => void, linkPage?: number, docContext?: Doc): Promise<void> => {
         let doc = Doc.GetProto(docDelegate);
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 11530ef09..2abcff4f7 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -48,12 +48,10 @@ export function SetupDrag(_reference: React.RefObject<HTMLElement>, docFunc: ()
 export async function DragLinkAsDocument(dragEle: HTMLElement, x: number, y: number, linkDoc: Doc, sourceDoc: Doc) {
     let draggeddoc = LinkManager.Instance.findOppositeAnchor(linkDoc, sourceDoc);
 
-    // TODO: if not in same context then don't drag
-
     let moddrag = await Cast(draggeddoc.annotationOn, Doc);
     let dragData = new DragManager.DocumentDragData(moddrag ? [moddrag] : [draggeddoc]);
     dragData.dropAction = "alias" as dropActionType;
-    DragManager.StartDocumentDrag([dragEle], dragData, x, y, {
+    DragManager.StartLinkedDocumentDrag([dragEle], dragData, x, y, {
         handlers: {
             dragComplete: action(emptyFunction),
         },
@@ -83,11 +81,21 @@ export async function DragLinksAsDocuments(dragEle: HTMLElement, x: number, y: n
             if (doc) moddrag.push(doc);
         }
         let dragData = new DragManager.DocumentDragData(moddrag.length ? moddrag : draggedDocs);
-        dragData.dropAction = "alias" as dropActionType;
         // dragData.moveDocument = (document, targetCollection, addDocument) => {
         //     return false;
         // };
-        DragManager.StartDocumentDrag([dragEle], dragData, x, y, {
+
+        // runInAction(() => StartDragFunctions.map(func => func()));
+        // (eles, dragData, downX, downY, options,
+        //     (dropData: { [id: string]: any }) => {
+        //         (dropData.droppedDocuments = dragData.userDropAction === "alias" || (!dragData.userDropAction && dragData.dropAction === "alias") ?
+        //             dragData.draggedDocuments.map(d => Doc.MakeAlias(d)) :
+        //             dragData.userDropAction === "copy" || (!dragData.userDropAction && dragData.dropAction === "copy") ?
+        //                 dragData.draggedDocuments.map(d => Doc.MakeCopy(d, true)) :
+        //                 dragData.draggedDocuments
+        //         );
+        //     });
+        DragManager.StartLinkedDocumentDrag([dragEle], dragData, x, y, {
             handlers: {
                 dragComplete: action(emptyFunction),
             },
@@ -215,6 +223,35 @@ export namespace DragManager {
             });
     }
 
+    export function StartLinkedDocumentDrag(eles: HTMLElement[], dragData: DocumentDragData, downX: number, downY: number, options?: DragOptions) {
+
+        runInAction(() => StartDragFunctions.map(func => func()));
+        StartDrag(eles, dragData, downX, downY, options,
+            (dropData: { [id: string]: any }) => {
+                dropData.droppedDocuments = dragData.draggedDocuments.map(d => {
+                    let dv = DocumentManager.Instance.getDocumentView(d);
+                    // console.log("DRAG", StrCast(d.title));
+
+                    if (dv) {
+                        console.log("DRAG", StrCast(d.title), "has view");
+                        if (dv.props.ContainingCollectionView === SelectionManager.SelectedDocuments()[0].props.ContainingCollectionView) {
+                            console.log("DRAG", StrCast(d.title), "same");
+                            return d;
+                        } else {
+                            console.log("DRAG", StrCast(d.title), "diff");
+                            return Doc.MakeAlias(d);
+                        }
+                    } else {
+                        console.log("DRAG", StrCast(d.title), "has no view");
+                        return Doc.MakeAlias(d);
+                    }
+                    // return (dv && dv.props.ContainingCollectionView !== SelectionManager.SelectedDocuments()[0].props.ContainingCollectionView) || !dv ?
+                    //     Doc.MakeAlias(d) : d;
+                });
+
+            });
+    }
+
     export function StartAnnotationDrag(eles: HTMLElement[], dragData: AnnotationDragData, downX: number, downY: number, options?: DragOptions) {
         StartDrag(eles, dragData, downX, downY, options);
     }
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.scss b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.scss
index d8d518147..239c2ce56 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.scss
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.scss
@@ -1,22 +1,22 @@
-// .collectionfreeformlinkview-linkLine {
-//     stroke: black;
-//     transform: translate(10000px,10000px);
-//     opacity: 0.5;
-//     pointer-events: all;
-// }
-// .collectionfreeformlinkview-linkCircle {
-//     stroke: rgb(0,0,0);
-//     opacity: 0.5;
-//     transform: translate(10000px,10000px);
-//     pointer-events: all;
-//     cursor: pointer;
-// }
-// .collectionfreeformlinkview-linkText {
-//     stroke: rgb(0,0,0);
-//     opacity: 0.5;
-//     transform: translate(10000px,10000px);
-//     pointer-events: all;
-// }
+.collectionfreeformlinkview-linkLine {
+    stroke: black;
+    transform: translate(10000px,10000px);
+    opacity: 0.5;
+    pointer-events: all;
+}
+.collectionfreeformlinkview-linkCircle {
+    stroke: rgb(0,0,0);
+    opacity: 0.5;
+    transform: translate(10000px,10000px);
+    pointer-events: all;
+    cursor: pointer;
+}
+.collectionfreeformlinkview-linkText {
+    stroke: rgb(0,0,0);
+    opacity: 0.5;
+    transform: translate(10000px,10000px);
+    pointer-events: all;
+}
 
 .linkview-ele {
     transform: translate(10000px,10000px);
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
index 65d5ac474..5c7f080e0 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinkView.tsx
@@ -5,70 +5,60 @@ import { InkingControl } from "../../InkingControl";
 import "./CollectionFreeFormLinkView.scss";
 import React = require("react");
 import v5 = require("uuid/v5");
-import { DocumentView } from "../../nodes/DocumentView";
-import { Docs } from "../../../documents/Documents";
 
 export interface CollectionFreeFormLinkViewProps {
-    // anchor1: Doc;
-    // anchor2: Doc;
-    // LinkDocs: Doc[];
-    // addDocument: (document: Doc, allowDuplicates?: boolean) => boolean;
-    // removeDocument: (document: Doc) => boolean;
-    // sameContext: boolean;
-
-    // sourceView: DocumentView;
-    // targetView: DocumentView;
-    sourceView: Doc;
-    targetView: Doc;
+    A: Doc;
+    B: Doc;
+    LinkDocs: Doc[];
+    addDocument: (document: Doc, allowDuplicates?: boolean) => boolean;
+    removeDocument: (document: Doc) => boolean;
 }
 
 @observer
 export class CollectionFreeFormLinkView extends React.Component<CollectionFreeFormLinkViewProps> {
 
-    // onPointerDown = (e: React.PointerEvent) => {
-    //     if (e.button === 0 && !InkingControl.Instance.selectedTool) {
-    //         let a = this.props.A;
-    //         let b = this.props.B;
-    //         let x1 = NumCast(a.x) + (BoolCast(a.isMinimized, false) ? 5 : a[WidthSym]() / 2);
-    //         let y1 = NumCast(a.y) + (BoolCast(a.isMinimized, false) ? 5 : a[HeightSym]() / 2);
-    //         let x2 = NumCast(b.x) + (BoolCast(b.isMinimized, false) ? 5 : b[WidthSym]() / 2);
-    //         let y2 = NumCast(b.y) + (BoolCast(b.isMinimized, false) ? 5 : b[HeightSym]() / 2);
-    //         this.props.LinkDocs.map(l => {
-    //             let width = l[WidthSym]();
-    //             l.x = (x1 + x2) / 2 - width / 2;
-    //             l.y = (y1 + y2) / 2 + 10;
-    //             if (!this.props.removeDocument(l)) this.props.addDocument(l, false);
-    //         });
-    //         e.stopPropagation();
-    //         e.preventDefault();
-    //     }
-    // }
-
-
+    onPointerDown = (e: React.PointerEvent) => {
+        if (e.button === 0 && !InkingControl.Instance.selectedTool) {
+            let a = this.props.A;
+            let b = this.props.B;
+            let x1 = NumCast(a.x) + (BoolCast(a.isMinimized, false) ? 5 : a[WidthSym]() / 2);
+            let y1 = NumCast(a.y) + (BoolCast(a.isMinimized, false) ? 5 : a[HeightSym]() / 2);
+            let x2 = NumCast(b.x) + (BoolCast(b.isMinimized, false) ? 5 : b[WidthSym]() / 2);
+            let y2 = NumCast(b.y) + (BoolCast(b.isMinimized, false) ? 5 : b[HeightSym]() / 2);
+            this.props.LinkDocs.map(l => {
+                let width = l[WidthSym]();
+                l.x = (x1 + x2) / 2 - width / 2;
+                l.y = (y1 + y2) / 2 + 10;
+                if (!this.props.removeDocument(l)) this.props.addDocument(l, false);
+            });
+            e.stopPropagation();
+            e.preventDefault();
+        }
+    }
     render() {
-        // let l = this.props.LinkDocs;
-        // let a = this.props.A;
-        // let b = this.props.B;
-        let a1 = this.props.sourceView;
-        let a2 = this.props.targetView;
-        let x1 = NumCast(a1.x) + (BoolCast(a1.isMinimized, false) ? 5 : NumCast(a1.width) / NumCast(a1.zoomBasis, 1) / 2);
-        let y1 = NumCast(a1.y) + (BoolCast(a1.isMinimized, false) ? 5 : NumCast(a1.height) / NumCast(a1.zoomBasis, 1) / 2);
-
-        let x2 = NumCast(a2.x) + (BoolCast(a2.isMinimized, false) ? 5 : NumCast(a2.width) / NumCast(a2.zoomBasis, 1) / 2);
-        let y2 = NumCast(a2.y) + (BoolCast(a2.isMinimized, false) ? 5 : NumCast(a2.height) / NumCast(a2.zoomBasis, 1) / 2);
-
+        let l = this.props.LinkDocs;
+        let a = this.props.A;
+        let b = this.props.B;
+        let x1 = NumCast(a.x) + (BoolCast(a.isMinimized, false) ? 5 : NumCast(a.width) / NumCast(a.zoomBasis, 1) / 2);
+        let y1 = NumCast(a.y) + (BoolCast(a.isMinimized, false) ? 5 : NumCast(a.height) / NumCast(a.zoomBasis, 1) / 2);
+        let x2 = NumCast(b.x) + (BoolCast(b.isMinimized, false) ? 5 : NumCast(b.width) / NumCast(b.zoomBasis, 1) / 2);
+        let y2 = NumCast(b.y) + (BoolCast(b.isMinimized, false) ? 5 : NumCast(b.height) / NumCast(b.zoomBasis, 1) / 2);
+        let text = "";
+        let first = this.props.LinkDocs[0];
+        if (this.props.LinkDocs.length === 1) text += first.title + (first.linkDescription ? "(" + StrCast(first.linkDescription) + ")" : "");
+        else text = "-multiple-";
+        text = "";
         return (
             <>
-                <line className="linkview-line linkview-ele"
-                    // style={{ strokeWidth: `${2 * 1 / 2}` }}
+                <line key="linkLine" className="collectionfreeformlinkview-linkLine"
+                    style={{ strokeWidth: `${2 * l.length / 2}` }}
                     x1={`${x1}`} y1={`${y1}`}
                     x2={`${x2}`} y2={`${y2}`} />
-
                 {/* <circle key="linkCircle" className="collectionfreeformlinkview-linkCircle"
                     cx={(x1 + x2) / 2} cy={(y1 + y2) / 2} r={8} onPointerDown={this.onPointerDown} /> */}
-                {/* <text key="linkText" textAnchor="middle" className="collectionfreeformlinkview-linkText" x={`${(x1 + x2) / 2}`} y={`${(y1 + y2) / 2}`}>
+                <text key="linkText" textAnchor="middle" className="collectionfreeformlinkview-linkText" x={`${(x1 + x2) / 2}`} y={`${(y1 + y2) / 2}`}>
                     {text}
-                </text> */}
+                </text>
             </>
         );
     }
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
index 9d2f8946b..854122592 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
@@ -1,4 +1,4 @@
-import { computed, IReactionDisposer, reaction, action } from "mobx";
+import { computed, IReactionDisposer, reaction } from "mobx";
 import { observer } from "mobx-react";
 import { Doc, DocListCast } from "../../../../new_fields/Doc";
 import { Id } from "../../../../new_fields/FieldSymbols";
@@ -11,10 +11,6 @@ import { CollectionViewProps } from "../CollectionSubView";
 import "./CollectionFreeFormLinksView.scss";
 import { CollectionFreeFormLinkView } from "./CollectionFreeFormLinkView";
 import React = require("react");
-import { CollectionFreeFormLinkWithProxyView } from "./CollectionFreeFormLinkWithProxyView";
-import { Docs } from "../../../documents/Documents";
-import { LinkButtonField } from "../../../../new_fields/LinkButtonField";
-import { LinkManager } from "../../../util/LinkManager";
 
 @observer
 export class CollectionFreeFormLinksView extends React.Component<CollectionViewProps> {
@@ -98,150 +94,42 @@ export class CollectionFreeFormLinksView extends React.Component<CollectionViewP
 
     @computed
     get uniqueConnections() {
-        // console.log("\n");
-        let connections = DocumentManager.Instance.LinkedDocumentViews.reduce((drawnPairs, connection) => {
-            // console.log("CONNECTION BETWEEN", StrCast(connection.anchor1View.props.Document.title), StrCast(connection.anchor2View.props.Document.title));
-            let srcViews = this.documentAnchors(connection.anchor1View);
-            // srcViews.forEach(sv => {
-            //     console.log("DOCANCHORS SRC", StrCast(connection.anchor1View.Document.title), StrCast(sv.Document.title));
-            // });
-
-            let targetViews = this.documentAnchors(connection.anchor2View);
-            // targetViews.forEach(sv => {
-            //     console.log("DOCANCHORS TARG", StrCast(connection.anchor2View.Document.title), StrCast(sv.Document.title));
-            // });
-
-            // console.log("lengths", srcViews.length, targetViews.length);
+        // DocumentManager.Instance.LinkedDocumentViews.forEach(d => {
+        //     console.log("CONNECTION", StrCast(d.a.props.Document.title), StrCast(d.b.props.Document.title));
+        // });
 
-            // srcViews.forEach(v => {
-            //     console.log("SOURCE VIEW", StrCast(v.props.Document.title));
-            // });
-            // targetViews.forEach(v => {
-            //     console.log("TARGET VIEW", StrCast(v.Document.title));
-            // });
-
-            let possiblePairs: { anchor1: Doc, anchor2: Doc }[] = [];
-            // srcViews.map(sv => {
-            //     console.log("SOURCE VIEW", StrCast(sv.props.Document.title));
-            //     targetViews.map(tv => {
-            //         console.log("TARGET VIEW", StrCast(tv.props.Document.title));
-            //         // console.log("PUSHING PAIR", StrCast(sv.props.Document.title), StrCast(tv.props.Document.title));
-            //         possiblePairs.push({ anchor1: sv.props.Document, anchor2: tv.props.Document });
-            //     });
-            //     console.log("END\n");
-            // });
-            srcViews.forEach(sv => {
-                // console.log("SOURCE VIEW", StrCast(sv.props.Document.title));
-                targetViews.forEach(tv => {
-                    // console.log("TARGET VIEW", StrCast(tv.props.Document.title));
-                    // console.log("PUSHING PAIR", StrCast(sv.props.Document.title), StrCast(tv.props.Document.title));
-                    possiblePairs.push({ anchor1: sv.props.Document, anchor2: tv.props.Document });
-                });
-                // console.log("END\n");
-            });
-            // console.log("POSSIBLE PAIRS LENGTH", possiblePairs.length);
+        let connections = DocumentManager.Instance.LinkedDocumentViews.reduce((drawnPairs, connection) => {
+            let srcViews = this.documentAnchors(connection.a);
+            let targetViews = this.documentAnchors(connection.b);
+            let possiblePairs: { a: Doc, b: Doc, }[] = [];
+            srcViews.map(sv => targetViews.map(tv => possiblePairs.push({ a: sv.props.Document, b: tv.props.Document })));
             possiblePairs.map(possiblePair => {
-                // console.log("POSSIBLEPAIR", StrCast(possiblePair.anchor1.title), StrCast(possiblePair.anchor2.title));
                 if (!drawnPairs.reduce((found, drawnPair) => {
-                    let match1 = (Doc.AreProtosEqual(possiblePair.anchor1, drawnPair.anchor1) && Doc.AreProtosEqual(possiblePair.anchor2, drawnPair.anchor2));
-                    let match2 = (Doc.AreProtosEqual(possiblePair.anchor1, drawnPair.anchor2) && Doc.AreProtosEqual(possiblePair.anchor2, drawnPair.anchor1));
+                    let match1 = (Doc.AreProtosEqual(possiblePair.a, drawnPair.a) && Doc.AreProtosEqual(possiblePair.b, drawnPair.b));
+                    let match2 = (Doc.AreProtosEqual(possiblePair.a, drawnPair.b) && Doc.AreProtosEqual(possiblePair.b, drawnPair.a));
                     let match = match1 || match2;
-                    if (match && !drawnPair.linkDocs.reduce((found, link) => found || link[Id] === connection.linkDoc[Id], false)) {
-                        drawnPair.linkDocs.push(connection.linkDoc);
+                    if (match && !drawnPair.l.reduce((found, link) => found || link[Id] === connection.l[Id], false)) {
+                        drawnPair.l.push(connection.l);
                     }
                     return match || found;
                 }, false)) {
-                    drawnPairs.push({ anchor1: possiblePair.anchor1, anchor2: possiblePair.anchor2, linkDocs: [connection.linkDoc] });
+                    drawnPairs.push({ a: possiblePair.a, b: possiblePair.b, l: [connection.l] });
                 }
             });
             return drawnPairs;
-        }, [] as { anchor1: Doc, anchor2: Doc, linkDocs: Doc[] }[]);
+        }, [] as { a: Doc, b: Doc, l: Doc[] }[]);
         return connections.map(c => {
-            let x = c.linkDocs.reduce((p, l) => p + l[Id], "");
-            return <CollectionFreeFormLinkView key={x} sourceView={c.anchor1} targetView={c.anchor2} />;
+            let x = c.l.reduce((p, l) => p + l[Id], "");
+            return <CollectionFreeFormLinkView key={x} A={c.a} B={c.b} LinkDocs={c.l}
+                removeDocument={this.props.removeDocument} addDocument={this.props.addDocument} />;
         });
     }
 
-    // findUniquePairs = (): JSX.Element[] => {
-    //     let connections = DocumentManager.Instance.LinkedDocumentViews;
-
-    //     // console.log("CONNECTIONS");
-    //     // connections.forEach(c => console.log(StrCast(c.anchor1View.Document.title), StrCast(c.anchor2View.Document.title)));
-
-    //     let unique: Set<{ sourceView: DocumentView, targetView: DocumentView, linkDoc: Doc }> = new Set();
-    //     connections.forEach(c => {
-
-    //         // let match1Index = unique.findIndex(u => (c.anchor1View === u.sourceView) && (c.anchor2View === u.targetView));
-    //         // let match2Index = unique.findIndex(u => (c.anchor1View === u.targetView) && (c.anchor2View === u.sourceView));
-    //         let match1 = unique.has({ sourceView: c.anchor1View, targetView: c.anchor2View, linkDoc: c.linkDoc });
-    //         let match2 = unique.has({ sourceView: c.anchor2View, targetView: c.anchor1View, linkDoc: c.linkDoc });
-    //         let sameContext = c.anchor1View.props.ContainingCollectionView === c.anchor2View.props.ContainingCollectionView;
-
-    //         // console.log("CONNECTION", StrCast(c.anchor1View.props.Document.title), StrCast(c.anchor2View.props.Document.title), match1, match2);
-
-
-    //         // if in same context, push if docview pair does not already exist
-    //         // else push both directions of pair
-    //         if (sameContext) {
-    //             if (!(match1 || match2)) unique.add({ sourceView: c.anchor1View, targetView: c.anchor2View, linkDoc: c.linkDoc });
-    //         } else {
-    //             unique.add({ sourceView: c.anchor1View, targetView: c.anchor2View, linkDoc: c.linkDoc });
-    //             unique.add({ sourceView: c.anchor2View, targetView: c.anchor1View, linkDoc: c.linkDoc });
-    //         }
-    //     });
-
-    //     let uniqueList: JSX.Element[] = [];
-    //     unique.forEach(u => {
-    //         // TODO: make better key
-    //         let key = StrCast(u.sourceView.Document[Id]) + "-link-" + StrCast(u.targetView.Document[Id]) + "-" + Date.now() + Math.random();
-    //         let sourceIn = u.sourceView.props.ContainingCollectionView ? u.sourceView.props.ContainingCollectionView.props.Document === this.props.Document : false;
-    //         let targetIn = u.targetView.props.ContainingCollectionView ? u.targetView.props.ContainingCollectionView.props.Document === this.props.Document : false;
-    //         let sameContext = u.sourceView.props.ContainingCollectionView === u.targetView.props.ContainingCollectionView;
-    //         let inContainer = sameContext ? sourceIn || targetIn : sourceIn;
-
-    //         if (inContainer) {
-    //             // let alias = Doc.MakeAlias(proxy);
-    //             if (sameContext) {
-    //                 uniqueList.push(<CollectionFreeFormLinkView key={key} sourceView={u.sourceView} targetView={u.targetView} />);
-    //             } else {
-    //                 let proxy = LinkManager.Instance.findLinkProxy(StrCast(u.sourceView.props.Document[Id]), StrCast(u.targetView.props.Document[Id]));
-    //                 if (!proxy) {
-    //                     proxy = Docs.LinkButtonDocument(
-    //                         { sourceViewId: StrCast(u.sourceView.props.Document[Id]), targetViewId: StrCast(u.targetView.props.Document[Id]) },
-    //                         { width: 200, height: 100, borderRounding: 0 });
-    //                     let proxy1Proto = Doc.GetProto(proxy);
-    //                     proxy1Proto.sourceViewId = StrCast(u.sourceView.props.Document[Id]);
-    //                     proxy1Proto.targetViewId = StrCast(u.targetView.props.Document[Id]);
-    //                     proxy1Proto.isLinkButton = true;
-
-    //                     // LinkManager.Instance.linkProxies.push(proxy);
-    //                     LinkManager.Instance.addLinkProxy(proxy);
-    //                 }
-    //                 uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView} proxyDoc={proxy} />);
-
-    //                 // let proxy = LinkManager.Instance.findLinkProxy(StrCast(u.sourceView.props.Document[Id]), StrCast(u.targetView.props.Document[Id]));
-    //                 // if (proxy) {
-    //                 //     this.props.addDocument(proxy, false);
-    //                 //     uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView} />);
-    //                 // }
-    //                 // let proxyKey = Doc.AreProtosEqual(u.sourceView.Document, Cast(u.linkDoc.anchor1, Doc, new Doc)) ? "proxy1" : "proxy2";
-    //                 // let proxy = Cast(u.linkDoc[proxyKey], Doc, new Doc);
-    //                 // this.props.addDocument(proxy, false);
-
-    //                 // uniqueList.push(<CollectionFreeFormLinkWithProxyView key={key} sourceView={u.sourceView} targetView={u.targetView}
-    //                 //     proxyDoc={proxy} addDocTab={this.props.addDocTab} />);
-    //             }
-    //         }
-    //     });
-    //     return uniqueList;
-    // }
-
     render() {
         return (
             <div className="collectionfreeformlinksview-container">
                 <svg className="collectionfreeformlinksview-svgCanvas">
                     {this.uniqueConnections}
-                    {/* {this.findUniquePairs()} */}
                 </svg>
                 {this.props.children}
             </div>
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index dbbae2d59..1fc2cf770 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -161,7 +161,9 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
         this._animateToIconDisposer = reaction(() => this.props.Document.isIconAnimating, (values) =>
             (values instanceof List) && this.animateBetweenIcon(values, values[2], values[3] ? true : false)
             , { fireImmediately: true });
+        // console.log("CREATED NEW DOC VIEW", StrCast(this.props.Document.title), DocumentManager.Instance.DocumentViews.length);
         DocumentManager.Instance.DocumentViews.push(this);
+        // console.log("ADDED TO DOC MAN", StrCast(this.props.Document.title), DocumentManager.Instance.DocumentViews.length);
     }
 
     animateBetweenIcon = (iconPos: number[], startTime: number, maximizing: boolean) => {
diff --git a/src/client/views/nodes/LinkMenu.scss b/src/client/views/nodes/LinkMenu.scss
index d2e411c3d..c01ed23c4 100644
--- a/src/client/views/nodes/LinkMenu.scss
+++ b/src/client/views/nodes/LinkMenu.scss
@@ -18,8 +18,19 @@
     }
 
     .linkMenu-group-name {
-        border-bottom: 0.5px solid lightgray; 
-        margin-bottom: 4px;
+        padding: 4px 6px;
+        line-height: 12px;
+        border-radius: 5px;
+        margin-bottom: 2px;
+
+        &:hover {
+            background-color: lightgray;
+        }
+    }
+
+    .linkMenu-group-wrapper {
+        border-top: 0.5px solid lightgray; 
+        padding-top: 4px;
     }
 }
 
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 8aca130a5..f96c7d2e4 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -8,6 +8,9 @@ import React = require("react");
 import { Doc, DocListCast } from "../../../new_fields/Doc";
 import { Id } from "../../../new_fields/FieldSymbols";
 import { LinkManager } from "../../util/LinkManager";
+import { DragLinksAsDocuments, DragManager } from "../../util/DragManager";
+import { emptyFunction } from "../../../Utils";
+import { LinkMenuGroup } from "./LinkMenuGroup";
 
 interface Props {
     docView: DocumentView;
@@ -19,24 +22,11 @@ export class LinkMenu extends React.Component<Props> {
 
     @observable private _editingLink?: Doc;
 
-    renderGroup = (group: Doc[], groupType: string): Array<JSX.Element> => {
-        let source = this.props.docView.Document;
-        return group.map(linkDoc => {
-            let destination = LinkManager.Instance.findOppositeAnchor(linkDoc, source);
-            return <LinkMenuItem key={destination[Id] + source[Id]} groupType={groupType} linkDoc={linkDoc} sourceDoc={source} destinationDoc={destination} showEditor={action(() => this._editingLink = linkDoc)} />;
-        });
-    }
-
     renderAllGroups = (groups: Map<string, Array<Doc>>): Array<JSX.Element> => {
         let linkItems: Array<JSX.Element> = [];
         groups.forEach((group, groupType) => {
             linkItems.push(
-                <div key={groupType} className="linkMenu-group">
-                    <p className="linkMenu-group-name">{groupType}:</p>
-                    <div className="linkMenu-group-wrapper">
-                        {this.renderGroup(group, groupType)}
-                    </div>
-                </div>
+                <LinkMenuGroup key={groupType} sourceDoc={this.props.docView.props.Document} group={group} groupType={groupType} showEditor={action((linkDoc: Doc) => this._editingLink = linkDoc)} />
             );
         });
 
diff --git a/src/client/views/nodes/LinkMenuGroup.tsx b/src/client/views/nodes/LinkMenuGroup.tsx
new file mode 100644
index 000000000..229143d99
--- /dev/null
+++ b/src/client/views/nodes/LinkMenuGroup.tsx
@@ -0,0 +1,74 @@
+import { action, observable } from "mobx";
+import { observer } from "mobx-react";
+import { DocumentView } from "./DocumentView";
+import { LinkMenuItem } from "./LinkMenuItem";
+import { LinkEditor } from "./LinkEditor";
+import './LinkMenu.scss';
+import React = require("react");
+import { Doc, DocListCast } from "../../../new_fields/Doc";
+import { Id } from "../../../new_fields/FieldSymbols";
+import { LinkManager } from "../../util/LinkManager";
+import { DragLinksAsDocuments, DragManager } from "../../util/DragManager";
+import { emptyFunction } from "../../../Utils";
+
+interface LinkMenuGroupProps {
+    sourceDoc: Doc;
+    group: Doc[];
+    groupType: string;
+    showEditor: (linkDoc: Doc) => void;
+}
+
+@observer
+export class LinkMenuGroup extends React.Component<LinkMenuGroupProps> {
+
+    private _drag = React.createRef<HTMLDivElement>();
+
+    onLinkButtonDown = (e: React.PointerEvent): void => {
+        e.stopPropagation();
+        document.removeEventListener("pointermove", this.onLinkButtonMoved);
+        document.addEventListener("pointermove", this.onLinkButtonMoved);
+        document.removeEventListener("pointerup", this.onLinkButtonUp);
+        document.addEventListener("pointerup", this.onLinkButtonUp);
+    }
+
+    onLinkButtonUp = (e: PointerEvent): void => {
+        document.removeEventListener("pointermove", this.onLinkButtonMoved);
+        document.removeEventListener("pointerup", this.onLinkButtonUp);
+        e.stopPropagation();
+    }
+
+    onLinkButtonMoved = async (e: PointerEvent) => {
+        if (this._drag.current !== null && (e.movementX > 1 || e.movementY > 1)) {
+            document.removeEventListener("pointermove", this.onLinkButtonMoved);
+            document.removeEventListener("pointerup", this.onLinkButtonUp);
+
+            let draggedDocs = this.props.group.map(linkDoc => LinkManager.Instance.findOppositeAnchor(linkDoc, this.props.sourceDoc));
+            let dragData = new DragManager.DocumentDragData(draggedDocs);
+
+            DragManager.StartLinkedDocumentDrag([this._drag.current], dragData, e.x, e.y, {
+                handlers: {
+                    dragComplete: action(emptyFunction),
+                },
+                hideSource: false
+            });
+        }
+        e.stopPropagation();
+    }
+
+    render() {
+        let groupItems = this.props.group.map(linkDoc => {
+            let destination = LinkManager.Instance.findOppositeAnchor(linkDoc, this.props.sourceDoc);
+            return <LinkMenuItem key={destination[Id] + this.props.sourceDoc[Id]} groupType={this.props.groupType}
+                linkDoc={linkDoc} sourceDoc={this.props.sourceDoc} destinationDoc={destination} showEditor={this.props.showEditor} />;
+        });
+
+        return (
+            <div className="linkMenu-group">
+                <p className="linkMenu-group-name" ref={this._drag} onPointerDown={this.onLinkButtonDown} >{this.props.groupType}:</p>
+                <div className="linkMenu-group-wrapper">
+                    {groupItems}
+                </div>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkMenuItem.tsx b/src/client/views/nodes/LinkMenuItem.tsx
index 1ef4690b0..42ef353b7 100644
--- a/src/client/views/nodes/LinkMenuItem.tsx
+++ b/src/client/views/nodes/LinkMenuItem.tsx
@@ -21,7 +21,7 @@ interface LinkMenuItemProps {
     linkDoc: Doc;
     sourceDoc: Doc;
     destinationDoc: Doc;
-    showEditor: () => void;
+    showEditor: (linkDoc: Doc) => void;
 }
 
 @observer
@@ -42,7 +42,7 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
 
     onEdit = (e: React.PointerEvent): void => {
         e.stopPropagation();
-        this.props.showEditor();
+        this.props.showEditor(this.props.linkDoc);
     }
 
     renderMetadata = (): JSX.Element => {
@@ -95,12 +95,12 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
             <div className="linkMenu-item">
                 <div className={canExpand ? "linkMenu-item-content expand-three" : "linkMenu-item-content expand-two"}>
                     <div className="link-name">
-                        <p>{StrCast(this.props.destinationDoc.title)}</p>
+                        <p ref={this._drag} onPointerDown={this.onLinkButtonDown}>{StrCast(this.props.destinationDoc.title)}</p>
                         <div className="linkMenu-item-buttons">
                             {canExpand ? <div title="Show more" className="button" onPointerDown={() => this.toggleShowMore()}>
                                 <FontAwesomeIcon className="fa-icon" icon={this._showMore ? "chevron-up" : "chevron-down"} size="sm" /></div> : <></>}
                             <div title="Edit link" className="button" onPointerDown={this.onEdit}><FontAwesomeIcon className="fa-icon" icon="edit" size="sm" /></div>
-                            <div title="Follow link" className="button" ref={this._drag} onPointerDown={this.onLinkButtonDown} onPointerUp={this.onFollowLink}><FontAwesomeIcon className="fa-icon" icon="arrow-right" size="sm" /></div>
+                            <div title="Follow link" className="button" onPointerDown={this.onFollowLink}><FontAwesomeIcon className="fa-icon" icon="arrow-right" size="sm" /></div>
                         </div>
                     </div>
                     {this._showMore ? this.renderMetadata() : <></>}
diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts
index 1b0ff812f..5ce47fc2f 100644
--- a/src/new_fields/Doc.ts
+++ b/src/new_fields/Doc.ts
@@ -3,11 +3,13 @@ import { serializable, primitive, map, alias, list } from "serializr";
 import { autoObject, SerializationHelper, Deserializable } from "../client/util/SerializationHelper";
 import { DocServer } from "../client/DocServer";
 import { setter, getter, getField, updateFunction, deleteProperty } from "./util";
-import { Cast, ToConstructor, PromiseValue, FieldValue, NumCast } from "./Types";
+import { Cast, ToConstructor, PromiseValue, FieldValue, NumCast, StrCast } from "./Types";
 import { listSpec } from "./Schema";
 import { ObjectField } from "./ObjectField";
 import { RefField, FieldId } from "./RefField";
 import { ToScriptString, SelfProxy, Parent, OnUpdate, Self, HandleUpdate, Update, Id } from "./FieldSymbols";
+import { LinkManager } from "../client/util/LinkManager";
+import { DocUtils } from "../client/documents/Documents";
 
 export namespace Field {
     export function toScriptString(field: Field): string {
@@ -247,6 +249,18 @@ export namespace Doc {
                 }
             }
         });
+        console.log("COPY", StrCast(doc.title));
+        let links = LinkManager.Instance.findAllRelatedLinks(doc);
+        links.forEach(linkDoc => {
+            let opp = LinkManager.Instance.findOppositeAnchor(linkDoc, doc);
+            console.log("OPP", StrCast(opp.title));
+            DocUtils.MakeLink(opp, copy);
+        });
+
+        LinkManager.Instance.allLinks.forEach(l => {
+            console.log("LINK", StrCast(Cast(l.anchor1, Doc, new Doc).title), StrCast(Cast(l.anchor2, Doc, new Doc).title));
+        });
+
         return copy;
     }
 
-- 
cgit v1.2.3-70-g09d2


From 41cf1e8536964764f18ab752140e484e36cbe464 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Tue, 25 Jun 2019 17:09:36 -0400
Subject: links can save

---
 src/client/documents/Documents.ts                  |  58 +---
 src/client/util/DocumentManager.ts                 |  14 +-
 src/client/util/DragManager.ts                     |  24 +-
 src/client/util/LinkManager.ts                     | 239 +++++++++++----
 src/client/views/DocumentDecorations.tsx           |   2 +-
 src/client/views/MainView.tsx                      |   7 +
 .../views/collections/CollectionDockingView.tsx    |   4 +-
 .../views/collections/CollectionTreeView.tsx       |  18 +-
 .../CollectionFreeFormLinksView.tsx                |   7 +-
 src/client/views/nodes/DocumentView.tsx            |   8 +-
 src/client/views/nodes/LinkButtonBox.scss          |  34 +--
 src/client/views/nodes/LinkButtonBox.tsx           | 126 ++++----
 src/client/views/nodes/LinkEditor.tsx              | 323 +++++++++------------
 src/client/views/nodes/LinkMenu.tsx                |   2 +-
 src/client/views/nodes/LinkMenuGroup.tsx           |   8 +-
 src/client/views/nodes/LinkMenuItem.tsx            |   6 +-
 src/new_fields/Doc.ts                              |   9 +-
 src/new_fields/LinkButtonField.ts                  |  58 ++--
 18 files changed, 503 insertions(+), 444 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts
index 64032e096..fbd96fb66 100644
--- a/src/client/documents/Documents.ts
+++ b/src/client/documents/Documents.ts
@@ -35,8 +35,8 @@ import { DateField } from "../../new_fields/DateField";
 import { UndoManager } from "../util/UndoManager";
 import { RouteStore } from "../../server/RouteStore";
 import { LinkManager } from "../util/LinkManager";
-import { LinkButtonBox } from "../views/nodes/LinkButtonBox";
-import { LinkButtonField, LinkButtonData } from "../../new_fields/LinkButtonField";
+// import { LinkButtonBox } from "../views/nodes/LinkButtonBox";
+// import { LinkButtonField, LinkButtonData } from "../../new_fields/LinkButtonField";
 import { DocumentManager } from "../util/DocumentManager";
 import { Id } from "../../new_fields/FieldSymbols";
 var requestImageSize = require('request-image-size');
@@ -100,6 +100,7 @@ export namespace DocUtils {
             let linkDoc = Docs.TextDocument({ width: 100, height: 30, borderRounding: -1 });
             let linkDocProto = Doc.GetProto(linkDoc);
 
+            linkDocProto.context = targetContext;
             linkDocProto.title = title; //=== "" ? source.title + " to " + target.title : title;
             linkDocProto.linkDescription = description;
             linkDocProto.linkTags = tags;
@@ -111,36 +112,7 @@ export namespace DocUtils {
             linkDocProto.anchor2Page = target.curPage;
             linkDocProto.anchor2Groups = new List<Doc>([]);
 
-            linkDocProto.context = targetContext;
-
-            let sourceViews = DocumentManager.Instance.getDocumentViews(source);
-            let targetViews = DocumentManager.Instance.getDocumentViews(target);
-            sourceViews.forEach(sv => {
-                targetViews.forEach(tv => {
-
-                    // TODO: do only for when diff contexts
-                    let proxy1 = Docs.LinkButtonDocument(
-                        { sourceViewId: StrCast(sv.props.Document[Id]), targetViewId: StrCast(tv.props.Document[Id]) },
-                        { width: 200, height: 100, borderRounding: 0 });
-                    let proxy1Proto = Doc.GetProto(proxy1);
-                    proxy1Proto.sourceViewId = StrCast(sv.props.Document[Id]);
-                    proxy1Proto.targetViewId = StrCast(tv.props.Document[Id]);
-                    proxy1Proto.isLinkButton = true;
-
-                    let proxy2 = Docs.LinkButtonDocument(
-                        { sourceViewId: StrCast(tv.props.Document[Id]), targetViewId: StrCast(sv.props.Document[Id]) },
-                        { width: 200, height: 100, borderRounding: 0 });
-                    let proxy2Proto = Doc.GetProto(proxy2);
-                    proxy2Proto.sourceViewId = StrCast(tv.props.Document[Id]);
-                    proxy2Proto.targetViewId = StrCast(sv.props.Document[Id]);
-                    proxy2Proto.isLinkButton = true;
-
-                    LinkManager.Instance.linkProxies.push(proxy1);
-                    LinkManager.Instance.linkProxies.push(proxy2);
-                });
-            });
-
-            LinkManager.Instance.allLinks.push(linkDoc);
+            LinkManager.Instance.addLink(linkDoc);
 
             return linkDoc;
         }, "make link");
@@ -160,7 +132,7 @@ export namespace Docs {
     let audioProto: Doc;
     let pdfProto: Doc;
     let iconProto: Doc;
-    let linkProto: Doc;
+    // let linkProto: Doc;
     const textProtoId = "textProto";
     const histoProtoId = "histoProto";
     const pdfProtoId = "pdfProto";
@@ -171,7 +143,7 @@ export namespace Docs {
     const videoProtoId = "videoProto";
     const audioProtoId = "audioProto";
     const iconProtoId = "iconProto";
-    const linkProtoId = "linkProto";
+    // const linkProtoId = "linkProto";
 
     export function initProtos(): Promise<void> {
         return DocServer.GetRefFields([textProtoId, histoProtoId, collProtoId, imageProtoId, webProtoId, kvpProtoId, videoProtoId, audioProtoId, pdfProtoId, iconProtoId]).then(fields => {
@@ -185,7 +157,7 @@ export namespace Docs {
             audioProto = fields[audioProtoId] as Doc || CreateAudioPrototype();
             pdfProto = fields[pdfProtoId] as Doc || CreatePdfPrototype();
             iconProto = fields[iconProtoId] as Doc || CreateIconPrototype();
-            linkProto = fields[linkProtoId] as Doc || CreateLinkPrototype();
+            // linkProto = fields[linkProtoId] as Doc || CreateLinkPrototype();
         });
     }
 
@@ -218,11 +190,11 @@ export namespace Docs {
             { x: 0, y: 0, width: Number(MINIMIZED_ICON_SIZE), height: Number(MINIMIZED_ICON_SIZE) });
         return iconProto;
     }
-    function CreateLinkPrototype(): Doc {
-        let linkProto = setupPrototypeOptions(linkProtoId, "LINK_PROTO", LinkButtonBox.LayoutString(),
-            { x: 0, y: 0, width: 300 });
-        return linkProto;
-    }
+    // function CreateLinkPrototype(): Doc {
+    //     let linkProto = setupPrototypeOptions(linkProtoId, "LINK_PROTO", LinkButtonBox.LayoutString(),
+    //         { x: 0, y: 0, width: 300 });
+    //     return linkProto;
+    // }
     function CreateTextPrototype(): Doc {
         let textProto = setupPrototypeOptions(textProtoId, "TEXT_PROTO", FormattedTextBox.LayoutString(),
             { x: 0, y: 0, width: 300, backgroundColor: "#f1efeb" });
@@ -309,9 +281,9 @@ export namespace Docs {
     export function IconDocument(icon: string, options: DocumentOptions = {}) {
         return CreateInstance(iconProto, new IconField(icon), options);
     }
-    export function LinkButtonDocument(data: LinkButtonData, options: DocumentOptions = {}) {
-        return CreateInstance(linkProto, new LinkButtonField(data), options);
-    }
+    // export function LinkButtonDocument(data: LinkButtonData, options: DocumentOptions = {}) {
+    //     return CreateInstance(linkProto, new LinkButtonField(data), options);
+    // }
     export function PdfDocument(url: string, options: DocumentOptions = {}) {
         return CreateInstance(pdfProto, new PdfField(new URL(url)), options);
     }
diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 89e6183d6..767abe63f 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -85,12 +85,11 @@ export class DocumentManager {
 
     @computed
     public get LinkedDocumentViews() {
-        console.log("link");
-        return DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false)).reduce((pairs, dv) => {
-            let linksList = LinkManager.Instance.findAllRelatedLinks(dv.props.Document);
+        let pairs = DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false)).reduce((pairs, dv) => {
+            let linksList = LinkManager.Instance.getAllRelatedLinks(dv.props.Document);
             pairs.push(...linksList.reduce((pairs, link) => {
                 if (link) {
-                    let linkToDoc = LinkManager.Instance.findOppositeAnchor(link, dv.props.Document);
+                    let linkToDoc = LinkManager.Instance.getOppositeAnchor(link, dv.props.Document);
                     DocumentManager.Instance.getDocumentViews(linkToDoc).map(docView1 => {
                         pairs.push({ a: dv, b: docView1, l: link });
                     });
@@ -100,6 +99,13 @@ export class DocumentManager {
             // }
             return pairs;
         }, [] as { a: DocumentView, b: DocumentView, l: Doc }[]);
+
+        // console.log("LINKED DOCUMENT VIEWS");
+        // pairs.forEach(p => {
+        //     console.log(StrCast(p.a.Document.title), p.a.props.Document[Id], StrCast(p.b.Document.title), p.b.props.Document[Id]);
+        // });
+
+        return pairs;
     }
 
 
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index f4c8adc8e..1aacf2c53 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -46,7 +46,7 @@ export function SetupDrag(_reference: React.RefObject<HTMLElement>, docFunc: ()
 }
 
 export async function DragLinkAsDocument(dragEle: HTMLElement, x: number, y: number, linkDoc: Doc, sourceDoc: Doc) {
-    let draggeddoc = LinkManager.Instance.findOppositeAnchor(linkDoc, sourceDoc);
+    let draggeddoc = LinkManager.Instance.getOppositeAnchor(linkDoc, sourceDoc);
 
     let moddrag = await Cast(draggeddoc.annotationOn, Doc);
     let dragData = new DragManager.DocumentDragData(moddrag ? [moddrag] : [draggeddoc]);
@@ -66,10 +66,10 @@ export async function DragLinksAsDocuments(dragEle: HTMLElement, x: number, y: n
     // TODO: if not in same context then don't drag
 
     if (srcTarg) {
-        let linkDocs = LinkManager.Instance.findAllRelatedLinks(srcTarg);
+        let linkDocs = LinkManager.Instance.getAllRelatedLinks(srcTarg);
         if (linkDocs) {
             draggedDocs = linkDocs.map(link => {
-                return LinkManager.Instance.findOppositeAnchor(link, sourceDoc);
+                return LinkManager.Instance.getOppositeAnchor(link, sourceDoc);
             });
         }
     }
@@ -236,10 +236,16 @@ export namespace DragManager {
                         if (dv.props.ContainingCollectionView === SelectionManager.SelectedDocuments()[0].props.ContainingCollectionView) {
                             return d;
                         } else {
-                            return Doc.MakeAlias(d);
+                            // return d;
+                            let r = Doc.MakeAlias(d);
+                            // DocUtils.MakeLink(sourceDoc, r);
+                            return r;
                         }
                     } else {
-                        return Doc.MakeAlias(d);
+                        // return d;
+                        let r = Doc.MakeAlias(d);
+                        // DocUtils.MakeLink(sourceDoc, r);
+                        return r;
                     }
                     // return (dv && dv.props.ContainingCollectionView !== SelectionManager.SelectedDocuments()[0].props.ContainingCollectionView) || !dv ?
                     //     Doc.MakeAlias(d) : d;
@@ -282,10 +288,10 @@ export namespace DragManager {
         StartDrag([ele], dragData, downX, downY, options);
     }
 
-    export function StartLinkProxyDrag(ele: HTMLElement, dragData: DocumentDragData, downX: number, downY: number, options?: DragOptions) {
-        runInAction(() => StartDragFunctions.map(func => func()));
-        StartDrag([ele], dragData, downX, downY, options);
-    }
+    // export function StartLinkProxyDrag(ele: HTMLElement, dragData: DocumentDragData, downX: number, downY: number, options?: DragOptions) {
+    //     runInAction(() => StartDragFunctions.map(func => func()));
+    //     StartDrag([ele], dragData, downX, downY, options);
+    // }
 
     export let AbortDrag: () => void = emptyFunction;
 
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 745255f31..82c3a9acd 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -1,9 +1,10 @@
 import { observable, action } from "mobx";
-import { StrCast, Cast } from "../../new_fields/Types";
+import { StrCast, Cast, FieldValue } from "../../new_fields/Types";
 import { Doc, DocListCast } from "../../new_fields/Doc";
 import { listSpec } from "../../new_fields/Schema";
 import { List } from "../../new_fields/List";
 import { Id } from "../../new_fields/FieldSymbols";
+import { CurrentUserUtils } from "../../server/authentication/models/current_user_utils";
 
 
 /* 
@@ -23,6 +24,11 @@ import { Id } from "../../new_fields/FieldSymbols";
  * - user defined kvps 
  */
 export class LinkManager {
+    // static Instance: LinkManager;
+    // private constructor() {
+    //     LinkManager.Instance = this;
+    // }
+
     private static _instance: LinkManager;
     public static get Instance(): LinkManager {
         return this._instance || (this._instance = new this());
@@ -30,25 +36,138 @@ export class LinkManager {
     private constructor() {
     }
 
-    @observable public allLinks: Array<Doc> = []; // list of link docs
-    @observable public groupMetadataKeys: Map<string, Array<string>> = new Map();
-    // map of group type to list of its metadata keys; serves as a dictionary of groups to what kind of metadata it hodls
-    @observable public linkProxies: Array<Doc> = []; // list of linkbutton docs - used to visualize link when an anchors are not in the same context
+    public get LinkManagerDoc(): Doc | undefined {
+        return FieldValue(Cast(CurrentUserUtils.UserDocument.linkManagerDoc, Doc));
+    }
+    // @observable public allLinks: Array<Doc> = []; //List<Doc> = new List<Doc>([]); // list of link docs
+    // @observable public groupMetadataKeys: Map<string, Array<string>> = new Map();
+    // map of group type to list of its metadata keys; serves as a dictionary of groups to what kind of metadata it holds
+
+    public getAllLinks(): Doc[] {
+        return LinkManager.Instance.LinkManagerDoc ? LinkManager.Instance.LinkManagerDoc.allLinks ? DocListCast(LinkManager.Instance.LinkManagerDoc.allLinks) : [] : [];
+    }
+
+    public addLink(linkDoc: Doc): boolean {
+        let linkList = LinkManager.Instance.getAllLinks();
+        linkList.push(linkDoc);
+        console.log("link man doc", LinkManager.Instance.LinkManagerDoc);
+        if (LinkManager.Instance.LinkManagerDoc) {
+            LinkManager.Instance.LinkManagerDoc.allLinks = new List<Doc>(linkList);
+            return true;
+        }
+        return false;
+    }
+
+    public deleteLink(linkDoc: Doc): boolean {
+        let linkList = LinkManager.Instance.getAllLinks();
+        let index = LinkManager.Instance.getAllLinks().indexOf(linkDoc);
+        if (index > -1) {
+            linkList.splice(index, 1);
+            if (LinkManager.Instance.LinkManagerDoc) {
+                LinkManager.Instance.LinkManagerDoc.allLinks = new List<Doc>(linkList);
+                return true;
+            }
+        }
+        return false;
+    }
 
     // finds all links that contain the given anchor
-    public findAllRelatedLinks(anchor: Doc): Array<Doc> {
-        return LinkManager.Instance.allLinks.filter(link => {
+    public getAllRelatedLinks(anchor: Doc): Doc[] {//List<Doc> {
+        let related = LinkManager.Instance.getAllLinks().filter(link => {
             let protomatch1 = Doc.AreProtosEqual(anchor, Cast(link.anchor1, Doc, new Doc));
             let protomatch2 = Doc.AreProtosEqual(anchor, Cast(link.anchor2, Doc, new Doc));
-            // let idmatch1 = StrCast(anchor[Id]) === StrCast(Cast(link.anchor1, Doc, new Doc)[Id]);
-            // let idmatch2 = StrCast(anchor[Id]) === StrCast(Cast(link.anchor2, Doc, new Doc)[Id]);
-            return protomatch1 || protomatch2;// || idmatch1 || idmatch2;
+            return protomatch1 || protomatch2;
         });
+        return related;
+    }
+
+    public addGroupType(groupType: string): boolean {
+        if (LinkManager.Instance.LinkManagerDoc) {
+            LinkManager.Instance.LinkManagerDoc[groupType] = new List<string>([]);
+            let groupTypes = LinkManager.Instance.getAllGroupTypes();
+            groupTypes.push(groupType);
+            LinkManager.Instance.LinkManagerDoc.allGroupTypes = new List<string>(groupTypes);
+            return true;
+        }
+        return false;
+    }
+
+    // removes all group docs from all links with the given group type
+    public deleteGroupType(groupType: string): boolean {
+        if (LinkManager.Instance.LinkManagerDoc) {
+            if (LinkManager.Instance.LinkManagerDoc[groupType]) {
+                LinkManager.Instance.LinkManagerDoc[groupType] = undefined;
+                LinkManager.Instance.getAllLinks().forEach(linkDoc => {
+                    LinkManager.Instance.removeGroupFromAnchor(linkDoc, Cast(linkDoc.anchor1, Doc, new Doc), groupType);
+                    LinkManager.Instance.removeGroupFromAnchor(linkDoc, Cast(linkDoc.anchor2, Doc, new Doc), groupType);
+                });
+            }
+            return true;
+        } else return false;
+    }
+
+    public getAllGroupTypes(): string[] {
+        if (LinkManager.Instance.LinkManagerDoc) {
+            if (LinkManager.Instance.LinkManagerDoc.allGroupTypes) {
+                return Cast(LinkManager.Instance.LinkManagerDoc.allGroupTypes, listSpec("string"), []);
+            } else {
+                LinkManager.Instance.LinkManagerDoc.allGroupTypes = new List<string>([]);
+                return [];
+            }
+        }
+        return [];
+    }
+
+    // gets the groups associates with an anchor in a link
+    public getAnchorGroups(linkDoc: Doc, anchor: Doc): Array<Doc> {
+        if (Doc.AreProtosEqual(anchor, Cast(linkDoc.anchor1, Doc, new Doc))) {
+            return DocListCast(linkDoc.anchor1Groups);
+        } else {
+            return DocListCast(linkDoc.anchor2Groups);
+        }
+    }
+
+    // sets the groups of the given anchor in the given link
+    public setAnchorGroups(linkDoc: Doc, anchor: Doc, groups: Doc[]) {
+        if (Doc.AreProtosEqual(anchor, Cast(linkDoc.anchor1, Doc, new Doc))) {
+            linkDoc.anchor1Groups = new List<Doc>(groups);
+        } else {
+            linkDoc.anchor2Groups = new List<Doc>(groups);
+        }
+    }
+
+    public addGroupToAnchor(linkDoc: Doc, anchor: Doc, groupDoc: Doc, replace: boolean = false) {
+        let groups = LinkManager.Instance.getAnchorGroups(linkDoc, anchor);
+        let index = groups.findIndex(gDoc => {
+            return StrCast(groupDoc.type).toUpperCase() === StrCast(gDoc.type).toUpperCase();
+        });
+        if (index > -1 && replace) {
+            groups[index] = groupDoc;
+        }
+        if (index === -1) {
+            groups.push(groupDoc);
+        }
+        LinkManager.Instance.setAnchorGroups(linkDoc, anchor, groups);
+    }
+
+    // removes group doc of given group type only from given anchor on given link
+    public removeGroupFromAnchor(linkDoc: Doc, anchor: Doc, groupType: string) {
+        let groups = LinkManager.Instance.getAnchorGroups(linkDoc, anchor);
+        let newGroups = groups.filter(groupDoc => StrCast(groupDoc.type).toUpperCase() !== groupType.toUpperCase());
+        LinkManager.Instance.setAnchorGroups(linkDoc, anchor, newGroups);
     }
 
+    // public doesAnchorHaveGroup(linkDoc: Doc, anchor: Doc, groupDoc: Doc): boolean {
+    //     let groups = LinkManager.Instance.getAnchorGroups(linkDoc, anchor);
+    //     let index = groups.findIndex(gDoc => {
+    //         return StrCast(groupDoc.type).toUpperCase() === StrCast(gDoc.type).toUpperCase();
+    //     });
+    //     return index > -1;
+    // }
+
     // returns map of group type to anchor's links in that group type
-    public findRelatedGroupedLinks(anchor: Doc): Map<string, Array<Doc>> {
-        let related = this.findAllRelatedLinks(anchor);
+    public getRelatedGroupedLinks(anchor: Doc): Map<string, Array<Doc>> {
+        let related = this.getAllRelatedLinks(anchor);
         let anchorGroups = new Map<string, Array<Doc>>();
         related.forEach(link => {
             let groups = LinkManager.Instance.getAnchorGroups(link, anchor);
@@ -73,10 +192,41 @@ export class LinkManager {
         return anchorGroups;
     }
 
+    // public addMetadataKeyToGroup(groupType: string, key: string): boolean {
+    //     if (LinkManager.Instance.LinkManagerDoc) {
+    //         if (LinkManager.Instance.LinkManagerDoc[groupType]) {
+    //             let keyList = LinkManager.Instance.findMetadataKeysInGroup(groupType);
+    //             keyList.push(key);
+    //             LinkManager.Instance.LinkManagerDoc[groupType] = new List<string>(keyList);
+    //             return true;
+    //         }
+    //         return false;
+    //     }
+    //     return false;
+    // }
+
+    public getMetadataKeysInGroup(groupType: string): string[] {
+        if (LinkManager.Instance.LinkManagerDoc) {
+            return LinkManager.Instance.LinkManagerDoc[groupType] ? Cast(LinkManager.Instance.LinkManagerDoc[groupType], listSpec("string"), []) : [];
+        }
+        return [];
+    }
+
+    public setMetadataKeysForGroup(groupType: string, keys: string[]): boolean {
+        if (LinkManager.Instance.LinkManagerDoc) {
+            // if (LinkManager.Instance.LinkManagerDoc[groupType]) {
+            LinkManager.Instance.LinkManagerDoc[groupType] = new List<string>(keys);
+            return true;
+            // }
+            // return false;
+        }
+        return false;
+    }
+
     // returns a list of all metadata docs associated with the given group type
-    public findAllMetadataDocsInGroup(groupType: string): Array<Doc> {
+    public getAllMetadataDocsInGroup(groupType: string): Array<Doc> {
         let md: Doc[] = [];
-        let allLinks = LinkManager.Instance.allLinks;
+        let allLinks = LinkManager.Instance.getAllLinks();
         allLinks.forEach(linkDoc => {
             let anchor1Groups = LinkManager.Instance.getAnchorGroups(linkDoc, Cast(linkDoc.anchor1, Doc, new Doc));
             let anchor2Groups = LinkManager.Instance.getAnchorGroups(linkDoc, Cast(linkDoc.anchor2, Doc, new Doc));
@@ -86,27 +236,9 @@ export class LinkManager {
         return md;
     }
 
-    // removes all group docs from all links with the given group type
-    public deleteGroup(groupType: string): void {
-        let deleted = LinkManager.Instance.groupMetadataKeys.delete(groupType);
-        if (deleted) {
-            LinkManager.Instance.allLinks.forEach(linkDoc => {
-                LinkManager.Instance.removeGroupFromAnchor(linkDoc, Cast(linkDoc.anchor1, Doc, new Doc), groupType);
-                LinkManager.Instance.removeGroupFromAnchor(linkDoc, Cast(linkDoc.anchor2, Doc, new Doc), groupType);
-            });
-        }
-    }
-
-    // removes group doc of given group type only from given anchor on given link
-    public removeGroupFromAnchor(linkDoc: Doc, anchor: Doc, groupType: string) {
-        let groups = LinkManager.Instance.getAnchorGroups(linkDoc, anchor);
-        let newGroups = groups.filter(groupDoc => StrCast(groupDoc.type).toUpperCase() !== groupType.toUpperCase());
-        LinkManager.Instance.setAnchorGroups(linkDoc, anchor, newGroups);
-    }
-
     // checks if a link with the given anchors exists
-    public doesLinkExist(anchor1: Doc, anchor2: Doc) {
-        let allLinks = LinkManager.Instance.allLinks;
+    public doesLinkExist(anchor1: Doc, anchor2: Doc): boolean {
+        let allLinks = LinkManager.Instance.getAllLinks();
         let index = allLinks.findIndex(linkDoc => {
             return (Doc.AreProtosEqual(Cast(linkDoc.anchor1, Doc, new Doc), anchor1) && Doc.AreProtosEqual(Cast(linkDoc.anchor2, Doc, new Doc), anchor2)) ||
                 (Doc.AreProtosEqual(Cast(linkDoc.anchor1, Doc, new Doc), anchor2) && Doc.AreProtosEqual(Cast(linkDoc.anchor2, Doc, new Doc), anchor1));
@@ -115,7 +247,7 @@ export class LinkManager {
     }
 
     // finds the opposite anchor of a given anchor in a link
-    public findOppositeAnchor(linkDoc: Doc, anchor: Doc): Doc {
+    public getOppositeAnchor(linkDoc: Doc, anchor: Doc): Doc {
         if (Doc.AreProtosEqual(anchor, Cast(linkDoc.anchor1, Doc, new Doc))) {
             return Cast(linkDoc.anchor2, Doc, new Doc);
         } else {
@@ -123,34 +255,17 @@ export class LinkManager {
         }
     }
 
-    // gets the groups associates with an anchor in a link
-    public getAnchorGroups(linkDoc: Doc, anchor: Doc): Array<Doc> {
-        if (Doc.AreProtosEqual(anchor, Cast(linkDoc.anchor1, Doc, new Doc))) {
-            return DocListCast(linkDoc.anchor1Groups);
-        } else {
-            return DocListCast(linkDoc.anchor2Groups);
-        }
-    }
 
-    // sets the groups of the given anchor in the given link
-    public setAnchorGroups(linkDoc: Doc, anchor: Doc, groups: Doc[]) {
-        if (Doc.AreProtosEqual(anchor, Cast(linkDoc.anchor1, Doc, new Doc))) {
-            linkDoc.anchor1Groups = new List<Doc>(groups);
-        } else {
-            linkDoc.anchor2Groups = new List<Doc>(groups);
-        }
-    }
-
-    @action
-    public addLinkProxy(proxy: Doc) {
-        LinkManager.Instance.linkProxies.push(proxy);
-    }
+    // @action
+    // public addLinkProxy(proxy: Doc) {
+    //     LinkManager.Instance.linkProxies.push(proxy);
+    // }
 
-    public findLinkProxy(sourceViewId: string, targetViewId: string): Doc | undefined {
-        let index = LinkManager.Instance.linkProxies.findIndex(p => {
-            return StrCast(p.sourceViewId) === sourceViewId && StrCast(p.targetViewId) === targetViewId;
-        });
-        return index > -1 ? LinkManager.Instance.linkProxies[index] : undefined;
-    }
+    // public findLinkProxy(sourceViewId: string, targetViewId: string): Doc | undefined {
+    //     let index = LinkManager.Instance.linkProxies.findIndex(p => {
+    //         return StrCast(p.sourceViewId) === sourceViewId && StrCast(p.targetViewId) === targetViewId;
+    //     });
+    //     return index > -1 ? LinkManager.Instance.linkProxies[index] : undefined;
+    // }
 
 }
\ No newline at end of file
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index 926273633..3a2752d7e 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -573,7 +573,7 @@ export class DocumentDecorations extends React.Component<{}, { value: string }>
         let linkButton = null;
         if (SelectionManager.SelectedDocuments().length > 0) {
             let selFirst = SelectionManager.SelectedDocuments()[0];
-            let linkCount = LinkManager.Instance.findAllRelatedLinks(selFirst.props.Document).length;
+            let linkCount = LinkManager.Instance.getAllRelatedLinks(selFirst.props.Document).length;
             linkButton = (<Flyout
                 anchorPoint={anchorPoints.RIGHT_TOP}
                 content={<LinkMenu docView={selFirst}
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 51630c29b..d90e9d23e 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -35,6 +35,8 @@ import { HistoryUtil } from '../util/History';
 import { CollectionBaseView } from './collections/CollectionBaseView';
 import PDFMenu from './pdf/PDFMenu';
 import { InkTool } from '../../new_fields/InkField';
+import { LinkManager } from '../util/LinkManager';
+import { List } from '../../new_fields/List';
 
 
 @observer
@@ -146,6 +148,11 @@ export class MainView extends React.Component {
             let freeformDoc = Docs.FreeformDocument([], { x: 0, y: 400, width: this.pwidth * .7, height: this.pheight, title: `WS collection ${list.length + 1}` });
             var dockingLayout = { content: [{ type: 'row', content: [CollectionDockingView.makeDocumentConfig(CurrentUserUtils.UserDocument, 150), CollectionDockingView.makeDocumentConfig(freeformDoc, 600)] }] };
             let mainDoc = Docs.DockDocument([CurrentUserUtils.UserDocument, freeformDoc], JSON.stringify(dockingLayout), { title: `Workspace ${list.length + 1}` }, id);
+            if (!CurrentUserUtils.UserDocument.linkManagerDoc) {
+                let linkManagerDoc = new Doc();
+                linkManagerDoc.allLinks = new List<Doc>([]);
+                CurrentUserUtils.UserDocument.linkManagerDoc = linkManagerDoc;
+            }
             list.push(mainDoc);
             // bcz: strangely, we need a timeout to prevent exceptions/issues initializing GoldenLayout (the rendering engine for Main Container)
             setTimeout(() => {
diff --git a/src/client/views/collections/CollectionDockingView.tsx b/src/client/views/collections/CollectionDockingView.tsx
index c82027da5..4140f8029 100644
--- a/src/client/views/collections/CollectionDockingView.tsx
+++ b/src/client/views/collections/CollectionDockingView.tsx
@@ -354,9 +354,9 @@ export class CollectionDockingView extends React.Component<SubCollectionViewProp
                     tab.reactComponents = [upDiv];
                     tab.element.append(upDiv);
                     counter.DashDocId = tab.contentItem.config.props.documentId;
-                    tab.reactionDisposer = reaction(() => [LinkManager.Instance.findAllRelatedLinks(doc), doc.title],
+                    tab.reactionDisposer = reaction(() => [LinkManager.Instance.getAllRelatedLinks(doc), doc.title],
                         () => {
-                            counter.innerHTML = LinkManager.Instance.findAllRelatedLinks(doc).length;
+                            counter.innerHTML = LinkManager.Instance.getAllRelatedLinks(doc).length;
                             tab.titleElement[0].textContent = doc.title;
                         }, { fireImmediately: true });
                     tab.titleElement[0].DashDocId = tab.contentItem.config.props.documentId;
diff --git a/src/client/views/collections/CollectionTreeView.tsx b/src/client/views/collections/CollectionTreeView.tsx
index 0b922b3c4..7bc3ad124 100644
--- a/src/client/views/collections/CollectionTreeView.tsx
+++ b/src/client/views/collections/CollectionTreeView.tsx
@@ -73,7 +73,7 @@ class TreeView extends React.Component<TreeViewProps> {
     @undoBatch delete = () => this.props.deleteDoc(this.props.document);
     @undoBatch openRight = async () => this.props.addDocTab(this.props.document, "openRight");
 
-    onPointerDown = (e: React.PointerEvent) => e.stopPropagation()
+    onPointerDown = (e: React.PointerEvent) => e.stopPropagation();
     onPointerEnter = (e: React.PointerEvent): void => {
         this.props.active() && (this.props.document.libraryBrush = true);
         if (e.buttons === 1 && SelectionManager.GetIsDragging()) {
@@ -115,7 +115,7 @@ class TreeView extends React.Component<TreeViewProps> {
         return this.props.document !== target && this.props.deleteDoc(doc) && addDoc(doc);
     }
     @action
-    indent = () => this.props.addDocument(this.props.document) && this.delete();
+    indent = () => this.props.addDocument(this.props.document) && this.delete()
 
     renderBullet() {
         let docList = Cast(this.props.document["data"], listSpec(Doc));
@@ -167,7 +167,7 @@ class TreeView extends React.Component<TreeViewProps> {
                 keyList.push(key);
             }
         });
-        if (LinkManager.Instance.findAllRelatedLinks(this.props.document).length > 0) keyList.push("links");
+        if (LinkManager.Instance.getAllRelatedLinks(this.props.document).length > 0) keyList.push("links");
         if (keyList.indexOf("data") !== -1) {
             keyList.splice(keyList.indexOf("data"), 1);
         }
@@ -281,9 +281,9 @@ class TreeView extends React.Component<TreeViewProps> {
         let ele: JSX.Element[] = [];
         let remDoc = (doc: Doc) => this.remove(doc, this._chosenKey);
         let addDoc = (doc: Doc, addBefore?: Doc, before?: boolean) => TreeView.AddDocToList(this.props.document, this._chosenKey, doc, addBefore, before);
-        let groups = LinkManager.Instance.findRelatedGroupedLinks(this.props.document);
+        let groups = LinkManager.Instance.getRelatedGroupedLinks(this.props.document);
         groups.forEach((groupLinkDocs, groupType) => {
-            let destLinks = groupLinkDocs.map(d => LinkManager.Instance.findOppositeAnchor(d, this.props.document));
+            let destLinks = groupLinkDocs.map(d => LinkManager.Instance.getOppositeAnchor(d, this.props.document));
             ele.push(
                 <div key={"treeviewlink-" + groupType + "subtitle"}>
                     <div className="collectionTreeView-subtitle">{groupType}:</div>
@@ -325,7 +325,7 @@ class TreeView extends React.Component<TreeViewProps> {
                         addDocTab={this.props.addDocTab}
                         setPreviewScript={emptyFunction}>
                     </CollectionSchemaPreview>
-                </div>
+                </div>;
             }
         }
         return <div className="treeViewItem-container" ref={this.createTreeDropTarget} onContextMenu={this.onWorkspaceContextMenu}>
@@ -364,14 +364,14 @@ class TreeView extends React.Component<TreeViewProps> {
                     TreeView.AddDocToList(docList[i - 1], fieldKey, child);
                     remove(child);
                 }
-            }
+            };
             let addDocument = (doc: Doc, relativeTo?: Doc, before?: boolean) => {
                 return add(doc, relativeTo ? relativeTo : docList[i], before !== undefined ? before : false);
-            }
+            };
             let rowHeight = () => {
                 let aspect = NumCast(child.nativeWidth, 0) / NumCast(child.nativeHeight, 0);
                 return aspect ? Math.min(child[WidthSym](), rowWidth()) / aspect : child[HeightSym]();
-            }
+            };
             return <TreeView
                 document={child}
                 treeViewId={treeViewId}
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
index 76e089f08..bb8e8a5c2 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormLinksView.tsx
@@ -98,17 +98,17 @@ export class CollectionFreeFormLinksView extends React.Component<CollectionViewP
         //     console.log("CONNECTION", StrCast(d.a.props.Document.title), StrCast(d.b.props.Document.title));
         // });
 
-        console.log("CONNECTIONS");
+        // console.log("CONNECTIONS");
 
         let connections = DocumentManager.Instance.LinkedDocumentViews.reduce((drawnPairs, connection) => {
             let srcViews = this.documentAnchors(connection.a);
             let targetViews = this.documentAnchors(connection.b);
 
-            console.log(srcViews.length, targetViews.length);
+            // console.log(srcViews.length, targetViews.length);
             let possiblePairs: { a: Doc, b: Doc, }[] = [];
             srcViews.map(sv => {
                 targetViews.map(tv => {
-                    console.log("PUSH", StrCast(sv.props.Document.title), StrCast(sv.props.Document.id), StrCast(tv.props.Document.title), StrCast(tv.props.Document.id));
+                    // console.log("PUSH", StrCast(sv.props.Document.title), StrCast(sv.props.Document.id), StrCast(tv.props.Document.title), StrCast(tv.props.Document.id));
                     possiblePairs.push({ a: sv.props.Document, b: tv.props.Document });
                 });
             });
@@ -142,7 +142,6 @@ export class CollectionFreeFormLinksView extends React.Component<CollectionViewP
     }
 
     render() {
-        console.log("\n");
         return (
             <div className="collectionfreeformlinksview-container">
                 <svg className="collectionfreeformlinksview-svgCanvas">
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx
index 1fc2cf770..7b185336b 100644
--- a/src/client/views/nodes/DocumentView.tsx
+++ b/src/client/views/nodes/DocumentView.tsx
@@ -285,7 +285,7 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
                 let subBulletDocs = await DocListCastAsync(this.props.Document.subBulletDocs);
                 let maximizedDocs = await DocListCastAsync(this.props.Document.maximizedDocs);
                 let summarizedDocs = await DocListCastAsync(this.props.Document.summarizedDocs);
-                let linkedDocs = LinkManager.Instance.findAllRelatedLinks(this.props.Document);
+                let linkedDocs = LinkManager.Instance.getAllRelatedLinks(this.props.Document);
                 let expandedDocs: Doc[] = [];
                 expandedDocs = subBulletDocs ? [...subBulletDocs, ...expandedDocs] : expandedDocs;
                 expandedDocs = maximizedDocs ? [...maximizedDocs, ...expandedDocs] : expandedDocs;
@@ -536,11 +536,6 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
 
     onPointerEnter = (e: React.PointerEvent): void => { this.props.Document.libraryBrush = true; };
     onPointerLeave = (e: React.PointerEvent): void => { this.props.Document.libraryBrush = false; };
-    onDragOver = (e: React.DragEvent): void => {
-        this.props.Document.libraryBrush = true;
-        console.log("dragOver");
-    };
-    onDragLeave = (e: React.DragEvent): void => { this.props.Document.libraryBrush = false; };
 
     isSelected = () => SelectionManager.IsSelected(this);
     @action select = (ctrlPressed: boolean) => { SelectionManager.SelectDoc(this, ctrlPressed); };
@@ -585,7 +580,6 @@ export class DocumentView extends DocComponent<DocumentViewProps, Document>(Docu
                     // display: display ? "block" : "none"
                 }}
                 onDrop={this.onDrop} onContextMenu={this.onContextMenu} onPointerDown={this.onPointerDown} onClick={this.onClick}
-                onDragOver={this.onDragOver} onDragLeave={this.onDragLeave}
                 onPointerEnter={this.onPointerEnter} onPointerLeave={this.onPointerLeave}
             >
                 {this.contents}
diff --git a/src/client/views/nodes/LinkButtonBox.scss b/src/client/views/nodes/LinkButtonBox.scss
index 24bfd2c9f..6be2dcf60 100644
--- a/src/client/views/nodes/LinkButtonBox.scss
+++ b/src/client/views/nodes/LinkButtonBox.scss
@@ -1,18 +1,18 @@
-.linkBox-cont {
-    width: 200px;
-    height: 100px;
-    background-color: black;
-    text-align: center;
-    color: white;
-    padding: 10px;
-    border-radius: 5px;
-    position: relative;
+// .linkBox-cont {
+//     width: 200px;
+//     height: 100px;
+//     background-color: black;
+//     text-align: center;
+//     color: white;
+//     padding: 10px;
+//     border-radius: 5px;
+//     position: relative;
 
-    .linkBox-cont-wrapper {
-        width: calc(100% - 20px);
-        position: absolute;
-        left: 50%;
-        top: 50%;
-        transform: translate(-50%, -50%);
-    }
-}
\ No newline at end of file
+//     .linkBox-cont-wrapper {
+//         width: calc(100% - 20px);
+//         position: absolute;
+//         left: 50%;
+//         top: 50%;
+//         transform: translate(-50%, -50%);
+//     }
+// }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkButtonBox.tsx b/src/client/views/nodes/LinkButtonBox.tsx
index 8a7c1ed8b..440847ead 100644
--- a/src/client/views/nodes/LinkButtonBox.tsx
+++ b/src/client/views/nodes/LinkButtonBox.tsx
@@ -1,63 +1,63 @@
-import React = require("react");
-import { library } from '@fortawesome/fontawesome-svg-core';
-import { faCaretUp, faFilePdf, faFilm, faImage, faObjectGroup, faStickyNote } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { computed, observable, runInAction } from "mobx";
-import { observer } from "mobx-react";
-import { FieldView, FieldViewProps } from './FieldView';
-import "./LinkButtonBox.scss";
-import { DocumentView } from "./DocumentView";
-import { Doc } from "../../../new_fields/Doc";
-import { LinkButtonField } from "../../../new_fields/LinkButtonField";
-import { Cast, StrCast, BoolCast } from "../../../new_fields/Types";
-import { CollectionDockingView } from "../collections/CollectionDockingView";
-import { DocumentManager } from "../../util/DocumentManager";
-import { Id } from "../../../new_fields/FieldSymbols";
-
-library.add(faCaretUp);
-library.add(faObjectGroup);
-library.add(faStickyNote);
-library.add(faFilePdf);
-library.add(faFilm);
-
-@observer
-export class LinkButtonBox extends React.Component<FieldViewProps> {
-    public static LayoutString() { return FieldView.LayoutString(LinkButtonBox); }
-
-    followLink = (): void => {
-        console.log("follow link???");
-        let field = Cast(this.props.Document[this.props.fieldKey], LinkButtonField, new LinkButtonField({ sourceViewId: "-1", targetViewId: "-1" }));
-        let targetView = DocumentManager.Instance.getDocumentViewById(field.data.targetViewId);
-        if (targetView && targetView.props.ContainingCollectionView) {
-            CollectionDockingView.Instance.AddRightSplit(targetView.props.ContainingCollectionView.props.Document);
-        }
-    }
-
-    render() {
-
-        let field = Cast(this.props.Document[this.props.fieldKey], LinkButtonField, new LinkButtonField({ sourceViewId: "-1", targetViewId: "-1" }));
-        let targetView = DocumentManager.Instance.getDocumentViewById(field.data.targetViewId);
-
-        let text = "Could not find link";
-        if (targetView) {
-            let context = targetView.props.ContainingCollectionView ? (" in the context of " + StrCast(targetView.props.ContainingCollectionView.props.Document.title)) : "";
-            text = "Link to " + StrCast(targetView.props.Document.title) + context;
-        }
-
-        let activeDvs = DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false));
-        let display = activeDvs.reduce((found, dv) => {
-            let matchSv = field.data.sourceViewId === StrCast(dv.props.Document[Id]);
-            let matchTv = field.data.targetViewId === StrCast(dv.props.Document[Id]);
-            let match = matchSv || matchTv;
-            return match || found;
-        }, false);
-
-        return (
-            <div className="linkBox-cont" style={{ display: display ? "block" : "none" }}>
-                <div className="linkBox-cont-wrapper">
-                    <p>{text}</p>
-                </div>
-            </div >
-        );
-    }
-}
\ No newline at end of file
+// import React = require("react");
+// import { library } from '@fortawesome/fontawesome-svg-core';
+// import { faCaretUp, faFilePdf, faFilm, faImage, faObjectGroup, faStickyNote } from '@fortawesome/free-solid-svg-icons';
+// import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+// import { computed, observable, runInAction } from "mobx";
+// import { observer } from "mobx-react";
+// import { FieldView, FieldViewProps } from './FieldView';
+// import "./LinkButtonBox.scss";
+// import { DocumentView } from "./DocumentView";
+// import { Doc } from "../../../new_fields/Doc";
+// import { LinkButtonField } from "../../../new_fields/LinkButtonField";
+// import { Cast, StrCast, BoolCast } from "../../../new_fields/Types";
+// import { CollectionDockingView } from "../collections/CollectionDockingView";
+// import { DocumentManager } from "../../util/DocumentManager";
+// import { Id } from "../../../new_fields/FieldSymbols";
+
+// library.add(faCaretUp);
+// library.add(faObjectGroup);
+// library.add(faStickyNote);
+// library.add(faFilePdf);
+// library.add(faFilm);
+
+// @observer
+// export class LinkButtonBox extends React.Component<FieldViewProps> {
+//     public static LayoutString() { return FieldView.LayoutString(LinkButtonBox); }
+
+//     followLink = (): void => {
+//         console.log("follow link???");
+//         let field = Cast(this.props.Document[this.props.fieldKey], LinkButtonField, new LinkButtonField({ sourceViewId: "-1", targetViewId: "-1" }));
+//         let targetView = DocumentManager.Instance.getDocumentViewById(field.data.targetViewId);
+//         if (targetView && targetView.props.ContainingCollectionView) {
+//             CollectionDockingView.Instance.AddRightSplit(targetView.props.ContainingCollectionView.props.Document);
+//         }
+//     }
+
+//     render() {
+
+//         let field = Cast(this.props.Document[this.props.fieldKey], LinkButtonField, new LinkButtonField({ sourceViewId: "-1", targetViewId: "-1" }));
+//         let targetView = DocumentManager.Instance.getDocumentViewById(field.data.targetViewId);
+
+//         let text = "Could not find link";
+//         if (targetView) {
+//             let context = targetView.props.ContainingCollectionView ? (" in the context of " + StrCast(targetView.props.ContainingCollectionView.props.Document.title)) : "";
+//             text = "Link to " + StrCast(targetView.props.Document.title) + context;
+//         }
+
+//         let activeDvs = DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false));
+//         let display = activeDvs.reduce((found, dv) => {
+//             let matchSv = field.data.sourceViewId === StrCast(dv.props.Document[Id]);
+//             let matchTv = field.data.targetViewId === StrCast(dv.props.Document[Id]);
+//             let match = matchSv || matchTv;
+//             return match || found;
+//         }, false);
+
+//         return (
+//             <div className="linkBox-cont" style={{ display: display ? "block" : "none" }}>
+//                 <div className="linkBox-cont-wrapper">
+//                     <p>{text}</p>
+//                 </div>
+//             </div >
+//         );
+//     }
+// }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkEditor.tsx b/src/client/views/nodes/LinkEditor.tsx
index 95199bae2..5f4f7d4f0 100644
--- a/src/client/views/nodes/LinkEditor.tsx
+++ b/src/client/views/nodes/LinkEditor.tsx
@@ -17,9 +17,8 @@ library.add(faArrowLeft, faEllipsisV, faTable, faTrash, faCog, faExchangeAlt, fa
 
 
 interface GroupTypesDropdownProps {
-    groupId: string;
     groupType: string;
-    setGroup: (groupId: string, group: string) => void;
+    setGroupType: (group: string) => void;
 }
 // this dropdown could be generalized
 @observer
@@ -32,20 +31,20 @@ class GroupTypesDropdown extends React.Component<GroupTypesDropdownProps> {
 
     @action
     createGroup = (groupType: string): void => {
-        this.props.setGroup(this.props.groupId, groupType);
-        LinkManager.Instance.groupMetadataKeys.set(groupType, []);
+        this.props.setGroupType(groupType);
+        LinkManager.Instance.addGroupType(groupType);
     }
 
     renderOptions = (): JSX.Element[] | JSX.Element => {
         if (this._searchTerm === "") return <></>;
 
-        let allGroupTypes = Array.from(LinkManager.Instance.groupMetadataKeys.keys());
+        let allGroupTypes = Array.from(LinkManager.Instance.getAllGroupTypes());
         let groupOptions = allGroupTypes.filter(groupType => groupType.toUpperCase().indexOf(this._searchTerm.toUpperCase()) > -1);
         let exactFound = groupOptions.findIndex(groupType => groupType.toUpperCase() === this._searchTerm.toUpperCase()) > -1;
 
         let options = groupOptions.map(groupType => {
             return <div key={groupType} className="linkEditor-option"
-                onClick={() => { this.props.setGroup(this.props.groupId, groupType); this.setGroupType(groupType); this.setSearchTerm(""); }}>{groupType}</div>;
+                onClick={() => { this.props.setGroupType(groupType); this.setGroupType(groupType); this.setSearchTerm(""); }}>{groupType}</div>;
         });
 
         // if search term does not already exist as a group type, give option to create new group type
@@ -85,7 +84,7 @@ class LinkMetadataEditor extends React.Component<LinkMetadataEditorProps> {
 
     @action
     setMetadataKey = (value: string): void => {
-        let groupMdKeys = new Array(...LinkManager.Instance.groupMetadataKeys.get(this.props.groupType)!);
+        let groupMdKeys = LinkManager.Instance.getMetadataKeysInGroup(this.props.groupType);
 
         // don't allow user to create existing key
         let newIndex = groupMdKeys.findIndex(key => key.toUpperCase() === value.toUpperCase());
@@ -98,12 +97,15 @@ class LinkMetadataEditor extends React.Component<LinkMetadataEditorProps> {
         }
 
         // set new value for key
-        let currIndex = groupMdKeys.findIndex(key => key.toUpperCase() === this._key.toUpperCase());
+        let currIndex = groupMdKeys.findIndex(key => {
+            console.log("finding index this", key.toUpperCase(), "that", this._key.toUpperCase());
+            return StrCast(key).toUpperCase() === this._key.toUpperCase();
+        });
         if (currIndex === -1) console.error("LinkMetadataEditor: key was not found");
         groupMdKeys[currIndex] = value;
 
         this._key = value;
-        LinkManager.Instance.groupMetadataKeys.set(this.props.groupType, groupMdKeys);
+        LinkManager.Instance.setMetadataKeysForGroup(this.props.groupType, groupMdKeys);
     }
 
     @action
@@ -116,13 +118,13 @@ class LinkMetadataEditor extends React.Component<LinkMetadataEditorProps> {
 
     @action
     removeMetadata = (): void => {
-        let groupMdKeys = new Array(...LinkManager.Instance.groupMetadataKeys.get(this.props.groupType)!);
+        let groupMdKeys = LinkManager.Instance.getMetadataKeysInGroup(this.props.groupType);
 
         let index = groupMdKeys.findIndex(key => key.toUpperCase() === this._key.toUpperCase());
         if (index === -1) console.error("LinkMetadataEditor: key was not found");
         groupMdKeys.splice(index, 1);
 
-        LinkManager.Instance.groupMetadataKeys.set(this.props.groupType, groupMdKeys);
+        LinkManager.Instance.setMetadataKeysForGroup(this.props.groupType, groupMdKeys);
         this._key = "";
     }
 
@@ -137,215 +139,176 @@ class LinkMetadataEditor extends React.Component<LinkMetadataEditorProps> {
     }
 }
 
-
-interface LinkEditorProps {
+interface LinkGroupEditorProps {
     sourceDoc: Doc;
     linkDoc: Doc;
-    showLinks: () => void;
+    groupDoc: Doc;
 }
 @observer
-export class LinkEditor extends React.Component<LinkEditorProps> {
+export class LinkGroupEditor extends React.Component<LinkGroupEditorProps> {
 
-    // map of temporary group id to the corresponding group doc
-    @observable private _groups: Map<string, Doc> = new Map();
-
-    constructor(props: LinkEditorProps) {
-        super(props);
+    @action
+    setGroupType = (groupType: string): void => {
+        console.log("SET GROUP TYPE TO", groupType);
+        this.props.groupDoc.type = groupType;
+        console.log("GROUP TYPE HAS BEEN SET TO ", StrCast(this.props.groupDoc.type));
+    }
 
-        let groups = new Map<string, Doc>();
-        let groupList = LinkManager.Instance.getAnchorGroups(props.linkDoc, props.sourceDoc);
-        groupList.forEach(groupDoc => {
-            let id = Utils.GenerateGuid();
-            groups.set(id, groupDoc);
-        });
-        this._groups = groups;
+    removeGroupFromLink = (groupType: string): void => {
+        LinkManager.Instance.removeGroupFromAnchor(this.props.linkDoc, this.props.sourceDoc, groupType);
     }
 
-    @action
-    deleteLink = (): void => {
-        let index = LinkManager.Instance.allLinks.indexOf(this.props.linkDoc);
-        LinkManager.Instance.allLinks.splice(index, 1);
-        this.props.showLinks();
+    deleteGroup = (groupType: string): void => {
+        LinkManager.Instance.deleteGroupType(groupType);
     }
 
-    @action
-    addGroup = (): void => {
-        // new group only gets added if there is not already a group with type "new group"
-        let index = Array.from(this._groups.values()).findIndex(groupDoc => {
-            return groupDoc.type === "New Group";
-        });
-        if (index > -1) return;
+    copyGroup = (groupType: string): void => {
+        let sourceGroupDoc = this.props.groupDoc;
+        let sourceMdDoc = Cast(sourceGroupDoc.metadata, Doc, new Doc);
 
-        // create new metadata document for group
-        let mdDoc = Docs.TextDocument();
-        mdDoc.proto!.anchor1 = this.props.sourceDoc.title;
-        mdDoc.proto!.anchor2 = LinkManager.Instance.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc).title;
+        let destDoc = LinkManager.Instance.getOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
+        // let destGroupList = LinkManager.Instance.getAnchorGroups(this.props.linkDoc, destDoc);
+        let keys = LinkManager.Instance.getMetadataKeysInGroup(groupType);
 
-        // create new group document
-        let groupDoc = Docs.TextDocument();
-        groupDoc.proto!.type = "New Group";
-        groupDoc.proto!.metadata = mdDoc;
+        // create new metadata doc with copied kvp
+        let destMdDoc = new Doc();
+        destMdDoc.anchor1 = StrCast(sourceMdDoc.anchor2);
+        destMdDoc.anchor2 = StrCast(sourceMdDoc.anchor1);
+        keys.forEach(key => {
+            let val = sourceMdDoc[key] === undefined ? "" : StrCast(sourceMdDoc[key]);
+            destMdDoc[key] = val;
+        });
 
-        this._groups.set(Utils.GenerateGuid(), groupDoc);
+        // create new group doc with new metadata doc
+        let destGroupDoc = new Doc();
+        destGroupDoc.type = groupType;
+        destGroupDoc.metadata = destMdDoc;
 
-        let linkDoc = this.props.linkDoc.proto ? this.props.linkDoc.proto : this.props.linkDoc;
-        LinkManager.Instance.setAnchorGroups(linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
+        LinkManager.Instance.addGroupToAnchor(this.props.linkDoc, destDoc, destGroupDoc, true);
     }
 
     @action
-    setGroupType = (groupId: string, groupType: string): void => {
-        let groupDoc = this._groups.get(groupId);
-        if (groupDoc) {
-            groupDoc.proto!.type = groupType;
-            this._groups.set(groupId, groupDoc);
-            LinkManager.Instance.setAnchorGroups(this.props.linkDoc, this.props.sourceDoc, Array.from(this._groups.values()));
-        }
-    }
-
-    removeGroupFromLink = (groupId: string, groupType: string): void => {
-        let groupDoc = this._groups.get(groupId);
-        if (!groupDoc) console.error("LinkEditor: group not found");
-        LinkManager.Instance.removeGroupFromAnchor(this.props.linkDoc, this.props.sourceDoc, groupType);
-        this._groups.delete(groupId);
-    }
-
-    deleteGroup = (groupId: string, groupType: string): void => {
-        let groupDoc = this._groups.get(groupId);
-        if (!groupDoc) console.error("LinkEditor: group not found");
-        LinkManager.Instance.deleteGroup(groupType);
-        this._groups.delete(groupId);
+    addMetadata = (groupType: string): void => {
+        let mdKeys = LinkManager.Instance.getMetadataKeysInGroup(groupType);
+        // only add "new key" if there is no other key with value "new key"; prevents spamming
+        if (mdKeys.indexOf("new key") === -1) mdKeys.push("new key");
+        LinkManager.Instance.setMetadataKeysForGroup(groupType, mdKeys);
     }
 
-    copyGroup = (groupId: string, groupType: string): void => {
-        let sourceGroupDoc = this._groups.get(groupId);
-        let sourceMdDoc = Cast(sourceGroupDoc!.metadata, Doc, new Doc);
-        let destDoc = LinkManager.Instance.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
-        let destGroupList = LinkManager.Instance.getAnchorGroups(this.props.linkDoc, destDoc);
-        let keys = LinkManager.Instance.groupMetadataKeys.get(groupType);
-
-        // create new metadata doc with copied kvp
-        let destMdDoc = Docs.TextDocument();
-        destMdDoc.proto!.anchor1 = StrCast(sourceMdDoc.anchor2);
-        destMdDoc.proto!.anchor2 = StrCast(sourceMdDoc.anchor1);
-        if (keys) {
-            keys.forEach(key => {
-                let val = sourceMdDoc[key] === undefined ? "" : StrCast(sourceMdDoc[key]);
-                destMdDoc[key] = val;
+    renderMetadata = (): JSX.Element[] => {
+        let metadata: Array<JSX.Element> = [];
+        let groupDoc = this.props.groupDoc;
+        let mdDoc = Cast(groupDoc.metadata, Doc, new Doc);
+        let groupType = StrCast(groupDoc.type);
+        let groupMdKeys = LinkManager.Instance.getMetadataKeysInGroup(groupType);
+        if (groupMdKeys) {
+            groupMdKeys.forEach((key, index) => {
+                metadata.push(
+                    <LinkMetadataEditor key={"mded-" + index} groupType={groupType} mdDoc={mdDoc} mdKey={key} mdValue={(mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])} />
+                );
             });
         }
-
-        // create new group doc with new metadata doc
-        let destGroupDoc = Docs.TextDocument();
-        destGroupDoc.proto!.type = groupType;
-        destGroupDoc.proto!.metadata = destMdDoc;
-
-        // if group does not already exist on opposite anchor, create group doc
-        let index = destGroupList.findIndex(groupDoc => { StrCast(groupDoc.type).toUpperCase() === groupType.toUpperCase(); });
-        if (index > -1) {
-            destGroupList[index] = destGroupDoc;
-        } else {
-            destGroupList.push(destGroupDoc);
-        }
-
-        LinkManager.Instance.setAnchorGroups(this.props.linkDoc, destDoc, destGroupList);
+        return metadata;
     }
 
-    viewGroupAsTable = (groupId: string, groupType: string): JSX.Element => {
-        let keys = LinkManager.Instance.groupMetadataKeys.get(groupType);
-        let groupDoc = this._groups.get(groupId);
-        if (keys && groupDoc) {
-            let docs: Doc[] = LinkManager.Instance.findAllMetadataDocsInGroup(groupType);
-            let createTable = action(() => Docs.SchemaDocument(["anchor1", "anchor2", ...keys!], docs, { width: 200, height: 200, title: groupType + " table" }));
-            let ref = React.createRef<HTMLDivElement>();
-            return <div ref={ref}><button className="linkEditor-button" onPointerDown={SetupDrag(ref, createTable)}><FontAwesomeIcon icon="table" size="sm" /></button></div>;
-        } else {
-            return <button className="linkEditor-button" disabled><FontAwesomeIcon icon="table" size="sm" /></button>;
-        }
+    viewGroupAsTable = (groupType: string): JSX.Element => {
+        let keys = LinkManager.Instance.getMetadataKeysInGroup(groupType);
+        let docs: Doc[] = LinkManager.Instance.getAllMetadataDocsInGroup(groupType);
+        let createTable = action(() => Docs.SchemaDocument(["anchor1", "anchor2", ...keys], docs, { width: 500, height: 300, title: groupType + " table" }));
+        let ref = React.createRef<HTMLDivElement>();
+        return <div ref={ref}><button className="linkEditor-button" onPointerDown={SetupDrag(ref, createTable)}><FontAwesomeIcon icon="table" size="sm" /></button></div>;
     }
 
-    renderGroup = (groupId: string, groupDoc: Doc): JSX.Element => {
-        let type = StrCast(groupDoc.type);
-        if ((type && LinkManager.Instance.groupMetadataKeys.get(type)) || type === "New Group") {
-            let buttons;
-            if (type === "New Group") {
-                buttons = (
-                    <>
-                        <button className="linkEditor-button" disabled={true} title="Add KVP"><FontAwesomeIcon icon="plus" size="sm" /></button>
-                        <button className="linkEditor-button" disabled title="Copy group to opposite anchor"><FontAwesomeIcon icon="exchange-alt" size="sm" /></button>
-                        <button className="linkEditor-button" onClick={() => this.removeGroupFromLink(groupId, type)} title="Remove group from link"><FontAwesomeIcon icon="times" size="sm" /></button>
-                        <button className="linkEditor-button" disabled title="Delete group"><FontAwesomeIcon icon="trash" size="sm" /></button>
-                        <button className="linkEditor-button" disabled><FontAwesomeIcon icon="table" size="sm" /></button>
-                    </>
-                );
-            } else {
-                buttons = (
-                    <>
-                        <button className="linkEditor-button" onClick={() => this.addMetadata(StrCast(groupDoc.proto!.type))} title="Add KVP"><FontAwesomeIcon icon="plus" size="sm" /></button>
-                        <button className="linkEditor-button" onClick={() => this.copyGroup(groupId, type)} title="Copy group to opposite anchor"><FontAwesomeIcon icon="exchange-alt" size="sm" /></button>
-                        <button className="linkEditor-button" onClick={() => this.removeGroupFromLink(groupId, type)} title="Remove group from link"><FontAwesomeIcon icon="times" size="sm" /></button>
-                        <button className="linkEditor-button" onClick={() => this.deleteGroup(groupId, type)} title="Delete group"><FontAwesomeIcon icon="trash" size="sm" /></button>
-                        {this.viewGroupAsTable(groupId, type)}
-                    </>
-                );
-            }
-
-            return (
-                <div key={groupId} className="linkEditor-group">
-                    <div className="linkEditor-group-row">
-                        <p className="linkEditor-group-row-label">type:</p>
-                        <GroupTypesDropdown groupId={groupId} groupType={StrCast(groupDoc.proto!.type)} setGroup={this.setGroupType} />
-                    </div>
-                    {this.renderMetadata(groupId)}
-                    <div className="linkEditor-group-buttons">
-                        {buttons}
-                    </div>
-                </div>
+    render() {
+        let groupType = StrCast(this.props.groupDoc.type);
+        // if ((groupType && LinkManager.Instance.getMetadataKeysInGroup(groupType).length > 0) || groupType === "") {
+        let buttons;
+        if (groupType === "") {
+            buttons = (
+                <>
+                    <button className="linkEditor-button" disabled={true} title="Add KVP"><FontAwesomeIcon icon="plus" size="sm" /></button>
+                    <button className="linkEditor-button" disabled title="Copy group to opposite anchor"><FontAwesomeIcon icon="exchange-alt" size="sm" /></button>
+                    <button className="linkEditor-button" onClick={() => this.removeGroupFromLink(groupType)} title="Remove group from link"><FontAwesomeIcon icon="times" size="sm" /></button>
+                    <button className="linkEditor-button" disabled title="Delete group"><FontAwesomeIcon icon="trash" size="sm" /></button>
+                    <button className="linkEditor-button" disabled><FontAwesomeIcon icon="table" size="sm" /></button>
+                </>
             );
         } else {
-            return <></>;
+            buttons = (
+                <>
+                    <button className="linkEditor-button" onClick={() => this.addMetadata(groupType)} title="Add KVP"><FontAwesomeIcon icon="plus" size="sm" /></button>
+                    <button className="linkEditor-button" onClick={() => this.copyGroup(groupType)} title="Copy group to opposite anchor"><FontAwesomeIcon icon="exchange-alt" size="sm" /></button>
+                    <button className="linkEditor-button" onClick={() => this.removeGroupFromLink(groupType)} title="Remove group from link"><FontAwesomeIcon icon="times" size="sm" /></button>
+                    <button className="linkEditor-button" onClick={() => this.deleteGroup(groupType)} title="Delete group"><FontAwesomeIcon icon="trash" size="sm" /></button>
+                    {this.viewGroupAsTable(groupType)}
+                </>
+            );
         }
+
+        return (
+            <div className="linkEditor-group">
+                <div className="linkEditor-group-row">
+                    <p className="linkEditor-group-row-label">type:</p>
+                    <GroupTypesDropdown groupType={groupType} setGroupType={this.setGroupType} />
+                </div>
+                {this.renderMetadata()}
+                <div className="linkEditor-group-buttons">
+                    {buttons}
+                </div>
+            </div>
+        );
     }
+    // else {
+    //     return <></>;
+    // }
+    // }
+}
+
 
+interface LinkEditorProps {
+    sourceDoc: Doc;
+    linkDoc: Doc;
+    showLinks: () => void;
+}
+@observer
+export class LinkEditor extends React.Component<LinkEditorProps> {
 
     @action
-    addMetadata = (groupType: string): void => {
-        console.log("ADD MD");
-        let mdKeys = LinkManager.Instance.groupMetadataKeys.get(groupType);
-        if (mdKeys) {
-            // only add "new key" if there is no other key with value "new key"; prevents spamming
-            if (mdKeys.indexOf("new key") === -1) mdKeys.push("new key");
-        } else {
-            mdKeys = ["new key"];
-        }
-        LinkManager.Instance.groupMetadataKeys.set(groupType, mdKeys);
+    deleteLink = (): void => {
+        LinkManager.Instance.deleteLink(this.props.linkDoc);
+        this.props.showLinks();
     }
 
-    renderMetadata = (groupId: string): JSX.Element[] => {
-        let metadata: Array<JSX.Element> = [];
-        let groupDoc = this._groups.get(groupId);
-        if (groupDoc) {
-            let mdDoc = Cast(groupDoc.proto!.metadata, Doc, new Doc);
-            let groupType = StrCast(groupDoc.proto!.type);
-            let groupMdKeys = LinkManager.Instance.groupMetadataKeys.get(groupType);
-            if (groupMdKeys) {
-                groupMdKeys.forEach((key, index) => {
-                    metadata.push(
-                        <LinkMetadataEditor key={"mded-" + index} groupType={groupType} mdDoc={mdDoc} mdKey={key} mdValue={(mdDoc[key] === undefined) ? "" : StrCast(mdDoc[key])} />
-                    );
-                });
-            }
-        }
-        return metadata;
+    @action
+    addGroup = (): void => {
+        // create new metadata document for group
+        let mdDoc = new Doc();
+        mdDoc.anchor1 = this.props.sourceDoc.title;
+        mdDoc.anchor2 = LinkManager.Instance.getOppositeAnchor(this.props.linkDoc, this.props.sourceDoc).title;
+
+        // create new group document
+        let groupDoc = new Doc();
+        groupDoc.type = "";
+        groupDoc.metadata = mdDoc;
+
+        LinkManager.Instance.addGroupToAnchor(this.props.linkDoc, this.props.sourceDoc, groupDoc);
     }
 
     render() {
-        let destination = LinkManager.Instance.findOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
+        let destination = LinkManager.Instance.getOppositeAnchor(this.props.linkDoc, this.props.sourceDoc);
 
-        let groups: Array<JSX.Element> = [];
-        this._groups.forEach((groupDoc, groupId) => {
-            groups.push(this.renderGroup(groupId, groupDoc));
+        let groupList = LinkManager.Instance.getAnchorGroups(this.props.linkDoc, this.props.sourceDoc);
+        console.log("NUM GROUPS", groupList.length);
+        let groups = groupList.map(groupDoc => {
+            return <LinkGroupEditor key={"gred-" + StrCast(groupDoc.type)} linkDoc={this.props.linkDoc} sourceDoc={this.props.sourceDoc} groupDoc={groupDoc} />;
         });
 
+
+        // let groups: Array<JSX.Element> = [];
+        // this._groups.forEach((groupDoc, groupId) => {
+        //     groups.push(this.renderGroup(groupId, groupDoc));
+        // });
+
         return (
             <div className="linkEditor">
                 <button className="linkEditor-back" onPointerDown={() => this.props.showLinks()}><FontAwesomeIcon icon="arrow-left" size="sm" /></button>
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index f96c7d2e4..04ca47db3 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -38,7 +38,7 @@ export class LinkMenu extends React.Component<Props> {
 
     render() {
         let sourceDoc = this.props.docView.props.Document;
-        let groups: Map<string, Doc[]> = LinkManager.Instance.findRelatedGroupedLinks(sourceDoc);
+        let groups: Map<string, Doc[]> = LinkManager.Instance.getRelatedGroupedLinks(sourceDoc);
         if (this._editingLink === undefined) {
             return (
                 <div className="linkMenu">
diff --git a/src/client/views/nodes/LinkMenuGroup.tsx b/src/client/views/nodes/LinkMenuGroup.tsx
index 229143d99..71326f703 100644
--- a/src/client/views/nodes/LinkMenuGroup.tsx
+++ b/src/client/views/nodes/LinkMenuGroup.tsx
@@ -42,10 +42,10 @@ export class LinkMenuGroup extends React.Component<LinkMenuGroupProps> {
             document.removeEventListener("pointermove", this.onLinkButtonMoved);
             document.removeEventListener("pointerup", this.onLinkButtonUp);
 
-            let draggedDocs = this.props.group.map(linkDoc => LinkManager.Instance.findOppositeAnchor(linkDoc, this.props.sourceDoc));
+            let draggedDocs = this.props.group.map(linkDoc => LinkManager.Instance.getOppositeAnchor(linkDoc, this.props.sourceDoc));
             let dragData = new DragManager.DocumentDragData(draggedDocs);
 
-            DragManager.StartLinkedDocumentDrag([this._drag.current], dragData, e.x, e.y, {
+            DragManager.StartLinkedDocumentDrag([this._drag.current], this.props.sourceDoc, dragData, e.x, e.y, {
                 handlers: {
                     dragComplete: action(emptyFunction),
                 },
@@ -57,7 +57,7 @@ export class LinkMenuGroup extends React.Component<LinkMenuGroupProps> {
 
     render() {
         let groupItems = this.props.group.map(linkDoc => {
-            let destination = LinkManager.Instance.findOppositeAnchor(linkDoc, this.props.sourceDoc);
+            let destination = LinkManager.Instance.getOppositeAnchor(linkDoc, this.props.sourceDoc);
             return <LinkMenuItem key={destination[Id] + this.props.sourceDoc[Id]} groupType={this.props.groupType}
                 linkDoc={linkDoc} sourceDoc={this.props.sourceDoc} destinationDoc={destination} showEditor={this.props.showEditor} />;
         });
@@ -69,6 +69,6 @@ export class LinkMenuGroup extends React.Component<LinkMenuGroupProps> {
                     {groupItems}
                 </div>
             </div>
-        )
+        );
     }
 }
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkMenuItem.tsx b/src/client/views/nodes/LinkMenuItem.tsx
index 42ef353b7..28694721d 100644
--- a/src/client/views/nodes/LinkMenuItem.tsx
+++ b/src/client/views/nodes/LinkMenuItem.tsx
@@ -53,8 +53,8 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
         let mdRows: Array<JSX.Element> = [];
         if (groupDoc) {
             let mdDoc = Cast(groupDoc.metadata, Doc, new Doc);
-            let keys = LinkManager.Instance.groupMetadataKeys.get(this.props.groupType);
-            mdRows = keys!.map(key => {
+            let keys = LinkManager.Instance.getMetadataKeysInGroup(this.props.groupType);//groupMetadataKeys.get(this.props.groupType);
+            mdRows = keys.map(key => {
                 return (<div key={key} className="link-metadata-row"><b>{key}</b>: {StrCast(mdDoc[key])}</div>);
             });
         }
@@ -88,7 +88,7 @@ export class LinkMenuItem extends React.Component<LinkMenuItemProps> {
 
     render() {
 
-        let keys = LinkManager.Instance.groupMetadataKeys.get(this.props.groupType);
+        let keys = LinkManager.Instance.getMetadataKeysInGroup(this.props.groupType);//groupMetadataKeys.get(this.props.groupType);
         let canExpand = keys ? keys.length > 0 : false;
 
         return (
diff --git a/src/new_fields/Doc.ts b/src/new_fields/Doc.ts
index fda788f2d..9b104184f 100644
--- a/src/new_fields/Doc.ts
+++ b/src/new_fields/Doc.ts
@@ -234,23 +234,20 @@ export namespace Doc {
     export function MakeCopy(doc: Doc, copyProto: boolean = false): Doc {
         const copy = new Doc;
         Object.keys(doc).forEach(key => {
-            console.log(key);
             const field = doc[key];
             if (key === "proto" && copyProto) {
-                console.log(1);
                 if (field instanceof Doc) {
-                    console.log(2);
                     copy[key] = Doc.MakeCopy(field);
                 }
             } else {
                 if (field instanceof RefField) {
-                    console.log(3);
+                    console.log("equals field, ref", key);
                     copy[key] = field;
                 } else if (field instanceof ObjectField) {
-                    console.log(4);
+                    console.log("copy field, object", key);
                     copy[key] = ObjectField.MakeCopy(field);
                 } else {
-                    console.log(5);
+                    console.log("equals field", key);
                     copy[key] = field;
                 }
             }
diff --git a/src/new_fields/LinkButtonField.ts b/src/new_fields/LinkButtonField.ts
index 92e1ed922..e6d1de749 100644
--- a/src/new_fields/LinkButtonField.ts
+++ b/src/new_fields/LinkButtonField.ts
@@ -1,35 +1,35 @@
-import { Deserializable } from "../client/util/SerializationHelper";
-import { serializable, primitive, createSimpleSchema, object } from "serializr";
-import { ObjectField } from "./ObjectField";
-import { Copy, ToScriptString } from "./FieldSymbols";
-import { Doc } from "./Doc";
-import { DocumentView } from "../client/views/nodes/DocumentView";
+// import { Deserializable } from "../client/util/SerializationHelper";
+// import { serializable, primitive, createSimpleSchema, object } from "serializr";
+// import { ObjectField } from "./ObjectField";
+// import { Copy, ToScriptString } from "./FieldSymbols";
+// import { Doc } from "./Doc";
+// import { DocumentView } from "../client/views/nodes/DocumentView";
 
-export type LinkButtonData = {
-    sourceViewId: string,
-    targetViewId: string
-};
+// export type LinkButtonData = {
+//     sourceViewId: string,
+//     targetViewId: string
+// };
 
-const LinkButtonSchema = createSimpleSchema({
-    sourceViewId: true,
-    targetViewId: true
-});
+// const LinkButtonSchema = createSimpleSchema({
+//     sourceViewId: true,
+//     targetViewId: true
+// });
 
-@Deserializable("linkButton")
-export class LinkButtonField extends ObjectField {
-    @serializable(object(LinkButtonSchema))
-    readonly data: LinkButtonData;
+// @Deserializable("linkButton")
+// export class LinkButtonField extends ObjectField {
+//     @serializable(object(LinkButtonSchema))
+//     readonly data: LinkButtonData;
 
-    constructor(data: LinkButtonData) {
-        super();
-        this.data = data;
-    }
+//     constructor(data: LinkButtonData) {
+//         super();
+//         this.data = data;
+//     }
 
-    [Copy]() {
-        return new LinkButtonField(this.data);
-    }
+//     [Copy]() {
+//         return new LinkButtonField(this.data);
+//     }
 
-    [ToScriptString]() {
-        return "invalid";
-    }
-}
+//     [ToScriptString]() {
+//         return "invalid";
+//     }
+// }
-- 
cgit v1.2.3-70-g09d2


From 69e37491908b5c189b94f780994c1f142c69be2e Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Wed, 26 Jun 2019 14:15:40 -0400
Subject: minor changes

---
 src/client/util/DocumentManager.ts       |  1 -
 src/client/util/DragManager.ts           | 24 +--------
 src/client/util/LinkManager.ts           | 18 ++++---
 src/client/views/nodes/LinkEditor.scss   | 12 ++---
 src/client/views/nodes/LinkEditor.tsx    | 14 ++++--
 src/client/views/nodes/LinkMenu.scss     | 84 +++++++++++++++++++++++++++++++
 src/client/views/nodes/LinkMenu.tsx      | 11 ++--
 src/client/views/nodes/LinkMenuItem.scss | 86 --------------------------------
 src/client/views/nodes/LinkMenuItem.tsx  |  5 +-
 9 files changed, 117 insertions(+), 138 deletions(-)
 delete mode 100644 src/client/views/nodes/LinkMenuItem.scss

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index d7798ebfd..877475347 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -68,7 +68,6 @@ export class DocumentManager {
         //gets document view that is in a freeform canvas collection
         DocumentManager.Instance.DocumentViews.map(view => {
             let doc = view.props.Document;
-            // if (view.props.ContainingCollectionView instanceof CollectionFreeFormView) {
 
             if (doc === toFind) {
                 toReturn.push(view);
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 27063d1c2..8e6abe18e 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -71,7 +71,6 @@ export async function DragLinksAsDocuments(dragEle: HTMLElement, x: number, y: n
             });
         }
     }
-    // draggedDocs.push(...draggedFromDocs);
     if (draggedDocs.length) {
         let moddrag: Doc[] = [];
         for (const draggedDoc of draggedDocs) {
@@ -79,20 +78,6 @@ export async function DragLinksAsDocuments(dragEle: HTMLElement, x: number, y: n
             if (doc) moddrag.push(doc);
         }
         let dragData = new DragManager.DocumentDragData(moddrag.length ? moddrag : draggedDocs);
-        // dragData.moveDocument = (document, targetCollection, addDocument) => {
-        //     return false;
-        // };
-
-        // runInAction(() => StartDragFunctions.map(func => func()));
-        // (eles, dragData, downX, downY, options,
-        //     (dropData: { [id: string]: any }) => {
-        //         (dropData.droppedDocuments = dragData.userDropAction === "alias" || (!dragData.userDropAction && dragData.dropAction === "alias") ?
-        //             dragData.draggedDocuments.map(d => Doc.MakeAlias(d)) :
-        //             dragData.userDropAction === "copy" || (!dragData.userDropAction && dragData.dropAction === "copy") ?
-        //                 dragData.draggedDocuments.map(d => Doc.MakeCopy(d, true)) :
-        //                 dragData.draggedDocuments
-        //         );
-        //     });
         DragManager.StartLinkedDocumentDrag([dragEle], sourceDoc, dragData, x, y, {
             handlers: {
                 dragComplete: action(emptyFunction),
@@ -230,19 +215,14 @@ export namespace DragManager {
             (dropData: { [id: string]: any }) => {
                 dropData.droppedDocuments = dragData.draggedDocuments.map(d => {
                     let dv = DocumentManager.Instance.getDocumentView(d);
-                    // return d;
                     if (dv) {
                         if (dv.props.ContainingCollectionView === SelectionManager.SelectedDocuments()[0].props.ContainingCollectionView) {
                             return d;
                         } else {
-                            let r = Doc.MakeAlias(d);
-                            // DocUtils.MakeLink(r, sourceDoc);
-                            return r;
+                            return Doc.MakeAlias(d);
                         }
                     } else {
-                        let r = Doc.MakeAlias(d);
-                        // DocUtils.MakeLink(r, sourceDoc);
-                        return r;
+                        return Doc.MakeAlias(d);
                     }
                 });
 
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 97c816001..1db686751 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -151,7 +151,7 @@ export class LinkManager {
     // removes group doc of given group type only from given anchor on given link
     public removeGroupFromAnchor(linkDoc: Doc, anchor: Doc, groupType: string) {
         let groups = LinkManager.Instance.getAnchorGroups(linkDoc, anchor);
-        let newGroups = groups.filter(groupDoc => { StrCast(groupDoc.type).toUpperCase() !== groupType.toUpperCase() });
+        let newGroups = groups.filter(groupDoc => StrCast(groupDoc.type).toUpperCase() !== groupType.toUpperCase());
         LinkManager.Instance.setAnchorGroups(linkDoc, anchor, newGroups);
     }
 
@@ -165,23 +165,25 @@ export class LinkManager {
             if (groups.length > 0) {
                 groups.forEach(groupDoc => {
                     let groupType = StrCast(groupDoc.type);
-                    let group = anchorGroups.get(groupType);
-                    if (group) group.push(link);
-                    else group = [link];
-                    anchorGroups.set(groupType, group);
+                    if (groupType === "") {
+                        let group = anchorGroups.get("*");
+                        anchorGroups.set("*", group ? [...group, link] : [link]);
+                    } else {
+                        let group = anchorGroups.get(groupType);
+                        anchorGroups.set(groupType, group ? [...group, link] : [link]);
+                    }
                 });
             } else {
                 // if link is in no groups then put it in default group
                 let group = anchorGroups.get("*");
-                if (group) group.push(link);
-                else group = [link];
-                anchorGroups.set("*", group);
+                anchorGroups.set("*", group ? [...group, link] : [link]);
             }
 
         });
         return anchorGroups;
     }
 
+    // gets a list of strings representing the keys of the metadata associated with the given group type
     public getMetadataKeysInGroup(groupType: string): string[] {
         if (LinkManager.Instance.LinkManagerDoc) {
             return LinkManager.Instance.LinkManagerDoc[groupType] ? Cast(LinkManager.Instance.LinkManagerDoc[groupType], listSpec("string"), []) : [];
diff --git a/src/client/views/nodes/LinkEditor.scss b/src/client/views/nodes/LinkEditor.scss
index 2602b8816..1424d7633 100644
--- a/src/client/views/nodes/LinkEditor.scss
+++ b/src/client/views/nodes/LinkEditor.scss
@@ -10,18 +10,15 @@
     margin-bottom: 6px;
 }
 
-.linKEditor-info {
+.linkEditor-info {
     border-bottom: 0.5px solid $light-color-secondary; 
     padding-bottom: 6px;
     margin-bottom: 6px;
     display: flex;
     justify-content: space-between;
 
-    .linkEditor-delete {
-        width: 20px;
-        height: 20px;
-        margin-left: 6px;
-        padding: 0;
+    .linkEditor-linkedTo {
+        width: calc(100% - 26px);
     }
 }
 
@@ -105,8 +102,7 @@
         cursor: pointer;
 
         &:hover {
-            background-color: $intermediate-color;
-            font-weight: bold;
+            background-color: lightgray;
         }
     }
 }
diff --git a/src/client/views/nodes/LinkEditor.tsx b/src/client/views/nodes/LinkEditor.tsx
index 87ebeefdb..51efcc36d 100644
--- a/src/client/views/nodes/LinkEditor.tsx
+++ b/src/client/views/nodes/LinkEditor.tsx
@@ -11,7 +11,6 @@ import { faArrowLeft, faEllipsisV, faTable, faTrash, faCog, faExchangeAlt, faTim
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { SetupDrag } from "../../util/DragManager";
-import { anchorPoints, Flyout } from "../DocumentDecorations";
 
 library.add(faArrowLeft, faEllipsisV, faTable, faTrash, faCog, faExchangeAlt, faTimes, faPlus);
 
@@ -35,6 +34,11 @@ class GroupTypesDropdown extends React.Component<GroupTypesDropdownProps> {
         LinkManager.Instance.addGroupType(groupType);
     }
 
+    onChange = (val: string): void => {
+        this.setSearchTerm(val);
+        this.setGroupType(val);
+    }
+
     renderOptions = (): JSX.Element[] | JSX.Element => {
         if (this._searchTerm === "") return <></>;
 
@@ -59,12 +63,12 @@ class GroupTypesDropdown extends React.Component<GroupTypesDropdownProps> {
     render() {
         return (
             <div className="linkEditor-dropdown">
-                <input type="text" value={this._groupType} placeholder="Search for a group or create a new group"
-                    onChange={e => { this.setSearchTerm(e.target.value); this.setGroupType(e.target.value); }}></input>
+                <input type="text" value={this._groupType} placeholder="Search for or create a new group"
+                    onChange={e => this.onChange(e.target.value)}></input>
                 <div className="linkEditor-options-wrapper">
                     {this.renderOptions()}
                 </div>
-            </div>
+            </div >
         );
     }
 }
@@ -326,7 +330,7 @@ export class LinkEditor extends React.Component<LinkEditorProps> {
                 <button className="linkEditor-back" onPointerDown={() => this.props.showLinks()}><FontAwesomeIcon icon="arrow-left" size="sm" /></button>
                 <div className="linkEditor-info">
                     <p className="linkEditor-linkedTo">editing link to: <b>{destination.proto!.title}</b></p>
-                    <button className="linkEditor-delete linkEditor-button" onPointerDown={() => this.deleteLink()} title="Delete link"><FontAwesomeIcon icon="trash" size="sm" /></button>
+                    <button className="linkEditor-button" onPointerDown={() => this.deleteLink()} title="Delete link"><FontAwesomeIcon icon="trash" size="sm" /></button>
                 </div>
                 <div className="linkEditor-groupsLabel">
                     <b>Relationships:</b>
diff --git a/src/client/views/nodes/LinkMenu.scss b/src/client/views/nodes/LinkMenu.scss
index 1dd933c32..429977326 100644
--- a/src/client/views/nodes/LinkMenu.scss
+++ b/src/client/views/nodes/LinkMenu.scss
@@ -46,5 +46,89 @@
     }
 }
 
+.linkMenu-item {
+    // border-top: 0.5px solid $main-accent; 
+    position: relative;
+    display: flex;
+    font-size: 12px;
+    
+
+    .link-name {
+        position: relative;
+
+        p {
+            padding: 4px 6px;
+            line-height: 12px;
+            border-radius: 5px;
+            overflow-wrap: break-word;
+        }
+    }
+
+    .linkMenu-item-content {
+        width: 100%;
+    }
+    
+    .link-metadata {
+        padding: 0 10px 0 16px;
+        margin-bottom: 4px;
+        color: $main-accent;
+        font-style: italic;
+        font-size: 10.5px;
+    }
+
+    &:hover {
+        .linkMenu-item-buttons {
+            display: flex;
+        }
+        .linkMenu-item-content {
+            &.expand-two p {
+                width: calc(100% - 52px);
+                background-color: lightgray;
+            }
+            &.expand-three p {
+                width: calc(100% - 84px);
+                background-color: lightgray;
+            }
+        }
+    }
+}
+
+.linkMenu-item-buttons {
+    display: none;
+    position: absolute;
+    top: 50%;
+    right: 0;
+    transform: translateY(-50%);
+
+    .button {
+        width: 20px;
+        height: 20px;
+        margin: 0;
+        margin-right: 6px;
+        border-radius: 50%;
+        cursor: pointer;
+        pointer-events: auto;
+        background-color: $dark-color;
+        color: $light-color;
+        font-size: 65%;
+        transition: transform 0.2s;
+        text-align: center;
+        position: relative;
+
+        .fa-icon {
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%);
+        }
+
+        &:last-child {
+            margin-right: 0;
+        }
+        &:hover {
+            background: $main-accent;
+        }
+    }
+}
 
 
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 04ca47db3..8ef899cfc 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -1,15 +1,11 @@
 import { action, observable } from "mobx";
 import { observer } from "mobx-react";
 import { DocumentView } from "./DocumentView";
-import { LinkMenuItem } from "./LinkMenuItem";
 import { LinkEditor } from "./LinkEditor";
 import './LinkMenu.scss';
 import React = require("react");
-import { Doc, DocListCast } from "../../../new_fields/Doc";
-import { Id } from "../../../new_fields/FieldSymbols";
+import { Doc } from "../../../new_fields/Doc";
 import { LinkManager } from "../../util/LinkManager";
-import { DragLinksAsDocuments, DragManager } from "../../util/DragManager";
-import { emptyFunction } from "../../../Utils";
 import { LinkMenuGroup } from "./LinkMenuGroup";
 
 interface Props {
@@ -22,6 +18,11 @@ export class LinkMenu extends React.Component<Props> {
 
     @observable private _editingLink?: Doc;
 
+    @action
+    componentWillReceiveProps() {
+        this._editingLink = undefined;
+    }
+
     renderAllGroups = (groups: Map<string, Array<Doc>>): Array<JSX.Element> => {
         let linkItems: Array<JSX.Element> = [];
         groups.forEach((group, groupType) => {
diff --git a/src/client/views/nodes/LinkMenuItem.scss b/src/client/views/nodes/LinkMenuItem.scss
deleted file mode 100644
index 175a93cb2..000000000
--- a/src/client/views/nodes/LinkMenuItem.scss
+++ /dev/null
@@ -1,86 +0,0 @@
-@import "../globalCssVariables";
-
-.linkMenu-item {
-    // border-top: 0.5px solid $main-accent; 
-    position: relative;
-    display: flex;
-    font-size: 12px;
-    
-
-    .link-name {
-        position: relative;
-
-        p {
-            padding: 4px 6px;
-            line-height: 12px;
-            border-radius: 5px;
-            overflow-wrap: break-word;
-        }
-    }
-
-    .linkMenu-item-content {
-        width: 100%;
-    }
-    
-    .link-metadata {
-        padding: 0 10px 0 16px;
-        margin-bottom: 4px;
-        color: $main-accent;
-        font-style: italic;
-        font-size: 10.5px;
-    }
-
-    &:hover {
-        .linkMenu-item-buttons {
-            display: flex;
-        }
-        .linkMenu-item-content {
-            &.expand-two p {
-                width: calc(100% - 52px);
-                background-color: lightgray;
-            }
-            &.expand-three p {
-                width: calc(100% - 84px);
-                background-color: lightgray;
-            }
-        }
-    }
-}
-
-.linkMenu-item-buttons {
-    display: none;
-    position: absolute;
-    top: 50%;
-    right: 0;
-    transform: translateY(-50%);
-
-    .button {
-        width: 20px;
-        height: 20px;
-        margin: 0;
-        margin-right: 6px;
-        border-radius: 50%;
-        cursor: pointer;
-        pointer-events: auto;
-        background-color: $dark-color;
-        color: $light-color;
-        font-size: 65%;
-        transition: transform 0.2s;
-        text-align: center;
-        position: relative;
-
-        .fa-icon {
-            position: absolute;
-            top: 50%;
-            left: 50%;
-            transform: translate(-50%, -50%);
-        }
-
-        &:last-child {
-            margin-right: 0;
-        }
-        &:hover {
-            background: $main-accent;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/client/views/nodes/LinkMenuItem.tsx b/src/client/views/nodes/LinkMenuItem.tsx
index 28694721d..486e3dc9b 100644
--- a/src/client/views/nodes/LinkMenuItem.tsx
+++ b/src/client/views/nodes/LinkMenuItem.tsx
@@ -4,14 +4,13 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { observer } from "mobx-react";
 import { DocumentManager } from "../../util/DocumentManager";
 import { undoBatch } from "../../util/UndoManager";
-import './LinkMenuItem.scss';
+import './LinkMenu.scss';
 import React = require("react");
 import { Doc } from '../../../new_fields/Doc';
 import { StrCast, Cast } from '../../../new_fields/Types';
 import { observable, action } from 'mobx';
 import { LinkManager } from '../../util/LinkManager';
-import { DragLinksAsDocuments, DragLinkAsDocument } from '../../util/DragManager';
-import { SelectionManager } from '../../util/SelectionManager';
+import { DragLinkAsDocument } from '../../util/DragManager';
 import { CollectionDockingView } from '../collections/CollectionDockingView';
 library.add(faEye, faEdit, faTimes, faArrowRight, faChevronDown, faChevronUp);
 
-- 
cgit v1.2.3-70-g09d2


From a81677c7dffafa5134d4c5cbe893f7a886eaab63 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Wed, 26 Jun 2019 14:48:16 -0400
Subject: can clear links on a doc

---
 src/client/util/LinkManager.ts         |  5 +++++
 src/client/views/nodes/LinkEditor.scss | 14 +++++++++-----
 src/client/views/nodes/LinkEditor.tsx  |  1 +
 src/client/views/nodes/LinkMenu.scss   |  4 ++++
 src/client/views/nodes/LinkMenu.tsx    | 10 ++++++++++
 5 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 1db686751..f2f3e51dd 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -75,6 +75,11 @@ export class LinkManager {
         return related;
     }
 
+    public deleteAllLinksOnAnchor(anchor: Doc) {
+        let related = LinkManager.Instance.getAllRelatedLinks(anchor);
+        related.forEach(linkDoc => LinkManager.Instance.deleteLink(linkDoc));
+    }
+
     public addGroupType(groupType: string): boolean {
         if (LinkManager.Instance.LinkManagerDoc) {
             LinkManager.Instance.LinkManagerDoc[groupType] = new List<string>([]);
diff --git a/src/client/views/nodes/LinkEditor.scss b/src/client/views/nodes/LinkEditor.scss
index 1424d7633..3c49c2212 100644
--- a/src/client/views/nodes/LinkEditor.scss
+++ b/src/client/views/nodes/LinkEditor.scss
@@ -47,8 +47,8 @@
     border-radius: 3px;
 
     .linkEditor-group-row {
-        display: flex;
-        margin-bottom: 6px;
+        // display: flex;
+        margin-bottom: 3px;
 
         .linkEditor-group-row-label {
             margin-right: 6px;
@@ -65,16 +65,16 @@
         }
 
         input {
-            width: calc(50% - 18px);
+            width: calc(50% - 16px);
             height: 20px;
         }
 
         button {
             width: 20px;
             height: 20px;
-            margin-left: 6px;
+            margin-left: 3px;
             padding: 0;
-            font-size: 14px;
+            font-size: 10px;
         }
     }
 }
@@ -85,6 +85,10 @@
     position: relative;
     z-index: 999;
 
+    input {
+        width: 100%;
+    }
+
     .linkEditor-options-wrapper {
         width: 100%;
         position: absolute;
diff --git a/src/client/views/nodes/LinkEditor.tsx b/src/client/views/nodes/LinkEditor.tsx
index 51efcc36d..22da732cf 100644
--- a/src/client/views/nodes/LinkEditor.tsx
+++ b/src/client/views/nodes/LinkEditor.tsx
@@ -278,6 +278,7 @@ export class LinkGroupEditor extends React.Component<LinkGroupEditorProps> {
                     <p className="linkEditor-group-row-label">type:</p>
                     <GroupTypesDropdown groupType={groupType} setGroupType={this.setGroupType} />
                 </div>
+                {this.renderMetadata().length > 0 ? <p className="linkEditor-group-row-label">metadata:</p> : <></>}
                 {this.renderMetadata()}
                 <div className="linkEditor-group-buttons">
                     {buttons}
diff --git a/src/client/views/nodes/LinkMenu.scss b/src/client/views/nodes/LinkMenu.scss
index 429977326..7cc11172b 100644
--- a/src/client/views/nodes/LinkMenu.scss
+++ b/src/client/views/nodes/LinkMenu.scss
@@ -131,4 +131,8 @@
     }
 }
 
+.linkEditor-clearButton {
+    float: right;
+}
+
 
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 8ef899cfc..71384c368 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -7,6 +7,11 @@ import React = require("react");
 import { Doc } from "../../../new_fields/Doc";
 import { LinkManager } from "../../util/LinkManager";
 import { LinkMenuGroup } from "./LinkMenuGroup";
+import { faTrash } from '@fortawesome/free-solid-svg-icons';
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+
+library.add(faTrash)
 
 interface Props {
     docView: DocumentView;
@@ -23,6 +28,10 @@ export class LinkMenu extends React.Component<Props> {
         this._editingLink = undefined;
     }
 
+    clearAllLinks = () => {
+        LinkManager.Instance.deleteAllLinksOnAnchor(this.props.docView.props.Document);
+    }
+
     renderAllGroups = (groups: Map<string, Array<Doc>>): Array<JSX.Element> => {
         let linkItems: Array<JSX.Element> = [];
         groups.forEach((group, groupType) => {
@@ -43,6 +52,7 @@ export class LinkMenu extends React.Component<Props> {
         if (this._editingLink === undefined) {
             return (
                 <div className="linkMenu">
+                    <button className="linkEditor-button linkEditor-clearButton" onClick={() => this.clearAllLinks()} title="Clear all links"><FontAwesomeIcon icon="trash" size="sm" /></button>
                     {/* <input id="linkMenu-searchBar" type="text" placeholder="Search..."></input> */}
                     <div className="linkMenu-list">
                         {this.renderAllGroups(groups)}
-- 
cgit v1.2.3-70-g09d2


From 681ba524496d40aecb832fc79d68d7695435aed8 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Wed, 26 Jun 2019 16:05:24 -0400
Subject: fixed link alias dragging

---
 src/client/util/DocumentManager.ts                 |   6 +-
 src/client/util/DragManager.ts                     |  25 +-
 src/client/views/nodes/LinkMenu.scss               |   5 +-
 src/client/views/nodes/LinkMenu.tsx                |   2 +-
 src/client/views/nodes/LinkMenuGroup.tsx           |   7 +-
 ...357\200\277 1 \357\200\272 0], targetContext);" | 792 +++++++++++++++++++++
 6 files changed, 816 insertions(+), 21 deletions(-)
 create mode 100644 "tance.jumpToDocument(linkedFwdDocs[altKey \357\200\277 1 \357\200\272 0], ctrlKey, false, document =\357\200\276 this.props.addDocTab(document, maxLocation), linkedFwdPage[altKey \357\200\277 1 \357\200\272 0], targetContext);"

(limited to 'src/client/views/nodes/LinkMenu.tsx')

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 877475347..fed30bbdc 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -72,11 +72,7 @@ export class DocumentManager {
             if (doc === toFind) {
                 toReturn.push(view);
             } else {
-                // if (Doc.AreProtosEqual(doc, toFind)) {
-                //     toReturn.push(view);
-
-                let docSrc = FieldValue(doc.proto);
-                if (docSrc && Object.is(docSrc, toFind)) {
+                if (Doc.AreProtosEqual(doc, toFind)) {
                     toReturn.push(view);
                 }
             }
diff --git a/src/client/util/DragManager.ts b/src/client/util/DragManager.ts
index 8e6abe18e..5c75c8fe5 100644
--- a/src/client/util/DragManager.ts
+++ b/src/client/util/DragManager.ts
@@ -9,6 +9,7 @@ import { URLField } from "../../new_fields/URLField";
 import { SelectionManager } from "./SelectionManager";
 import { Docs, DocUtils } from "../documents/Documents";
 import { DocumentManager } from "./DocumentManager";
+import { Id } from "../../new_fields/FieldSymbols";
 
 export type dropActionType = "alias" | "copy" | undefined;
 export function SetupDrag(_reference: React.RefObject<HTMLElement>, docFunc: () => Doc | Promise<Doc>, moveFunc?: DragManager.MoveFunction, dropAction?: dropActionType, options?: any, dontHideOnDrop?: boolean) {
@@ -213,19 +214,25 @@ export namespace DragManager {
         runInAction(() => StartDragFunctions.map(func => func()));
         StartDrag(eles, dragData, downX, downY, options,
             (dropData: { [id: string]: any }) => {
-                dropData.droppedDocuments = dragData.draggedDocuments.map(d => {
-                    let dv = DocumentManager.Instance.getDocumentView(d);
-                    if (dv) {
-                        if (dv.props.ContainingCollectionView === SelectionManager.SelectedDocuments()[0].props.ContainingCollectionView) {
-                            return d;
+                // dropData.droppedDocuments = 
+                console.log(dragData.draggedDocuments.length);
+                let droppedDocuments: Doc[] = dragData.draggedDocuments.reduce((droppedDocs: Doc[], d) => {
+                    let dvs = DocumentManager.Instance.getDocumentViews(d);
+                    console.log(StrCast(d.title), dvs.length);
+
+                    if (dvs.length) {
+                        let inContext = dvs.filter(dv => dv.props.ContainingCollectionView === SelectionManager.SelectedDocuments()[0].props.ContainingCollectionView);
+                        if (inContext.length) {
+                            inContext.forEach(dv => droppedDocs.push(dv.props.Document));
                         } else {
-                            return Doc.MakeAlias(d);
+                            droppedDocs.push(Doc.MakeAlias(d));
                         }
                     } else {
-                        return Doc.MakeAlias(d);
+                        droppedDocs.push(Doc.MakeAlias(d));
                     }
-                });
-
+                    return droppedDocs;
+                }, []);
+                dropData.droppedDocuments = droppedDocuments;
             });
     }
 
diff --git a/src/client/views/nodes/LinkMenu.scss b/src/client/views/nodes/LinkMenu.scss
index 7cc11172b..a4018bd2d 100644
--- a/src/client/views/nodes/LinkMenu.scss
+++ b/src/client/views/nodes/LinkMenu.scss
@@ -25,6 +25,8 @@
         &:hover {
             p {
                 background-color: lightgray;
+            }
+            p.expand-one {
                 width: calc(100% - 26px);
             }
             .linkEditor-tableButton {
@@ -131,8 +133,5 @@
     }
 }
 
-.linkEditor-clearButton {
-    float: right;
-}
 
 
diff --git a/src/client/views/nodes/LinkMenu.tsx b/src/client/views/nodes/LinkMenu.tsx
index 71384c368..68fde17a0 100644
--- a/src/client/views/nodes/LinkMenu.tsx
+++ b/src/client/views/nodes/LinkMenu.tsx
@@ -11,7 +11,7 @@ import { faTrash } from '@fortawesome/free-solid-svg-icons';
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 
-library.add(faTrash)
+library.add(faTrash);
 
 interface Props {
     docView: DocumentView;
diff --git a/src/client/views/nodes/LinkMenuGroup.tsx b/src/client/views/nodes/LinkMenuGroup.tsx
index 732e76997..f4e0b8931 100644
--- a/src/client/views/nodes/LinkMenuGroup.tsx
+++ b/src/client/views/nodes/LinkMenuGroup.tsx
@@ -79,13 +79,14 @@ export class LinkMenuGroup extends React.Component<LinkMenuGroupProps> {
         return (
             <div className="linkMenu-group">
                 <div className="linkMenu-group-name">
-                    <p ref={this._drag} onPointerDown={this.onLinkButtonDown}>{this.props.groupType}:</p>
-                    {this.viewGroupAsTable(this.props.groupType)}
+                    <p ref={this._drag} onPointerDown={this.onLinkButtonDown}
+                        className={this.props.groupType === "*" || this.props.groupType === "" ? "" : "expand-one"} > {this.props.groupType}:</p>
+                    {this.props.groupType === "*" || this.props.groupType === "" ? <></> : this.viewGroupAsTable(this.props.groupType)}
                 </div>
                 <div className="linkMenu-group-wrapper">
                     {groupItems}
                 </div>
-            </div>
+            </div >
         );
     }
 }
\ No newline at end of file
diff --git "a/tance.jumpToDocument(linkedFwdDocs[altKey \357\200\277 1 \357\200\272 0], ctrlKey, false, document =\357\200\276 this.props.addDocTab(document, maxLocation), linkedFwdPage[altKey \357\200\277 1 \357\200\272 0], targetContext);" "b/tance.jumpToDocument(linkedFwdDocs[altKey \357\200\277 1 \357\200\272 0], ctrlKey, false, document =\357\200\276 this.props.addDocTab(document, maxLocation), linkedFwdPage[altKey \357\200\277 1 \357\200\272 0], targetContext);"
new file mode 100644
index 000000000..0aa3ad47b
--- /dev/null
+++ "b/tance.jumpToDocument(linkedFwdDocs[altKey \357\200\277 1 \357\200\272 0], ctrlKey, false, document =\357\200\276 this.props.addDocTab(document, maxLocation), linkedFwdPage[altKey \357\200\277 1 \357\200\272 0], targetContext);"	
@@ -0,0 +1,792 @@
+[33mcommit cc1f3b32d60786b56280a8b3c00059aa7823af89[m
+Merge: a81677c deb8576
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Wed Jun 26 14:54:46 2019 -0400
+
+    merge
+
+[33mcommit a81677c7dffafa5134d4c5cbe893f7a886eaab63[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Wed Jun 26 14:48:16 2019 -0400
+
+    can clear links on a doc
+
+[33mcommit 69e37491908b5c189b94f780994c1f142c69be2e[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Wed Jun 26 14:15:40 2019 -0400
+
+    minor changes
+
+[33mcommit deb85766ac5648cc8e3ab4bf9d182ac5bbbbe144[m
+Merge: 219cabb 5e47775
+Author: Sam Wilkins <35748010+samwilkins333@users.noreply.github.com>
+Date:   Wed Jun 26 12:51:18 2019 -0400
+
+    Merge pull request #170 from browngraphicslab/presentation-selection-mohammad
+    
+    Presentation selection mohammad
+
+[33mcommit 5e477755b392128ab8b39c082f16dd67708be0d2[m
+Merge: 444f970 6d1f161
+Author: Sam Wilkins <samuel_wilkins@brown.edu>
+Date:   Wed Jun 26 12:48:45 2019 -0400
+
+    Merge branch 'presentation-selection-mohammad' of https://github.com/browngraphicslab/Dash-Web into presentation-selection-mohammad
+
+[33mcommit 444f970365a4280376e929e78c16090f6ae92739[m
+Merge: 64ffa0a 219cabb
+Author: Sam Wilkins <samuel_wilkins@brown.edu>
+Date:   Wed Jun 26 12:48:40 2019 -0400
+
+    merged with master
+
+[33mcommit 6d1f161de3c27ec07673b5e48a915961177b57b6[m
+Author: Sam Wilkins <35748010+samwilkins333@users.noreply.github.com>
+Date:   Wed Jun 26 12:39:54 2019 -0400
+
+    long line wrap
+
+[33mcommit f0632e4f6b608d05ef6d9f77d93da259c58c1e8d[m
+Author: Sam Wilkins <35748010+samwilkins333@users.noreply.github.com>
+Date:   Wed Jun 26 12:33:16 2019 -0400
+
+    long line wrap
+
+[33mcommit 0d5e2537520ca1e6a6b52f4d0f03aa2bcfc6c5c6[m
+Author: Sam Wilkins <35748010+samwilkins333@users.noreply.github.com>
+Date:   Wed Jun 26 12:30:16 2019 -0400
+
+    cleanup
+
+[33mcommit 8954bac59b50aa3618625379a17dbefe9aceca72[m
+Author: Sam Wilkins <35748010+samwilkins333@users.noreply.github.com>
+Date:   Wed Jun 26 12:29:07 2019 -0400
+
+    removed console.logs
+
+[33mcommit d0ff42632f8a155303e11945a1a974a15052f0db[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Wed Jun 26 11:40:36 2019 -0400
+
+    link menu styling
+
+[33mcommit a3c4aa24a9e9074da8f2421954f610c8178e10b1[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Tue Jun 25 21:28:15 2019 -0400
+
+    link metadata values appear on first load
+
+[33mcommit ca8a78de9957ad27d345ad51fdaee9dae3f096bd[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Tue Jun 25 20:44:34 2019 -0400
+
+    can't link to containing collection
+
+[33mcommit 2d300b0cd3d02c900865c61eacd539efed5289e6[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Tue Jun 25 20:18:14 2019 -0400
+
+    fixed link metadata rendering bug
+
+[33mcommit 2a698e88da5ef0a9fee1ff4ee69746f1242798c9[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Tue Jun 25 18:32:17 2019 -0400
+
+    fixed render links in treeview
+
+[33mcommit 7abe170ce5bd0c415e23456eb2bed26e8fdee7aa[m
+Merge: 41cf1e8 219cabb
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Tue Jun 25 18:23:26 2019 -0400
+
+    merge
+
+[33mcommit 41cf1e8536964764f18ab752140e484e36cbe464[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Tue Jun 25 17:09:36 2019 -0400
+
+    links can save
+
+[33mcommit 64ffa0accfc872c81035079527952aabaf56c6f6[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Tue Jun 25 13:16:45 2019 -0400
+
+    Small Css Fix On weight
+
+[33mcommit 219cabb3fe42ab199550efc3423b7aaed4e1ee93[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Mon Jun 24 22:45:19 2019 -0400
+
+    Switched shift drag of tabs to normal drag and added drag target for document drag
+
+[33mcommit d475b19e9ba7bc8870ec7bc1e10b5cc88decea0b[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Mon Jun 24 15:56:42 2019 -0400
+
+    fixed crash
+
+[33mcommit 522970375fe0227f9221a7e8be02875afd74ca63[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Mon Jun 24 14:01:29 2019 -0400
+
+    link menu styling
+
+[33mcommit addf0e443f64951a437701f0d5a087c1d5968faf[m
+Merge: c9f77d5 d01039b
+Author: tschicke-brown <tyler_schicke@brown.edu>
+Date:   Mon Jun 24 13:57:02 2019 -0400
+
+    Merge pull request #167 from browngraphicslab/schema_fixes
+    
+    Schema and scripting fixes
+
+[33mcommit d01039b10f0ebd328224c0b1a190b0f884a7c727[m
+Merge: 6abf829 c9f77d5
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Mon Jun 24 13:56:30 2019 -0400
+
+    Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web into schema_fixes
+
+[33mcommit c9f77d5aab98e6e7865cdcad957d5c937631775d[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Mon Jun 24 13:41:39 2019 -0400
+
+    Added ReadOnly mode for docs and changed computed values a bit
+
+[33mcommit e18662f2fa9e1d3dd1b0eb3b5531092258d05972[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Mon Jun 24 12:42:44 2019 -0400
+
+    Refactoring
+
+[33mcommit 52051829373bc4acfe9d705b64c30e3fddebf439[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Mon Jun 24 10:49:05 2019 -0400
+
+    Fixed image size stuff
+
+[33mcommit ac781d2fb714ca26fb364d00d5aeb7a20b008655[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Mon Jun 24 10:26:57 2019 -0400
+
+    Changed how zooming works
+
+[33mcommit 6e5cd0e991e2e6d7ae8de1d73ff273ba0737355c[m
+Author: Tyler Schicke <tschicke@gmail.com>
+Date:   Sun Jun 23 17:23:33 2019 -0400
+
+    Fixed shift dragging with no open panes
+
+[33mcommit 32ef8d83d5829e2faadbebaf6f9b694df5d7ea02[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Fri Jun 21 17:41:20 2019 -0400
+
+    link menu styling
+
+[33mcommit 7962aff8431b692af5229cd8e6c390bbe1110336[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Fri Jun 21 16:29:31 2019 -0400
+
+    link menu styling
+
+[33mcommit a4b34adcb34184728be0b69b33a561f6d10f0a98[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Fri Jun 21 16:27:03 2019 -0400
+
+    can drag just a group of links on a doc
+
+[33mcommit e1f5f341854944c533efdb7d36306edd1e1dc747[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Fri Jun 21 14:53:08 2019 -0400
+
+    Some More documentation
+
+[33mcommit 542f25d4af36cf0948696d45afba2e9e19f5bc37[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Fri Jun 21 14:47:11 2019 -0400
+
+    Redo Grouping Fixed
+
+[33mcommit 60f9122ea31d660d60d5429890c4eb0ef6d8613b[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Fri Jun 21 13:41:25 2019 -0400
+
+    following link without viewdoc opens it to right
+
+[33mcommit d78c651322ad228152b862eaa378946fe65cc9f9[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Fri Jun 21 13:32:23 2019 -0400
+
+    dragged links from menu are aliases
+
+[33mcommit 179afa6e80631fcb8899408c3961bf1757e5b19b[m
+Merge: ca5e29f a40e7bb
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Thu Jun 20 22:23:40 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit ca5e29fdc7c238274eaf90682a8fa2ddc90e4e17[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Thu Jun 20 22:22:57 2019 -0400
+
+    fix to open on right, fix to image drag fro web, and layout fixes for stacking view multi-column
+
+[33mcommit a40e7bb5e9d1256002083d7e3f3c4db60cd8e9df[m
+Author: Sam Wilkins <35748010+samwilkins333@users.noreply.github.com>
+Date:   Thu Jun 20 19:41:39 2019 -0400
+
+    Fixed missed pointer up event
+
+[33mcommit f4b75a7c921181faeeee04fbd57cd24fbd57523e[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Thu Jun 20 19:16:42 2019 -0400
+
+    Undo/Redo First Version
+
+[33mcommit b1a2871fcca57ce934b8613b315a08eede188669[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Thu Jun 20 19:03:16 2019 -0400
+
+    link menu styling
+
+[33mcommit f2b54dc49205f8ea8944e26e43662a0c8dd08ed0[m
+Merge: 0cab79a 7d0f6c1
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 18:36:04 2019 -0400
+
+    Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web
+
+[33mcommit 0cab79a50719719e1dade40520a6967f7aa8f951[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 18:35:45 2019 -0400
+
+    Added debug and release modes to server and client
+
+[33mcommit fbfe9faca199b6dedd6844f1fa20cc02060a3c5a[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Thu Jun 20 18:25:49 2019 -0400
+
+    can see what docs are linked to in treeview:
+
+[33mcommit 7d0f6c18489f7155818611721985d9610b08d8e7[m
+Merge: d2dfc0f 46a2a9e
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Thu Jun 20 17:50:46 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit 1f172642d12c4669960b8526324e4bd034994be4[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 17:44:24 2019 -0400
+
+    Added arrange documents in grid command
+
+[33mcommit d2dfc0f9d35f0084a7c0dea73215f5d21055f2f3[m
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Thu Jun 20 17:17:14 2019 -0400
+
+    pdf page sizes loading error
+
+[33mcommit e6ebed17e6ddb2ccee81d65fcb451a9b54302762[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Thu Jun 20 17:12:48 2019 -0400
+
+    links can be made from freeform view to treeview
+
+[33mcommit 46a2a9e1f10b63feeb21a1e186daeaef2ccbcda4[m
+Merge: a39b285 a5dc0e0
+Author: bob <bcz@cs.brown.edu>
+Date:   Thu Jun 20 17:11:29 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit a39b2854b848006c19460685d7bf4005a9f650ae[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Thu Jun 20 17:09:50 2019 -0400
+
+    moved AddDocToList to Doc utils
+
+[33mcommit a5dc0e04add05f2f5bf1e17f1ac0a5e0aba1ea41[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 16:27:44 2019 -0400
+
+    Added hidden flag to documents
+
+[33mcommit e88538bb8af2ba648da2326d0f6edd3e0186766e[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Thu Jun 20 15:45:07 2019 -0400
+
+    Title changing to presentations added
+
+[33mcommit 9b3e80def0be6c09c31b5176817a54323d217d81[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 15:06:41 2019 -0400
+
+    Handled more events in editable view
+
+[33mcommit 1f24c5010a1cf6365265ea1f02327bb81a98134a[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 14:54:55 2019 -0400
+
+    Doc.GetProto change and swapped KVP syntax
+
+[33mcommit 4360287e6cafcb59af1ae62fc31ddc161bcf2e51[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Thu Jun 20 12:56:13 2019 -0400
+
+    styling of link proxy
+
+[33mcommit 711abbeba69e4d9afc634b8edf019b12b6dff915[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Thu Jun 20 12:54:41 2019 -0400
+
+    Documentation and reset Presentation at removal fixed
+
+[33mcommit a0246ef84396545f79fc4a8b21de1a56cbf06aca[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Thu Jun 20 11:34:28 2019 -0400
+
+    merge
+
+[33mcommit 8dbfb3029a99eaf37a5234e9d9e33cc64f779b03[m
+Merge: af8e5cf e9d62f4
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 11:33:01 2019 -0400
+
+    Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web
+
+[33mcommit af8e5cf1bfbfa2d57b4fd89c72306a71d8cabe1d[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 11:32:54 2019 -0400
+
+    Fixed context menu search
+
+[33mcommit cd2db5bf11fb89e3cd7016f7f798d65698c74c5e[m
+Merge: 73f0378 e9d62f4
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Thu Jun 20 11:31:15 2019 -0400
+
+    merge
+
+[33mcommit 73f03785f938542a91b28b35043f2feda2bc1432[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Thu Jun 20 11:26:33 2019 -0400
+
+    merge
+
+[33mcommit e9d62f4ca0dbeb57e46239047041a8a04da7b504[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Thu Jun 20 11:26:16 2019 -0400
+
+    changed color picker.   fixed delting selected docs.  fixed scaling items in nested panels.
+
+[33mcommit a5478b2d4cc3b66c6b58471cbb05c623d0109724[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 10:04:51 2019 -0400
+
+    "Fixed" search
+
+[33mcommit 01aee875e626c695fe208addaaa6f58aad387dd6[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Thu Jun 20 10:02:08 2019 -0400
+
+    Mostly keep context menu on screen
+
+[33mcommit 38de022621175bda7410df4444fcd2bbee0919cb[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Wed Jun 19 23:43:47 2019 -0400
+
+    slight tweaks.
+
+[33mcommit 9e55bfaad39aa47ab0594c6af7f1aa68e2a8db7a[m
+Merge: 118ecb1 827c589
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Wed Jun 19 22:40:57 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit 118ecb14ce519bcbade12b3d52e11b22fcc371b3[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Wed Jun 19 22:40:54 2019 -0400
+
+    cleaned up and enhanced tree view
+
+[33mcommit c5e401cb0a7fec2279ceecbc8d1429dcdd2f04b9[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Wed Jun 19 22:27:21 2019 -0400
+
+    buttons on cut links functional except for when dragged from link menu
+
+[33mcommit 6fc6054dc7aea144fd967a8cb3fe7d8fe5ec6d6d[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Wed Jun 19 19:13:30 2019 -0400
+
+    Width of the presentations fixed, removal of presentations option added, backUP group and normal groups updated when a doc is removed from presentation by removing it from both
+
+[33mcommit 827c58950b649629c84211d41fdd4d041287801e[m
+Merge: 05e50f2 96c26c5
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Wed Jun 19 18:49:50 2019 -0400
+
+    Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web
+
+[33mcommit 96c26c57527d443784bde9752551bfa10b3ce4d2[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Wed Jun 19 18:34:45 2019 -0400
+
+    removed marquee summarizing icon
+
+[33mcommit 05e50f27a15e8a02ffb27606c51026d1b85bc677[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Wed Jun 19 17:36:52 2019 -0400
+
+    Added basic keyboard controls to context menu
+
+[33mcommit fa37e023b88127cb8a6b393a848200361a396fb4[m
+Merge: 565b27c 5b2a498
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Wed Jun 19 16:21:09 2019 -0400
+
+    Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web
+
+[33mcommit 565b27cca8953a60067de367cae4c0a99beb3cab[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Wed Jun 19 16:21:03 2019 -0400
+
+    started adding selection to context menu
+
+[33mcommit 5b2a498aca75bd53ffab61f998218bec546b8154[m
+Merge: 358437e 39e8a7a
+Author: bob <bcz@cs.brown.edu>
+Date:   Wed Jun 19 16:17:21 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit 358437eeafe42e029ffe27702bde15a3fad54a3b[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Wed Jun 19 16:17:18 2019 -0400
+
+    working version of embedded tree view docs.
+
+[33mcommit 4c1383e47f2203a00bc7f3d73c209f3149d6a772[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Wed Jun 19 15:53:05 2019 -0400
+
+    ...
+
+[33mcommit a288a2fd0a30a3a16dd01bc4e12dcf6bc117c766[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Wed Jun 19 15:25:24 2019 -0400
+
+    Navigation and Zoom Option For Manual Selection Added and New Presentation TItle Naming Added
+    
+    Now, You can manually click on navigate or zoom and navigate to that document if current was their index. A way to manually disregard groups, and just navigate to that doc.
+
+[33mcommit 39e8a7a365442cdc11024c4de8019184fd0057ac[m
+Merge: 5b6f13d 9ab4739
+Author: Stanley Yip <33562077+yipstanley@users.noreply.github.com>
+Date:   Wed Jun 19 15:05:38 2019 -0400
+
+    Merge pull request #163 from browngraphicslab/pdf_fixes
+    
+    deleting annotations
+
+[33mcommit 5b6f13d64e9e38b94df0ae61ffedcb0b34290045[m
+Merge: 35e73f3 4ebbdd8
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Wed Jun 19 15:04:46 2019 -0400
+
+    Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web
+
+[33mcommit 35e73f369a2145d8a042e0011a43e71763d57998[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Wed Jun 19 15:02:48 2019 -0400
+
+    added better search to context menu
+
+[33mcommit 9ab47393a2ce3d174ad3238422c2c310764be9af[m
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Wed Jun 19 14:40:28 2019 -0400
+
+    interaction improvements with delete button
+
+[33mcommit b9849810231e540a5898a56012abd32c197b23b5[m
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Wed Jun 19 14:39:15 2019 -0400
+
+    anna
+
+[33mcommit b960a876d6a31b3eaebb0ac6eca6f191a0d4c900[m
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Wed Jun 19 14:38:43 2019 -0400
+
+    oop
+
+[33mcommit 46d57bc21cda4703855b85a4603bd471975d845b[m
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Wed Jun 19 14:25:47 2019 -0400
+
+    deleting annotations
+
+[33mcommit f362dbfc237536c6c4a8c6d088c3dc818080f7c2[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Wed Jun 19 12:50:58 2019 -0400
+
+    both tail ends of a cut link appear on hover/focus of an anchor
+
+[33mcommit fb62f3b2e39bbe2dd3da5eaffedbaa8e60f06dbb[m
+Author: Mohammad Amoush <mohammad_amoush@brown.edu>
+Date:   Wed Jun 19 12:35:54 2019 -0400
+
+    Grouping for different presentations fixed
+
+[33mcommit 4ebbdd803cdf83806902509dfa0432ce3a139403[m
+Merge: 0bb2052 c056ade
+Author: Stanley Yip <33562077+yipstanley@users.noreply.github.com>
+Date:   Wed Jun 19 11:48:16 2019 -0400
+
+    Merge pull request #162 from browngraphicslab/pdf_fixes
+    
+    Pdf fixes
+
+[33mcommit c056adeca11f35972b5f75c6b1cc31292d5765d4[m
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Wed Jun 19 11:47:20 2019 -0400
+
+    push
+
+[33mcommit 37f327ab659e6fa1221f9f4ed7649402c5dedc00[m
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Wed Jun 19 11:24:32 2019 -0400
+
+    aspect ratio, dragging, and full screen scrolling fixed
+
+[33mcommit 0bb20528c8167b3ba1c4c88d97586d50ae183b4c[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Wed Jun 19 10:37:36 2019 -0400
+
+    added highlight for expanded tree view items
+
+[33mcommit f60398d5db9041e09c809c16a0b885936ac11a3d[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Wed Jun 19 10:21:37 2019 -0400
+
+    fixed multi-column stacking
+
+[33mcommit 0674331f3611d297028526c888c718a75b012e0a[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Wed Jun 19 09:36:21 2019 -0400
+
+    fixed resizing stacking views.  changed defaults for new docs in treeView
+
+[33mcommit 1472d2b56aa64896f0a93f172322121d19cd1592[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Wed Jun 19 09:11:35 2019 -0400
+
+    fixed lint errors.
+
+[33mcommit 8c94bb92b23dea138fa752929b6134e7214dfb60[m
+Merge: 3b880d7 13e301d
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Tue Jun 18 22:51:48 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit 3b880d7b15b7107049ae27601b9f759b17f7fde9[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Tue Jun 18 22:51:46 2019 -0400
+
+    added initial keyboard shortcuts for adding and moving docs in TreeView.  fixed image drag bug.
+
+[33mcommit 13e301dea2f537b67b338cc6a98d3f3b5a8e1f36[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Tue Jun 18 20:58:32 2019 -0400
+
+    Fixed linter errors
+
+[33mcommit 464fa03d6ebb2a7aaef1d7622afa3e1e7ee816a3[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Tue Jun 18 20:11:31 2019 -0400
+
+    Context menu improvements and error fixes
+
+[33mcommit 4ffcff69a2fc767c6a03d46d7296b6a8c7ffd281[m
+Author: madelinegr <mgriswold99@gmail.com>
+Date:   Tue Jun 18 19:13:45 2019 -0400
+
+    Presentations Listed, Option to Change Added, and
+
+[33mcommit ca126adda9e4def83fb5c2e07e382917ca0b4ee0[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Tue Jun 18 17:24:59 2019 -0400
+
+    Fixed docking view?
+
+[33mcommit b0ac30172019713e1c75083c1199485d902e0eed[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Tue Jun 18 16:37:28 2019 -0400
+
+    Fixed zoomBasis stuff and added deletion handling for reponse from server
+
+[33mcommit 8e5afb5bbb47324a381b5184254e77eba7bd8536[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Tue Jun 18 16:30:24 2019 -0400
+
+    can click on button link to node in different context than source
+
+[33mcommit 6fcd0d8d6fb1471b8af460f6d80bdf0d0e681566[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Tue Jun 18 15:17:27 2019 -0400
+
+    added button to delete a link
+
+[33mcommit d91e7eec9a62363b383b929166cdf600b124334c[m
+Author: Fawn <fangrui_tong@brown.edu>
+Date:   Tue Jun 18 15:09:21 2019 -0400
+
+    links to nodes in different contexts render as a circle
+
+[33mcommit d3cad099d49690810166d0342f7c371bda0f007e[m
+Merge: 04668e2 b1af251
+Author: bob <bcz@cs.brown.edu>
+Date:   Tue Jun 18 13:30:55 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit 04668e21313f6e62e5ab35ac737fc54191769a5a[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Tue Jun 18 13:30:41 2019 -0400
+
+    fixed cleanup of marquee keyhandler.
+
+[33mcommit b1af251b058743798aa3fa3895d22327c8560dfc[m
+Author: Sam Wilkins <35748010+samwilkins333@users.noreply.github.com>
+Date:   Tue Jun 18 13:19:50 2019 -0400
+
+    Added pointer down flag for tab focus
+
+[33mcommit 9544576ec0167d64f564ae4c87d392eba07ff467[m
+Author: Sam Wilkins <35748010+samwilkins333@users.noreply.github.com>
+Date:   Tue Jun 18 13:18:34 2019 -0400
+
+    Added tab focusing on hover
+
+[33mcommit 2633f61d311528e62d50d4ff56f5884b3b51ac61[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Tue Jun 18 13:12:15 2019 -0400
+
+    added undo/redo bindings for app.
+
+[33mcommit 3a25bad918c72f5d6de9a720de9e0d316c00f2fe[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Tue Jun 18 13:03:28 2019 -0400
+
+    fixed issues with expanding text boxes that have a dynamic title
+
+[33mcommit f4fcf306e2579b7479610899a01c06fb157d47de[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Tue Jun 18 12:03:14 2019 -0400
+
+    fixed goldenlayout nesting
+
+[33mcommit 4f0086f6ea948c1c5254db2acc93f6735987daa5[m
+Merge: 749eef1 d7ebe7b
+Author: bob <bcz@cs.brown.edu>
+Date:   Tue Jun 18 11:31:49 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit 749eef13af1338225b2bec4dbcd7a50a5650d285[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Tue Jun 18 11:31:46 2019 -0400
+
+    fixed image drag drop when not selected.
+
+[33mcommit d7ebe7b7d19cf7dc797443aa485293670c3ee4e2[m
+Merge: 66d4cc9 08872de
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Tue Jun 18 11:08:44 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit 66d4cc94bcc69f590d90dd35823f93b8e2fb90d8[m
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Tue Jun 18 10:52:10 2019 -0400
+
+    selection fixes
+
+[33mcommit 08872def596af073c5f14336c8faf07f44561bbc[m
+Merge: 8d00265 c50ba1c
+Author: bob <bcz@cs.brown.edu>
+Date:   Tue Jun 18 10:28:31 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit 8d0026573ad9a196f864490bcf07c78f54082bad[m
+Author: bob <bcz@cs.brown.edu>
+Date:   Tue Jun 18 10:28:29 2019 -0400
+
+    fixed selection within multicolumn stacking view.  added drop of html image selections.
+
+[33mcommit c50ba1c4cc01d5cd085dee0dae6f633164efeb80[m
+Merge: cc032e2 64e6a94
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Tue Jun 18 10:10:58 2019 -0400
+
+    Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web
+
+[33mcommit cc032e2f60015728f64f46ef009c9306e36746a0[m
+Author: yipstanley <stanley_yip@brown.edu>
+Date:   Tue Jun 18 10:05:49 2019 -0400
+
+    fixes
+
+[33mcommit 64e6a941639aab8d7109178aa151a50909547309[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Tue Jun 18 09:05:41 2019 -0400
+
+    fixed index out of range
+
+[33mcommit 4b8324fcf44c5d3c3a4b3f6e98a4d1dfce84811b[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Tue Jun 18 08:53:01 2019 -0400
+
+    removed trace
+
+[33mcommit a3b8a57027d7c45ea19d259e1ec18fa6a8648c24[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Tue Jun 18 08:49:02 2019 -0400
+
+    looked like wrong code...
+
+[33mcommit 2f5c38c6a0a5220c2a31931c34d94e199854d703[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Tue Jun 18 08:36:37 2019 -0400
+
+    more streamlining
+
+[33mcommit 62c781c0c79ac395c5e117d208a90485ff1ba599[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Tue Jun 18 02:19:07 2019 -0400
+
+    faster loading of PDFs
+
+[33mcommit 4dc8c03562a0473becb895824740da487e16e771[m
+Author: Bob Zeleznik <zzzman@gmail.com>
+Date:   Tue Jun 18 00:17:58 2019 -0400
+
+    added dropping of Dash urls from gmail
+
+[33mcommit 9c7ff72a8ad249c05b672a46e3fbbb69ffca3a2a[m
+Merge: 8c64ffd 71b1cfb
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Mon Jun 17 23:04:22 2019 -0400
+
+    Merge branch 'master' of github-tsch-brown:browngraphicslab/Dash-Web
+
+[33mcommit 8c64ffd92e382050bc8727981cf9fb830e4f02a7[m
+Author: Tyler Schicke <tyler_schicke@brown.edu>
+Date:   Mon Jun 17 23:04:07 2019 -0400
+
+    Added share with user functionality
-- 
cgit v1.2.3-70-g09d2

