TS complete

app/assets/javascripts/services/desktopManager.ts

@@ -31,7 +31,7 @@ export class DesktopManager extends ApplicationService {
   installationSyncHandler?: (payloads: PurePayload[]) => void
   installComponentHandler?: (payload: PurePayload) => void
   lastSearchedText?: string
-  searchHandler?: (text: string) => void
+  searchHandler?: (text?: string) => void
 
   constructor(
     $rootScope: ng.IRootScopeService,
@@ -118,7 +118,7 @@ export class DesktopManager extends ApplicationService {
     };
   }
 
-  searchText(text: string) {
+  searchText(text?: string) {
     if (!this.isDesktop) {
       return;
     }
@@ -133,7 +133,7 @@ export class DesktopManager extends ApplicationService {
   }
 
   // Pass null to cancel search
-  desktop_setSearchHandler(handler: (text: string) => void) {
+  desktop_setSearchHandler(handler: (text?: string) => void) {
     this.searchHandler = handler;
   }
 

app/assets/javascripts/services/nativeExtManager.js

@@ -1,183 +0,0 @@
-import { isDesktopApplication, dictToArray } from '@/utils';
-import {
-  SNPredicate,
-  ContentType,
-  CreateMaxPayloadFromAnyObject,
-  ApplicationService
-} from 'snjs';
-
-const STREAM_ITEMS_PERMISSION = 'stream-items';
-
-/** A class for handling installation of system extensions */
-export class NativeExtManager extends ApplicationService {
-  /* @ngInject */
-  constructor(application) {
-    super(application);
-    this.extManagerId = 'org.standardnotes.extensions-manager';
-    this.batchManagerId = 'org.standardnotes.batch-manager';
-  }
-  
-  /** @override */
-  onAppLaunch() {
-    super.onAppLaunch();
-    this.reload();
-  }
-
-  get extManagerPred() {
-    const extManagerId = 'org.standardnotes.extensions-manager';
-    return SNPredicate.CompoundPredicate([
-      new SNPredicate('content_type', '=', ContentType.Component),
-      new SNPredicate('package_info.identifier', '=', extManagerId)
-    ]);
-  }
-
-  get batchManagerPred() {
-    const batchMgrId = 'org.standardnotes.batch-manager';
-    return SNPredicate.CompoundPredicate([
-      new SNPredicate('content_type', '=', ContentType.Component),
-      new SNPredicate('package_info.identifier', '=', batchMgrId)
-    ]);
-  }
-
-  reload() {
-    this.application.singletonManager.registerPredicate(this.extManagerPred);
-    this.application.singletonManager.registerPredicate(this.batchManagerPred);
-    this.resolveExtensionsManager();
-    this.resolveBatchManager();
-  }
-
-  async resolveExtensionsManager() {
-    const extensionsManager = await this.application.singletonManager.findOrCreateSingleton({
-      predicate: this.extManagerPred,
-      createPayload: this.extensionsManagerTemplatePayload()
-    });
-    let needsSync = false;
-    if (isDesktopApplication()) {
-      if (!extensionsManager.local_url) {
-        extensionsManager.local_url = window._extensions_manager_location;
-        needsSync = true;
-      }
-    } else {
-      if (!extensionsManager.hosted_url) {
-        extensionsManager.hosted_url = window._extensions_manager_location;
-        needsSync = true;
-      }
-    }
-    // Handle addition of SN|ExtensionRepo permission
-    const permission = extensionsManager.content.permissions.find((p) => p.name === STREAM_ITEMS_PERMISSION);
-    if (!permission.content_types.includes(ContentType.ExtensionRepo)) {
-      permission.content_types.push(ContentType.ExtensionRepo);
-      needsSync = true;
-    }
-    if (needsSync) {
-      this.application.saveItem({ item: extensionsManager });
-    }
-  }
-
-  extensionsManagerTemplatePayload() {
-    const url = window._extensions_manager_location;
-    if (!url) {
-      console.error('window._extensions_manager_location must be set.');
-      return;
-    }
-    const packageInfo = {
-      name: 'Extensions',
-      identifier: this.extManagerId
-    };
-    const content = {
-      name: packageInfo.name,
-      area: 'rooms',
-      package_info: packageInfo,
-      permissions: [
-        {
-          name: STREAM_ITEMS_PERMISSION,
-          content_types: [
-            ContentType.Component,
-            ContentType.Theme,
-            ContentType.ServerExtension,
-            ContentType.ActionsExtension,
-            ContentType.Mfa,
-            ContentType.Editor,
-            ContentType.ExtensionRepo
-          ]
-        }
-      ]
-    };
-    if (isDesktopApplication()) {
-      content.local_url = window._extensions_manager_location;
-    } else {
-      content.hosted_url = window._extensions_manager_location;
-    }
-    const payload = CreateMaxPayloadFromAnyObject({
-      object: {
-        content_type: ContentType.Component,
-        content: content
-      }
-    });
-    return payload;
-  }
-
-  batchManagerTemplatePayload() {
-    const url = window._batch_manager_location;
-    if (!url) {
-      console.error('window._batch_manager_location must be set.');
-      return;
-    }
-    const packageInfo = {
-      name: 'Batch Manager',
-      identifier: this.batchManagerId
-    };
-    const allContentType = dictToArray(ContentType);
-    const content = {
-      name: packageInfo.name,
-      area: 'modal',
-      package_info: packageInfo,
-      permissions: [
-        {
-          name: STREAM_ITEMS_PERMISSION,
-          content_types: allContentType
-        }
-      ]
-    };
-    if (isDesktopApplication()) {
-      content.local_url = window._batch_manager_location;
-    } else {
-      content.hosted_url = window._batch_manager_location;
-    }
-    const payload = CreateMaxPayloadFromAnyObject({
-      object: {
-        content_type: ContentType.Component,
-        content: content
-      }
-    });
-    return payload;
-  }
-
-  async resolveBatchManager() {
-    const batchManager = await this.application.singletonManager.findOrCreateSingleton({
-      predicate: this.batchManagerPred,
-      createPayload: this.batchManagerTemplatePayload()
-    });
-    let needsSync = false;
-    if (isDesktopApplication()) {
-      if (!batchManager.local_url) {
-        batchManager.local_url = window._batch_manager_location;
-        needsSync = true;
-      }
-    } else {
-      if (!batchManager.hosted_url) {
-        batchManager.hosted_url = window._batch_manager_location;
-        needsSync = true;
-      }
-    }
-    // Handle addition of SN|ExtensionRepo permission
-    const permission = batchManager.content.permissions.find((p) => p.name === STREAM_ITEMS_PERMISSION);
-    if (!permission.content_types.includes(ContentType.ExtensionRepo)) {
-      permission.content_types.push(ContentType.ExtensionRepo);
-      needsSync = true;
-    }
-    if (needsSync) {
-      this.application.saveItem({ item: batchManager });
-    }
-  }
-}

app/assets/javascripts/services/nativeExtManager.ts

@@ -0,0 +1,203 @@
+import { isDesktopApplication, dictToArray } from '@/utils';
+import {
+  SNPredicate,
+  ContentType,
+  SNComponent,
+  ApplicationService,
+  ComponentAction
+} from 'snjs';
+import { PayloadContent } from '@/../../../../snjs/dist/@types/protocol/payloads/generator';
+import { FillItemContent } from '@/../../../../snjs/dist/@types/models/generator';
+import { ComponentMutator } from '@/../../../../snjs/dist/@types/models';
+
+/** A class for handling installation of system extensions */
+export class NativeExtManager extends ApplicationService {
+  extManagerId = 'org.standardnotes.extensions-manager';
+  batchManagerId = 'org.standardnotes.batch-manager';
+
+  /** @override */
+  async onAppLaunch() {
+    super.onAppLaunch();
+    this.reload();
+  }
+
+  get extManagerPred() {
+    const extManagerId = 'org.standardnotes.extensions-manager';
+    return SNPredicate.CompoundPredicate([
+      new SNPredicate('content_type', '=', ContentType.Component),
+      new SNPredicate('package_info.identifier', '=', extManagerId)
+    ]);
+  }
+
+  get batchManagerPred() {
+    const batchMgrId = 'org.standardnotes.batch-manager';
+    return SNPredicate.CompoundPredicate([
+      new SNPredicate('content_type', '=', ContentType.Component),
+      new SNPredicate('package_info.identifier', '=', batchMgrId)
+    ]);
+  }
+
+  get extMgrUrl() {
+    return (window as any)._extensions_manager_location;
+  }
+
+  get batchMgrUrl() {
+    return (window as any)._batch_manager_location;
+  }
+
+  reload() {
+    this.application!.singletonManager!.registerPredicate(this.extManagerPred);
+    this.application!.singletonManager!.registerPredicate(this.batchManagerPred);
+    this.resolveExtensionsManager();
+    this.resolveBatchManager();
+  }
+
+  async resolveExtensionsManager() {
+    const extensionsManager = (await this.application!.singletonManager!.findOrCreateSingleton(
+      this.extManagerPred,
+      ContentType.Component,
+      this.extensionsManagerTemplateContent()
+    )) as SNComponent;
+    let needsSync = false;
+    if (isDesktopApplication()) {
+      if (!extensionsManager.local_url) {
+        await this.application!.changeItem(extensionsManager.uuid, (m) => {
+          const mutator = m as ComponentMutator;
+          mutator.local_url = this.extMgrUrl;
+        });
+        needsSync = true;
+      }
+    } else {
+      if (!extensionsManager.hosted_url) {
+        await this.application!.changeItem(extensionsManager.uuid, (m) => {
+          const mutator = m as ComponentMutator;
+          mutator.hosted_url = this.extMgrUrl;
+        });
+        needsSync = true;
+      }
+    }
+    // Handle addition of SN|ExtensionRepo permission
+    const permissions = extensionsManager!.permissions.slice();
+    const permission = permissions.find((p) => {
+      return p.name === ComponentAction.StreamItems
+    });
+    if (permission && !permission.content_types!.includes(ContentType.ExtensionRepo)) {
+      permission.content_types!.push(ContentType.ExtensionRepo);
+      await this.application!.changeItem(extensionsManager.uuid, (m) => {
+        const mutator = m as ComponentMutator;
+        mutator.permissions = permissions;
+      });
+      needsSync = true;
+    }
+    if (needsSync) {
+      this.application!.saveItem(extensionsManager.uuid);
+    }
+  }
+
+  extensionsManagerTemplateContent() {
+    const url = this.extMgrUrl;
+    if (!url) {
+      throw Error('this.extMgrUrl must be set.');
+    }
+    const packageInfo = {
+      name: 'Extensions',
+      identifier: this.extManagerId
+    };
+    const content = FillItemContent({
+      name: packageInfo.name,
+      area: 'rooms',
+      package_info: packageInfo,
+      permissions: [
+        {
+          name: ComponentAction.StreamItems,
+          content_types: [
+            ContentType.Component,
+            ContentType.Theme,
+            ContentType.ServerExtension,
+            ContentType.ActionsExtension,
+            ContentType.Mfa,
+            ContentType.Editor,
+            ContentType.ExtensionRepo
+          ]
+        }
+      ]
+    }) as PayloadContent;
+    if (isDesktopApplication()) {
+      content.local_url = this.extMgrUrl;
+    } else {
+      content.hosted_url = this.extMgrUrl;
+    }
+    return content;
+  }
+
+  async resolveBatchManager() {
+    const batchManager = (await this.application!.singletonManager!.findOrCreateSingleton(
+      this.batchManagerPred,
+      ContentType.Component,
+      this.batchManagerTemplateContent()
+    )) as SNComponent;
+    let needsSync = false;
+    if (isDesktopApplication()) {
+      if (!batchManager.local_url) {
+        await this.application!.changeItem(batchManager.uuid, (m) => {
+          const mutator = m as ComponentMutator;
+          mutator.local_url = this.batchMgrUrl;
+        });
+        needsSync = true;
+      }
+    } else {
+      if (!batchManager.hosted_url) {
+        await this.application!.changeItem(batchManager.uuid, (m) => {
+          const mutator = m as ComponentMutator;
+          mutator.hosted_url = this.batchMgrUrl;
+        });
+        needsSync = true;
+      }
+    }
+    // Handle addition of SN|ExtensionRepo permission
+    const permissions = batchManager!.permissions.slice();
+    const permission = permissions.find((p) => {
+      return p.name === ComponentAction.StreamItems
+    });
+    if (permission && !permission.content_types!.includes(ContentType.ExtensionRepo)) {
+      permission.content_types!.push(ContentType.ExtensionRepo);
+      await this.application!.changeItem(batchManager.uuid, (m) => {
+        const mutator = m as ComponentMutator;
+        mutator.permissions = permissions;
+      });
+      needsSync = true;
+    }
+    if (needsSync) {
+      this.application!.saveItem(batchManager.uuid);
+    }
+  }
+
+  batchManagerTemplateContent() {
+    const url = this.batchMgrUrl;
+    if (!url) {
+      throw Error('window._batch_manager_location must be set.');
+    }
+    const packageInfo = {
+      name: 'Batch Manager',
+      identifier: this.batchManagerId
+    };
+    const allContentType = dictToArray(ContentType);
+    const content = FillItemContent({
+      name: packageInfo.name,
+      area: 'modal',
+      package_info: packageInfo,
+      permissions: [
+        {
+          name: ComponentAction.StreamItems,
+          content_types: allContentType
+        }
+      ]
+    });
+    if (isDesktopApplication()) {
+      content.local_url = this.batchMgrUrl;
+    } else {
+      content.hosted_url = this.batchMgrUrl;
+    }
+    return content;
+  }
+}

app/assets/javascripts/services/preferencesManager.ts

@@ -54,7 +54,7 @@ export class PreferencesManager extends ApplicationService {
     }
   }
 
-  getValue(key: WebPrefKey, defaultValue: any) {
+  getValue(key: WebPrefKey, defaultValue?: any) {
     if (!this.userPreferences) { return defaultValue; }
     const value = this.userPreferences.getPref(key);
     return (value !== undefined && value !== null) ? value : defaultValue;