Merge branch 'moreUpgrading' into dataViz-annotations

1 files changed, 12 insertions, 14 deletions

diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 608184596..ccb3c6b98 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -1,4 +1,4 @@
-import { action, observable, observe, runInAction } from 'mobx';
+import { action, makeObservable, observable, observe, runInAction } from 'mobx';
 import { computedFn } from 'mobx-utils';
 import { Doc, DocListCast, DocListCastAsync, Field, Opt } from '../../fields/Doc';
 import { DirectLinks } from '../../fields/DocSymbols';
@@ -22,9 +22,9 @@ import { ScriptingGlobals } from './ScriptingGlobals';
  */
 export class LinkManager {
     @observable static _instance: LinkManager;
-    @observable static userLinkDBs: Doc[] = [];
-    @observable public static currentLink: Opt<Doc>;
-    @observable public static currentLinkAnchor: Opt<Doc>;
+    @observable.shallow userLinkDBs: Doc[] = [];
+    @observable public static currentLink: Opt<Doc> = undefined;
+    @observable public static currentLinkAnchor: Opt<Doc> = undefined;
     public static get Instance() {
         return LinkManager._instance;
     }
@@ -32,21 +32,20 @@ export class LinkManager {
     public static Links(doc: Doc | undefined) {
         return doc ? LinkManager.Instance.getAllRelatedLinks(doc) : [];
     }
-    public static addLinkDB = async (linkDb: any) => {
+    public 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?.link_anchor_1), PromiseValue(link?.link_anchor_2)]
             )
         );
-        LinkManager.userLinkDBs.push(linkDb);
+        this.userLinkDBs.push(linkDb);
     };
     public static AutoKeywords = 'keywords:Usages';
-    static _links: Doc[] = [];
     constructor() {
+        makeObservable(this);
         LinkManager._instance = this;
         this.createlink_relationshipLists();
-        LinkManager.userLinkDBs = [];
         // since this is an action, not a reaction, we get only one shot to add this link to the Anchor docs
         // Thus make sure all promised values are resolved from link -> link.proto -> link.link_anchor_[1,2] -> link.link_anchor_[1,2].proto
         // Then add the link to the anchor protos.
@@ -85,7 +84,6 @@ export class LinkManager {
             );
 
         const watchUserLinkDB = (userLinkDBDoc: Doc) => {
-            LinkManager._links.push(...DocListCast(userLinkDBDoc.data));
             const toRealField = (field: Field) => (field instanceof ProxyField ? field.value : field); // see List.ts.  data structure is not a simple list of Docs, but a list of ProxyField/Fields
             if (userLinkDBDoc.data) {
                 observe(
@@ -124,7 +122,7 @@ export class LinkManager {
             }
         };
         observe(
-            LinkManager.userLinkDBs,
+            this.userLinkDBs,
             change => {
                 switch (change.type as any) {
                     case 'splice':
@@ -135,8 +133,8 @@ export class LinkManager {
             },
             true
         );
-        runInAction(() => (FieldLoader.ServerLoadStatus.message = 'links'));
-        LinkManager.addLinkDB(Doc.LinkDBDoc());
+        FieldLoader.ServerLoadStatus.message = 'links';
+        this.addLinkDB(Doc.LinkDBDoc());
     }
 
     public createlink_relationshipLists = () => {
@@ -163,8 +161,8 @@ export class LinkManager {
     public getAllRelatedLinks(anchor: Doc) {
         return this.relatedLinker(anchor);
     } // finds all links that contain the given anchor
-    public getAllDirectLinks(anchor: Doc): Doc[] {
-        return Array.from(Doc.GetProto(anchor)[DirectLinks]);
+    public getAllDirectLinks(anchor?: Doc): Doc[] {
+        return anchor ? Array.from(Doc.GetProto(anchor)[DirectLinks]) : [];
     } // finds all links that contain the given anchor
 
     relatedLinker = computedFn(function relatedLinker(this: any, anchor: Doc): Doc[] {