1 files changed, 29 insertions, 32 deletions

diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 2b0ce1d3d..7da16ca78 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -3,7 +3,7 @@ import { computedFn } from 'mobx-utils';
 import { DirectLinksSym, Doc, DocListCast, DocListCastAsync, Field, Opt } from '../../fields/Doc';
 import { List } from '../../fields/List';
 import { ProxyField } from '../../fields/Proxy';
-import { Cast, StrCast } from '../../fields/Types';
+import { Cast, DocCast, PromiseValue, StrCast } from '../../fields/Types';
 /*
  * link doc:
  * - anchor1: doc
@@ -24,7 +24,15 @@ export class LinkManager {
     public static get Instance() {
         return LinkManager._instance;
     }
-    public static addLinkDB = (linkDb: any) => LinkManager.userLinkDBs.push(linkDb);
+    public static addLinkDB = async (linkDb: any) => {
+        await Promise.all(
+            ((await DocListCastAsync(linkDb.data)) ?? []).map(link =>
+                // makes sure link anchors are loaded to avoid incremental updates to computedFns in LinkManager
+                [PromiseValue(link?.anchor1), PromiseValue(link?.anchor2)]
+            )
+        );
+        LinkManager.userLinkDBs.push(linkDb);
+    };
     public static AutoKeywords = 'keywords:Usages';
     static links: Doc[] = [];
     constructor() {
@@ -32,21 +40,22 @@ export class LinkManager {
         this.createLinkrelationshipLists();
         LinkManager.userLinkDBs = [];
         const addLinkToDoc = (link: Doc) => {
-            const a1Prom = link?.anchor1;
-            const a2Prom = link?.anchor2;
-            Promise.all([a1Prom, a2Prom]).then(all => {
-                const a1 = all[0];
-                const a2 = all[1];
-                const a1ProtoProm = (link?.anchor1 as Doc)?.proto;
-                const a2ProtoProm = (link?.anchor2 as Doc)?.proto;
-                Promise.all([a1ProtoProm, a2ProtoProm]).then(
-                    action(all => {
-                        if (a1 instanceof Doc && a2 instanceof Doc && ((a1.author !== undefined && a2.author !== undefined) || link.author === Doc.CurrentUserEmail)) {
-                            Doc.GetProto(a1)[DirectLinksSym].add(link);
-                            Doc.GetProto(a2)[DirectLinksSym].add(link);
-                        }
-                    })
-                );
+            Promise.all([link]).then(linkdoc => {
+                const link = DocCast(linkdoc[0]);
+                Promise.all([link.proto]).then(linkproto => {
+                    Promise.all([link.anchor1, link.anchor2]).then(linkdata => {
+                        const a1 = DocCast(linkdata[0]);
+                        const a2 = DocCast(linkdata[1]);
+                        a1 &&
+                            a2 &&
+                            Promise.all([a1.proto, a2.proto]).then(
+                                action(protos => {
+                                    (protos[0] as Doc)?.[DirectLinksSym].add(link);
+                                    (protos[1] as Doc)?.[DirectLinksSym].add(link);
+                                })
+                            );
+                    });
+                });
             });
         };
         const remLinkFromDoc = (link: Doc) => {
@@ -114,13 +123,6 @@ export class LinkManager {
             true
         );
         LinkManager.addLinkDB(Doc.LinkDBDoc());
-        DocListCastAsync(Doc.LinkDBDoc()?.data).then(dblist =>
-            dblist?.forEach(async link => {
-                // make sure anchors are loaded to avoid incremental updates to computedFn's in LinkManager
-                const a1 = await Cast(link?.anchor1, Doc, null);
-                const a2 = await Cast(link?.anchor2, Doc, null);
-            })
-        );
     }
 
     public createLinkrelationshipLists = () => {
@@ -150,19 +152,14 @@ export class LinkManager {
     } // finds all links that contain the given anchor
 
     relatedLinker = computedFn(function relatedLinker(this: any, anchor: Doc): Doc[] {
-        const lfield = Doc.LayoutFieldKey(anchor);
         if (!anchor || anchor instanceof Promise || Doc.GetProto(anchor) instanceof Promise) {
             console.log('WAITING FOR DOC/PROTO IN LINKMANAGER');
             return [];
         }
         const dirLinks = Doc.GetProto(anchor)[DirectLinksSym];
-        const annos = DocListCast(anchor[lfield + '-annotations']);
-        const timelineAnnos = DocListCast(anchor[lfield + '-annotations-timeline']);
-        if (!annos || !timelineAnnos) {
-            debugger;
-        }
-        const related = [...annos, ...timelineAnnos].reduce((list, anno) => [...list, ...LinkManager.Instance.relatedLinker(anno)], Array.from(dirLinks).slice());
-        return related;
+        const annos = DocListCast(anchor[Doc.LayoutFieldKey(anchor) + '-annotations']);
+        if (!annos) debugger;
+        return annos.reduce((list, anno) => [...list, ...LinkManager.Instance.relatedLinker(anno)], Array.from(dirLinks).slice());
     }, true);
 
     // returns map of group type to anchor's links in that group type