From fe47318e26ecec697d00c8c3f491c73ccf90f86f Mon Sep 17 00:00:00 2001 From: Dakota Walsh <101994734+dakota-portainer@users.noreply.github.com> Date: Wed, 24 Jan 2024 09:45:40 +1300 Subject: [PATCH] fix(terminal): display os specific copy/paste tooltip EE-1976 (#10835) --- .../console/containerConsoleController.js | 5 ++- app/docker/views/containers/console/exec.html | 8 ++-- app/portainer/react/components/index.ts | 2 + .../TerminalTooltip/TerminalTooltip.tsx | 42 +++++++++++++++++++ app/react/components/TerminalTooltip/index.ts | 1 + .../applications/ConsoleView/ConsoleView.tsx | 7 +++- .../KubectlShell/KubectlShell.tsx | 34 +++++++++------ 7 files changed, 81 insertions(+), 18 deletions(-) create mode 100644 app/react/components/TerminalTooltip/TerminalTooltip.tsx create mode 100644 app/react/components/TerminalTooltip/index.ts diff --git a/app/docker/views/containers/console/containerConsoleController.js b/app/docker/views/containers/console/containerConsoleController.js index 7f832ae71..57551796e 100644 --- a/app/docker/views/containers/console/containerConsoleController.js +++ b/app/docker/views/containers/console/containerConsoleController.js @@ -183,8 +183,11 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [ socket.onopen = function () { $scope.state = states.connected; term = new Terminal(); + socket.send('export LANG=C.UTF-8\n'); + socket.send('export LC_ALL=C.UTF-8\n'); + socket.send('clear\n'); - term.on('data', function (data) { + term.onData(function (data) { socket.send(data); }); var terminal_container = document.getElementById('terminal-container'); diff --git a/app/docker/views/containers/console/exec.html b/app/docker/views/containers/console/exec.html index 4279c9654..c1ebf8951 100644 --- a/app/docker/views/containers/console/exec.html +++ b/app/docker/views/containers/console/exec.html @@ -69,9 +69,11 @@
- Exec  into container as {{ ::formValues.user || 'default user' }} using command + {{ formValues.isCustomCommand ? formValues.customCommand : formValues.command }} + + >