fix(plugins/plugin-client-common): clicking on pod delete button can …

…cause command to be executed in minisplit Fixes #5247
kubernetes-sigs · Jul 23, 2020 · e76f8a0 · e76f8a0
1 parent 3850efd
commit e76f8a0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/plugins/plugin-client-common/src/components/Views/Sidecar/ToolbarButton.tsx b/plugins/plugin-client-common/src/components/Views/Sidecar/ToolbarButton.tsx
@@ -21,6 +21,7 @@ import {
   ResourceWithMetadata,
   isViewButton,
   MultiModalResponse,
+  pexecInCurrentTab,
   ParsedOptions
 } from '@kui-shell/core'
 
@@ -59,7 +60,7 @@ export default class ToolbarButton<T extends ResourceWithMetadata = ResourceWith
       if (isViewButton(button) || button.confirm) {
         return tab.REPL.qexec(cmd, undefined, undefined, { rethrowErrors: true })
       } else {
-        return tab.REPL.pexec(cmd)
+        return pexecInCurrentTab(cmd)
       }
     } else {
       cmd(tab, response, args)

diff --git a/plugins/plugin-client-common/src/controller/confirm.ts b/plugins/plugin-client-common/src/controller/confirm.ts
@@ -14,7 +14,15 @@
  * limitations under the License.
  */
 
-import { eventChannelUnsafe, getPrimaryTabId, Registrar, ExecType, UsageModel, i18n } from '@kui-shell/core'
+import {
+  eventChannelUnsafe,
+  getPrimaryTabId,
+  Registrar,
+  ExecType,
+  UsageModel,
+  i18n,
+  pexecInCurrentTab
+} from '@kui-shell/core'
 
 const strings = i18n('plugin-core-support')
 
@@ -57,7 +65,7 @@ export default async (commandTree: Registrar) => {
           if (!confirmed) {
             reject(strings('operationCancelled'))
           } else if (execOptions.type === ExecType.Nested) {
-            REPL.pexec(command, { tab }).then(resolve, reject)
+            pexecInCurrentTab(command).then(resolve, reject)
           } else {
             REPL.qexec(command, undefined, undefined, { tab }).then(resolve, reject)
           }