Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-28 17:59:45 +02:00
Code Issues Releases Activity

refactor(docker/containers): remove EndpointProvider from container service [EE-6180] (#10392)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-10-11 10:26:44 +03:00 • committed by GitHub
parent b80fcb0467
commit 8e1417b4e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 102 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/docker/views/containers/console/containerConsoleController.js
View file

@ -15,6 +15,7 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
'LocalStorage',
'CONSOLE_COMMANDS_LABEL_PREFIX',
'SidebarService',
'endpoint',
function (
$scope,
$state,
@ -27,7 +28,8 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
HttpRequestHelper,
LocalStorage,
CONSOLE_COMMANDS_LABEL_PREFIX,
SidebarService
SidebarService,
endpoint
) {
var socket, term;
@ -58,7 +60,7 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
let attachId = $transition$.params().id;
ContainerService.container(attachId)
ContainerService.container(endpoint.Id, attachId)
.then((details) => {
if (!details.State.Running) {
Notifications.error('Failure', details, 'Container ' + attachId + ' is not running!');
@ -79,7 +81,7 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
.map((k) => k + '=' + params[k])
.join('&');
initTerm(url, ContainerService.resizeTTY.bind(this, attachId));
initTerm(url, ContainerService.resizeTTY.bind(this, endpoint.Id, attachId));
})
.catch(function error(err) {
Notifications.error('Error', err, 'Unable to retrieve container details');
@ -104,7 +106,7 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
Cmd: commandStringToArray(command),
};
ContainerService.createExec(execConfig)
ContainerService.createExec(endpoint.Id, execConfig)
.then(function success(data) {
const params = {
endpointId: $state.params.endpointId,
@ -217,7 +219,7 @@ angular.module('portainer.docker').controller('ContainerConsoleController', [
$scope.initView = function () {
HttpRequestHelper.setPortainerAgentTargetHeader($transition$.params().nodeName);
return ContainerService.container($transition$.params().id)
return ContainerService.container(endpoint.Id, $transition$.params().id)
.then(function success(data) {
var container = data;
$scope.container = container;