From 24b87b81d52ec38abf2eb10a597695c89b24afa0 Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Fri, 17 Jul 2020 14:28:32 +0100
Subject: [PATCH] ui: Fix sticky action popover menus (#8326)

* ui Close more-popover-menus in KV and nspaces on confirmation

* ui: Close more-popovermenus on confirmation on composite-rows
---
 ui-v2/app/components/more-popover-menu/action/index.hbs | 2 +-
 ui-v2/app/components/more-popover-menu/index.hbs        | 3 ++-
 ui-v2/app/templates/dc/kv/index.hbs                     | 4 ++--
 ui-v2/app/templates/dc/nspaces/index.hbs                | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui-v2/app/components/more-popover-menu/action/index.hbs b/ui-v2/app/components/more-popover-menu/action/index.hbs
index c56b2ee2f0..79c1432bd0 100644
--- a/ui-v2/app/components/more-popover-menu/action/index.hbs
+++ b/ui-v2/app/components/more-popover-menu/action/index.hbs
@@ -7,7 +7,7 @@
   <div role="menu">
     <YieldSlot @name="confirmation" @params={{
       block-params (component 'confirmation-alert'
-        onclick=(action onclick)
+        onclick=(queue (action onclick) (action menu.clickTrigger))
         name=(concat menu.confirm guid)
       )
     }}>{{yield}}</YieldSlot>
diff --git a/ui-v2/app/components/more-popover-menu/index.hbs b/ui-v2/app/components/more-popover-menu/index.hbs
index 4ff23e8858..73cd67e16d 100644
--- a/ui-v2/app/components/more-popover-menu/index.hbs
+++ b/ui-v2/app/components/more-popover-menu/index.hbs
@@ -3,12 +3,13 @@
     <BlockSlot @name="trigger">
       More
     </BlockSlot>
-    <BlockSlot @name="menu" as |confirm send keypressClick|>
+    <BlockSlot @name="menu" as |confirm send keypressClick clickTrigger|>
       {{yield (component 'more-popover-menu/action' menu=(hash
         addSubmenu=api.addSubmenu
         removeSubmenu=api.removeSubmenu
         confirm=confirm
         keypressClick=keypressClick
+        clickTrigger=clickTrigger
       ))}}
     </BlockSlot>
   </PopoverMenu>
diff --git a/ui-v2/app/templates/dc/kv/index.hbs b/ui-v2/app/templates/dc/kv/index.hbs
index 6d18c6c820..89154bc721 100644
--- a/ui-v2/app/templates/dc/kv/index.hbs
+++ b/ui-v2/app/templates/dc/kv/index.hbs
@@ -56,7 +56,7 @@
               <BlockSlot @name="trigger">
                 More
               </BlockSlot>
-              <BlockSlot @name="menu" as |confirm send keypressClick|>
+              <BlockSlot @name="menu" as |confirm send keypressClick clickTrigger|>
                   <li role="none">
                     <a data-test-edit role="menuitem" tabindex="-1" href={{href-to (if item.isFolder 'dc.kv.folder' 'dc.kv.edit') item.Key}}>{{if item.isFolder 'View' 'Edit'}}</a>
                   </li>
@@ -74,7 +74,7 @@
                         </div>
                         <ul>
                           <li class="dangerous">
-                            <button tabindex="-1" type="button" class="type-delete" onclick={{action send 'delete' item}}>Delete</button>
+                            <button tabindex="-1" type="button" class="type-delete" onclick={{queue (action send 'delete' item) (action clickTrigger)}}>Delete</button>
                           </li>
                           <li>
                             <label for={{confirm}}>Cancel</label>
diff --git a/ui-v2/app/templates/dc/nspaces/index.hbs b/ui-v2/app/templates/dc/nspaces/index.hbs
index 0e9fdc5c78..9d3f37aebb 100644
--- a/ui-v2/app/templates/dc/nspaces/index.hbs
+++ b/ui-v2/app/templates/dc/nspaces/index.hbs
@@ -58,7 +58,7 @@
               <BlockSlot @name="trigger">
                 More
               </BlockSlot>
-              <BlockSlot @name="menu" as |confirm send keypressClick|>
+              <BlockSlot @name="menu" as |confirm send keypressClick clickTrigger|>
                   <li role="none">
                     <a data-test-edit role="menuitem" tabindex="-1" href={{href-to 'dc.nspaces.edit' item.Name}}>Edit</a>
                   </li>
@@ -77,7 +77,7 @@
                         </div>
                         <ul>
                           <li class="dangerous">
-                            <button tabindex="-1" type="button" class="type-delete" onclick={{action send 'delete' item}}>Delete</button>
+                            <button tabindex="-1" type="button" class="type-delete" onclick={{queue (action send 'delete' item) (queue clickTrigger)}}>Delete</button>
                           </li>
                           <li>
                             <label for={{confirm}}>Cancel</label>