make createNavigateOrTab return promise

signumsoftware · Jul 18, 2019 · 235df9c · 235df9c
1 parent 5f33538
commit 235df9c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Signum.React/Scripts/Navigator.tsx b/Signum.React/Scripts/Navigator.tsx
@@ -645,16 +645,17 @@ export function createInNewTab(pack: EntityPack<ModifiableEntity>) {
   var win = window.open(url);
 }
 
-export function createNavigateOrTab(pack: EntityPack<Entity>, event: React.MouseEvent<any>) {
+export function createNavigateOrTab(pack: EntityPack<Entity>, event: React.MouseEvent<any>) : Promise<void> {
   if (!pack || !pack.entity)
-    return;
+    return Promise.resolve();
 
   const es = getSettings(pack.entity.Type);
   if (es && es.avoidPopup || event.ctrlKey || event.button == 1) {
     createInNewTab(pack);
+    return Promise.resolve();
   }
   else {
-    navigate(pack);
+    return navigate(pack);
   }
 }
 

diff --git a/Signum.React/Scripts/Operations/ContextualOperations.tsx b/Signum.React/Scripts/Operations/ContextualOperations.tsx
@@ -63,7 +63,9 @@ function defaultConstructFromMany(coc: ContextualOperationContext<Entity>, ...ar
       return;
 
     API.constructFromMany<Entity, Entity>(coc.context.lites, coc.operationInfo.key, ...args).then(pack => {
-      Navigator.createNavigateOrTab(pack, coc.event!);
+      Navigator.createNavigateOrTab(pack, coc.event!)
+        .then(() => coc.context.markRows({}))
+        .done();
     }).done();
   }).done();
 
@@ -243,8 +245,9 @@ export function defaultContextualClick(coc: ContextualOperationContext<any>, ...
           API.constructFromLite(coc.context.lites[0], coc.operationInfo.key, ...args)
             .then(coc.onConstructFromSuccess || (pack => {
               notifySuccess();
-              coc.context.markRows({});
-              Navigator.createNavigateOrTab(pack, coc.event!);
+              Navigator.createNavigateOrTab(pack, coc.event!)
+                .then(() => coc.context.markRows({}))
+                .done();
             }))
             .done();
         } else {