WIP

app/assets/javascripts/services/nativeExtManager.js

@@ -1,6 +1,5 @@
 import { isDesktopApplication, dictToArray } from '@/utils';
 import { SFPredicate, ContentTypes, CreateMaxPayloadFromAnyObject } from 'snjs';
-import { AppStateEvents } from '@/state';
 
 const STREAM_ITEMS_PERMISSION = 'stream-items';
 
@@ -11,18 +10,29 @@ export class NativeExtManager {
     this.application = application;
     this.extManagerId = 'org.standardnotes.extensions-manager';
     this.batchManagerId = 'org.standardnotes.batch-manager';
-    this.systemExtensions = [];
-    this.resolveExtensionsManager();
-    this.resolveBatchManager();
-
     application.onUnlock(() => {
-      this.resolveExtensionsManager();
-      this.resolveBatchManager();
+      this.reload();
+      this.streamChanges();
     });
   }
-
+  
   isSystemExtension(extension) {
-    return this.systemExtensions.includes(extension.uuid);
+    return this.nativeExtIds.includes(extension.uuid);
+  }
+  
+  streamChanges() {
+    this.application.streamItems({
+      contentType: ContentTypes.Component,
+      stream: () => {
+        this.reload();
+      }
+    });
+  }
+  
+  reload() {
+    this.nativeExtIds = [];
+    // this.resolveExtensionsManager();
+    // this.resolveBatchManager();
   }
 
   extensionsManagerTemplatePayload() {
@@ -76,7 +86,7 @@ export class NativeExtManager {
       predicate: predicate,
       createPayload: this.extensionsManagerTemplatePayload()
     });
-    this.systemExtensions.push(extensionsManager.uuid);
+    this.nativeExtIds.push(extensionsManager.uuid);
     let needsSync = false;
     if (isDesktopApplication()) {
       if (!extensionsManager.local_url) {
@@ -144,7 +154,7 @@ export class NativeExtManager {
       predicate: predicate,
       createPayload: this.batchManagerTemplatePayload()
     });
-    this.systemExtensions.push(batchManager.uuid);
+    this.nativeExtIds.push(batchManager.uuid);
     let needsSync = false;
     if (isDesktopApplication()) {
       if (!batchManager.local_url) {

app/assets/javascripts/services/preferencesManager.js

@@ -1,4 +1,4 @@
-import { SFPredicate, CreateMaxPayloadFromAnyObject } from 'snjs';
+import { SFPredicate, ContentTypes, CreateMaxPayloadFromAnyObject } from 'snjs';
 
 export const PrefKeys = {
   TagsPanelWidth: 'tagsPanelWidth',
@@ -33,24 +33,26 @@ export class PreferencesManager {
 
   streamPreferences() {
     this.application.streamItems({
-      contentType: 'SN|UserPreferences',
+      contentType: ContentTypes.UserPrefs,
       stream: () => {
-        this.preferencesDidChange();
+        this.loadSingleton();
       }
     });
   }
 
   async loadSingleton() {
-    const contentType = 'SN|UserPreferences';
+    const contentType = ContentTypes.UserPrefs;
     const predicate = new SFPredicate('content_type', '=', contentType);
     this.userPreferences = await this.application.singletonManager.findOrCreateSingleton({
       predicate: predicate,
       createPayload: CreateMaxPayloadFromAnyObject({
         object: {
-          content_type: contentType
+          content_type: contentType,
+          content: {}
         }
       })
     });
+    this.preferencesDidChange();
   }
 
   preferencesDidChange() {