From de473fc10e00e272bd28932fd5b3de5f655d553f Mon Sep 17 00:00:00 2001
From: Chaim Lev-Ari <chiptus@users.noreply.github.com>
Date: Thu, 11 Apr 2024 19:04:58 +0300
Subject: [PATCH] refactor(docker): remove EndpointProvider from exec [EE-6462]
 (#10840)

---
 app/docker/rest/exec.js                                    | 7 +++----
 app/docker/services/execService.js                         | 4 ++--
 .../views/containers/console/containerConsoleController.js | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/docker/rest/exec.js b/app/docker/rest/exec.js
index 20c5035e4..780ab727c 100644
--- a/app/docker/rest/exec.js
+++ b/app/docker/rest/exec.js
@@ -3,13 +3,12 @@ import { genericHandler } from './response/handlers';
 angular.module('portainer.docker').factory('Exec', [
   '$resource',
   'API_ENDPOINT_ENDPOINTS',
-  'EndpointProvider',
-  function ExecFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
+  function ExecFactory($resource, API_ENDPOINT_ENDPOINTS) {
     'use strict';
     return $resource(
-      API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/exec/:id/:action',
+      API_ENDPOINT_ENDPOINTS + '/:environmentId/docker/exec/:id/:action',
       {
-        endpointId: EndpointProvider.endpointID,
+        environmentId: '@environmentId',
       },
       {
         resize: {
diff --git a/app/docker/services/execService.js b/app/docker/services/execService.js
index a6a29490f..36a0552ce 100644
--- a/app/docker/services/execService.js
+++ b/app/docker/services/execService.js
@@ -6,11 +6,11 @@ angular.module('portainer.docker').factory('ExecService', [
     'use strict';
     var service = {};
 
-    service.resizeTTY = function (execId, width, height, timeout) {
+    service.resizeTTY = function (environmentId, execId, width, height, timeout) {
       var deferred = $q.defer();
 
       $timeout(function () {
-        Exec.resize({}, { id: execId, height: height, width: width })
+        Exec.resize({ environmentId }, { id: execId, height: height, width: width })
           .$promise.then(function success(data) {
             if (data.message) {
               deferred.reject({ msg: 'Unable to resize tty of exec', err: data.message });
diff --git a/app/docker/views/containers/console/containerConsoleController.js b/app/docker/views/containers/console/containerConsoleController.js
index 57551796e..c23aaf20f 100644
--- a/app/docker/views/containers/console/containerConsoleController.js
+++ b/app/docker/views/containers/console/containerConsoleController.js
@@ -121,7 +121,7 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
               .map((k) => k + '=' + params[k])
               .join('&');
 
-          initTerm(url, ExecService.resizeTTY.bind(this, params.id));
+          initTerm(url, ExecService.resizeTTY.bind(this, endpoint.Id, params.id));
         })
         .catch(function error(err) {
           Notifications.error('Failure', err, 'Unable to exec into container');