1 files changed, 38 insertions, 16 deletions

diff --git a/src/client/util/DocumentManager.ts b/src/client/util/DocumentManager.ts
index 65c4b9e4b..712529745 100644
--- a/src/client/util/DocumentManager.ts
+++ b/src/client/util/DocumentManager.ts
@@ -9,6 +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';
 
 
 export class DocumentManager {
@@ -83,12 +84,16 @@ export class DocumentManager {
 
     @computed
     public get LinkedDocumentViews() {
-        return DocumentManager.Instance.DocumentViews.filter(dv => dv.isSelected() || BoolCast(dv.props.Document.libraryBrush, false)).reduce((pairs, dv) => {
-            let linksList = DocListCast(dv.props.Document.linkedToDocs);
+        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 linkToDoc = FieldValue(Cast(link.linkedTo, Doc));
+                        let destination = (link["linkedTo"] === dv.props.Document) ? link["linkedFrom"] : link["linkedTo"];
+                        let linkToDoc = FieldValue(Cast(destination, Doc));
+                        // let linkToDoc = FieldValue(Cast(link.linkedTo, Doc));
                         if (linkToDoc) {
                             DocumentManager.Instance.getDocumentViews(linkToDoc).map(docView1 =>
                                 pairs.push({ a: dv, b: docView1, l: link }));
@@ -97,21 +102,38 @@ export class DocumentManager {
                     return pairs;
                 }, [] as { a: DocumentView, b: DocumentView, l: Doc }[]));
             }
-            linksList = DocListCast(dv.props.Document.linkedFromDocs);
-            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));
-            }
+
+            // 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;
     }
 
     @undoBatch