Merge branch 'release/3.5.9' into develop

app/assets/javascripts/directives/views/accountMenu.ts

@@ -22,7 +22,6 @@ import {
   STRING_CONFIRM_APP_QUIT_DURING_PASSCODE_REMOVAL,
   STRING_UNSUPPORTED_BACKUP_FILE_VERSION
 } from '@/strings';
-import { SyncOpStatus } from '@standardnotes/snjs';
 import { PasswordWizardType } from '@/types';
 import { BackupFile } from '@standardnotes/snjs';
 import { confirmDialog, alertDialog } from '@/services/alertService';
@@ -67,15 +66,18 @@ type AccountMenuState = {
   selectedAutoLockInterval: any;
   showBetaWarning: boolean;
   errorReportingEnabled: boolean;
+  syncInProgress: boolean;
+  syncError: string;
+  syncPercentage: string;
 }
 
 class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
 
   public appVersion: string
   /** @template */
-  syncStatus?: SyncOpStatus
   private closeFunction?: () => void
   private removeBetaWarningListener?: IReactionDisposer
+  private removeSyncObserver?: IReactionDisposer
 
   /* @ngInject */
   constructor(
@@ -130,7 +132,14 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
 
   $onInit() {
     super.$onInit();
-    this.syncStatus = this.application!.getSyncStatus();
+    const sync = this.appState.sync;
+    this.removeSyncObserver = autorun(() => {
+      this.setState({
+        syncInProgress: sync.inProgress,
+        syncError: sync.errorMessage,
+        syncPercentage: sync.humanReadablePercentage,
+      });
+    })
     this.removeBetaWarningListener = autorun(() => {
       this.setState({
         showBetaWarning: this.appState.showBetaWarning
@@ -139,6 +148,7 @@ class AccountMenuCtrl extends PureViewCtrl<{}, AccountMenuState> {
   }
 
   deinit() {
+    this.removeSyncObserver?.();
     this.removeBetaWarningListener?.();
     super.deinit();
   }

app/assets/javascripts/ui_models/app_state.ts

@@ -10,7 +10,8 @@ import {
   SNSmartTag,
   PayloadSource,
   DeinitSource,
-  UuidString
+  UuidString,
+  SyncOpStatus
 } from '@standardnotes/snjs';
 import { WebApplication } from '@/ui_models/application';
 import { Editor } from '@/ui_models/editor';
@@ -58,6 +59,39 @@ class ActionsMenuState {
   }
 }
 
+export class SyncState {
+  inProgress = false;
+  errorMessage?: string;
+  humanReadablePercentage?: string;
+
+  constructor() {
+    makeObservable(this, {
+      inProgress: observable,
+      errorMessage: observable,
+      humanReadablePercentage: observable,
+      update: action,
+    });
+  }
+
+  update(status: SyncOpStatus) {
+    this.errorMessage = status.error?.message;
+    this.inProgress = status.syncInProgress;
+    const stats = status.getStats();
+    const completionPercentage = stats.uploadCompletionCount === 0
+        ? 0
+        : stats.uploadCompletionCount / stats.uploadTotalCount;
+
+    if (completionPercentage === 0) {
+      this.humanReadablePercentage = undefined;
+    } else {
+      this.humanReadablePercentage = completionPercentage.toLocaleString(
+        undefined,
+        { style: 'percent' }
+      );
+    }
+  }
+}
+
 export class AppState {
   $rootScope: ng.IRootScopeService;
   $timeout: ng.ITimeoutService;
@@ -72,7 +106,8 @@ export class AppState {
   userPreferences?: SNUserPrefs;
   multiEditorEnabled = false;
   showBetaWarning = false;
-  actionsMenu = new ActionsMenuState();
+  readonly actionsMenu = new ActionsMenuState();
+  readonly sync = new SyncState();
 
   /* @ngInject */
   constructor(
@@ -263,10 +298,16 @@ export class AppState {
 
   addAppEventObserver() {
     this.unsubApp = this.application.addEventObserver(async (eventName) => {
-      if (eventName === ApplicationEvent.Started) {
-        this.locked = true;
-      } else if (eventName === ApplicationEvent.Launched) {
-        this.locked = false;
+      switch (eventName) {
+        case ApplicationEvent.Started:
+          this.locked = true;
+          break;
+        case ApplicationEvent.Launched:
+          this.locked = false;
+          break;
+        case ApplicationEvent.SyncStatusChanged:
+          this.sync.update(this.application.getSyncStatus());
+          break;
       }
     });
   }

app/assets/stylesheets/_stylekit-sub.scss

@@ -34,6 +34,12 @@
   margin-left: 0.3rem;
 }
 
+.sk-horizontal-group {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
 .sk-panel-section {
   &:last-child {
     padding-bottom: 1rem;

app/assets/templates/directives/account-menu.pug

@@ -136,11 +136,11 @@
           !self.state.formData.showRegister`
         )
         .sk-panel-section(ng-if='self.state.user')
-          .sk-notification.danger(ng-if='self.syncStatus.error')
+          .sk-notification.danger(ng-if='self.state.syncError')
             .sk-notification-title Sync Unreachable
             .sk-notification-text
               | Hmm...we can't seem to sync your account.
-              | The reason: {{self.syncStatus.error.message}}
+              | The reason: {{self.state.syncError}}
             a.sk-a.info-contrast.sk-bold.sk-panel-row(
               href='https://standardnotes.org/help',
               rel='noopener',
@@ -150,17 +150,16 @@
             .sk-panel-column
               .sk-h1.sk-bold.wrap {{self.state.user.email}}
               .sk-subtitle.subtle.normal {{self.state.server}}
-            .sk-horizontal-group(
-              delay='1000',
-              delay-hide='true',
-              show='self.syncStatus.syncOpInProgress || self.syncStatus.needsMoreSync'
-              )
-              .sk-spinner.small.info
-              .sk-sublabel
-                | {{"Syncing" + (self.syncStatus.total > 0 ? ":" : "")}}
-                span(
-                  ng-if='self.syncStatus.total > 0'
-                  ) {{self.syncStatus.current}}/{{self.syncStatus.total}}
+          .sk-horizontal-group(
+            delay='1000',
+            delay-hide='true',
+            show='self.state.syncInProgress'
+            )
+            .sk-spinner.small.info
+            .sk-sublabel
+              | Syncing
+              span(ng-if='self.state.syncPercentage')
+                |  ({{self.state.syncPercentage}})
           .sk-panel-row
           a.sk-a.info.sk-panel-row.condensed(
             ng-click="self.openPasswordWizard()"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.5.9-beta01",
+  "version": "3.5.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2574,9 +2574,9 @@
       }
     },
     "@standardnotes/snjs": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@standardnotes/snjs/-/snjs-2.0.7.tgz",
-      "integrity": "sha512-S9h+ryQ225ekvCDwX4wFk7duic+j6644indtSLCiODo1SMflk8EQa7Q6Ier5lvBdUZJNxvZsN51iAgmIbT5BCQ==",
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/@standardnotes/snjs/-/snjs-2.0.11.tgz",
+      "integrity": "sha512-5Ymdd8mez2DNFu4fRmbpZ4BXeFmFhiIFlwZURp8ZM+zqJFRwCo5SXu813DghAU3x51+cPwBMR/3kwuh9GouIpQ==",
       "requires": {
         "@standardnotes/sncrypto-common": "^1.2.9"
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "standard-notes-web",
-  "version": "3.5.9-beta01",
+  "version": "3.5.9",
   "license": "AGPL-3.0-or-later",
   "repository": {
     "type": "git",
@@ -71,7 +71,7 @@
   "dependencies": {
     "@bugsnag/js": "^7.5.1",
     "@standardnotes/sncrypto-web": "^1.2.9",
-    "@standardnotes/snjs": "^2.0.7",
+    "@standardnotes/snjs": "^2.0.11",
     "mobx": "^6.0.1"
   }
 }

public/favicon/site.webmanifest

@@ -3,12 +3,12 @@
     "short_name": "",
     "icons": [
         {
-            "src": "favicon/android-chrome-192x192.png",
+            "src": "android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "favicon/android-chrome-512x512.png",
+            "src": "android-chrome-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         }