fix: race condition where previous note actions may be displayed for …

…current note (#613)
standardnotes · Aug 13, 2021 · 41e1dd9 · 41e1dd9
1 parent 083d8f5
commit 41e1dd9
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/app/assets/javascripts/directives/views/actionsMenu.ts b/app/assets/javascripts/directives/views/actionsMenu.ts
@@ -2,7 +2,7 @@ import { WebApplication } from '@/ui_models/application';
 import { WebDirective } from './../../types';
 import template from '%/directives/actions-menu.pug';
 import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl';
-import { SNItem, Action, SNActionsExtension, UuidString } from '@standardnotes/snjs';
+import { SNItem, Action, SNActionsExtension, UuidString, CopyPayload } from '@standardnotes/snjs';
 import { ActionResponse } from '@standardnotes/snjs';
 import { ActionsExtensionMutator } from '@standardnotes/snjs';
 
@@ -27,7 +27,7 @@ type ActionsMenuState = {
   extensions: SNActionsExtension[]
   extensionsState: Record<UuidString, ExtensionState>
   selectedActionId?: number
-  menu: {
+  menuItems: {
     uuid: UuidString,
     name: string,
     loading: boolean,
@@ -57,33 +57,40 @@ class ActionsMenuCtrl extends PureViewCtrl<unknown, ActionsMenuState> implements
     });
     this.loadExtensions();
     this.autorun(() => {
-      this.rebuildMenu({
+      this.rebuildMenuState({
         hiddenExtensions: this.appState.actionsMenu.hiddenExtensions
       });
     });
   }
 
   /** @override */
   getInitialState() {
-    const extensions = this.application.actionsManager!.getExtensions().sort((a, b) => {
+    const extensions = this.application.actionsManager.getExtensions().sort((a, b) => {
       return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
+    }).map((extension) => {
+      return new SNActionsExtension(CopyPayload(extension.payload, {
+        content: {
+          ...extension.payload.safeContent,
+          actions: []
+        }
+      }));
     });
     const extensionsState: Record<UuidString, ExtensionState> = {};
     extensions.map((extension) => {
       extensionsState[extension.uuid] = {
-        loading: false,
+        loading: true,
         error: false,
       };
     });
     return {
       extensions,
       extensionsState,
       hiddenExtensions: {},
-      menu: [],
+      menuItems: [],
     };
   }
 
-  rebuildMenu({
+  rebuildMenuState({
     extensions = this.state.extensions,
     extensionsState = this.state.extensionsState,
     selectedActionId = this.state.selectedActionId,
@@ -93,7 +100,7 @@ class ActionsMenuCtrl extends PureViewCtrl<unknown, ActionsMenuState> implements
       extensions,
       extensionsState,
       selectedActionId,
-      menu: extensions.map(extension => {
+      menuItems: extensions.map(extension => {
         const state = extensionsState[extension.uuid];
         const hidden = hiddenExtensions[extension.uuid];
         return {
@@ -136,7 +143,7 @@ class ActionsMenuCtrl extends PureViewCtrl<unknown, ActionsMenuState> implements
 
   async executeAction(action: Action, extensionUuid: UuidString) {
     if (action.verb === 'nested') {
-      this.rebuildMenu({
+      this.rebuildMenuState({
         selectedActionId: action.id
       });
       return;
@@ -220,7 +227,7 @@ class ActionsMenuCtrl extends PureViewCtrl<unknown, ActionsMenuState> implements
       }
       return ext;
     });
-    await this.rebuildMenu({
+    await this.rebuildMenuState({
       extensions
     });
   }
@@ -236,7 +243,7 @@ class ActionsMenuCtrl extends PureViewCtrl<unknown, ActionsMenuState> implements
       }
       return ext;
     });
-    this.rebuildMenu({
+    this.rebuildMenuState({
       extensions
     });
   }
@@ -248,15 +255,15 @@ class ActionsMenuCtrl extends PureViewCtrl<unknown, ActionsMenuState> implements
   private setLoadingExtension(extensionUuid: UuidString, value = false) {
     const { extensionsState } = this.state;
     extensionsState[extensionUuid].loading = value;
-    this.rebuildMenu({
+    this.rebuildMenuState({
       extensionsState
     });
   }
 
   private setErrorExtension(extensionUuid: UuidString, value = false) {
     const { extensionsState } = this.state;
     extensionsState[extensionUuid].error = value;
-    this.rebuildMenu({
+    this.rebuildMenuState({
       extensionsState
     });
   }

diff --git a/app/assets/templates/directives/actions-menu.pug b/app/assets/templates/directives/actions-menu.pug
@@ -7,7 +7,7 @@
       target='blank'
       )
       menu-row(label="'Download Actions'")
-    div(ng-repeat='extension in self.state.menu track by extension.uuid')
+    div(ng-repeat='extension in self.state.menuItems track by extension.uuid')
       .sk-menu-panel-header(
         ng-click='self.toggleExtensionVisibility(extension.uuid); $event.stopPropagation();'
       )
@@ -33,11 +33,11 @@
       menu-row(
         faded='true',
         label="'No Actions Available'",
-        ng-if='!extension.actions.length'
+        ng-if='!extension.actions.length && !extension.hidden'
         )
       menu-row(
         faded='true',
         label="'Error loading actions'",
         subtitle="'Please try again later.'"
-        ng-if='extension.error'
+        ng-if='extension.error && !extension.hidden'
         )
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
     "@reach/checkbox": "^0.13.2",
     "@reach/dialog": "^0.13.0",
     "@standardnotes/sncrypto-web": "1.2.10",
-    "@standardnotes/snjs": "2.7.21",
+    "@standardnotes/snjs": "2.7.23",
     "mobx": "^6.3.2",
     "mobx-react-lite": "^3.2.0",
     "preact": "^10.5.12"