Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-07 14:55:27 +02:00
Code Issues Releases Activity

fix(deletion): delete objects batch by batch EE-7084 (#11833)
Some checks failed
Test / test-server (map[arch:amd64 platform:linux]) (push) Has been cancelled
ci / build_images (map[arch:amd64 platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:amd64 platform:windows version:1809]) (push) Has been cancelled
ci / build_images (map[arch:amd64 platform:windows version:ltsc2022]) (push) Has been cancelled
ci / build_images (map[arch:arm platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:arm64 platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:ppc64le platform:linux version:]) (push) Has been cancelled
ci / build_images (map[arch:s390x platform:linux version:]) (push) Has been cancelled
/ triage (push) Has been cancelled
Lint / Run linters (push) Has been cancelled
Test / test-client (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:windows version:1809]) (push) Has been cancelled
Test / test-server (map[arch:amd64 platform:windows version:ltsc2022]) (push) Has been cancelled
Test / test-server (map[arch:arm64 platform:linux]) (push) Has been cancelled
ci / build_manifests (push) Has been cancelled

Browse source
This commit is contained in:
cmeng 2024-05-16 14:34:50 +12:00 • committed by GitHub
parent 00ab9e949a
commit 3924d0f081
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 79 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/portainer/views/stacks/stacksController.js
View file

@ -1,3 +1,5 @@
import { processItemsInBatches } from '@/react/common/processItemsInBatches';
angular.module('portainer.app').controller('StacksController', StacksController);
/* @ngInject */
@ -6,11 +8,11 @@ function StacksController($scope, $state, Notifications, StackService, Authentic
return deleteSelectedStacks(selectedItems);
};
function deleteSelectedStacks(stacks) {
async function deleteSelectedStacks(selectedItems) {
const endpointId = endpoint.Id;
let actionCount = stacks.length;
angular.forEach(stacks, function (stack) {
StackService.remove(stack, stack.External, endpointId)
async function doRemove(stack) {
return StackService.remove(stack, stack.External, endpointId)
.then(function success() {
Notifications.success('Stack successfully removed', stack.Name);
var index = $scope.stacks.indexOf(stack);
@ -18,14 +20,11 @@ function StacksController($scope, $state, Notifications, StackService, Authentic
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to remove stack ' + stack.Name);
})
.finally(function final() {
--actionCount;
if (actionCount === 0) {
$state.reload();
}
});
});
}
await processItemsInBatches(selectedItems, doRemove);
$state.reload();
}
$scope.createEnabled = false;

18
app/portainer/views/users/usersController.js
View file

@ -1,5 +1,6 @@
import _ from 'lodash-es';
import { AuthenticationMethod } from '@/react/portainer/settings/types';
import { processItemsInBatches } from '@/react/common/processItemsInBatches';
angular.module('portainer.app').controller('UsersController', [
'$q',
@ -69,10 +70,9 @@ angular.module('portainer.app').controller('UsersController', [
});
};
function deleteSelectedUsers(selectedItems) {
var actionCount = selectedItems.length;
angular.forEach(selectedItems, function (user) {
UserService.deleteUser(user.Id)
async function deleteSelectedUsers(selectedItems) {
async function doRemove(user) {
return UserService.deleteUser(user.Id)
.then(function success() {
Notifications.success('User successfully removed', user.Username);
var index = $scope.users.indexOf(user);
@ -80,14 +80,10 @@ angular.module('portainer.app').controller('UsersController', [
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to remove user');
})
.finally(function final() {
--actionCount;
if (actionCount === 0) {
$state.reload();
}
});
});
}
await processItemsInBatches(selectedItems, doRemove);
$state.reload();
}
$scope.removeAction = function (selectedItems) {