diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js index 807f05192..19d19a841 100644 --- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js +++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js @@ -9,5 +9,6 @@ angular.module('portainer.app').component('endpointsDatatable', { reverseOrder: '<', removeAction: '<', retrievePage: '<', + setLoadingMessage: '<', }, }); diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatableController.js b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatableController.js index ae9543367..5619cd17f 100644 --- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatableController.js +++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatableController.js @@ -101,6 +101,7 @@ angular.module('portainer.app').controller('EndpointsDatatableController', [ }; this.associateOpenAMT = function (endpoints) { + const setLoadingMessage = this.setLoadingMessage; ModalService.confirm({ title: 'Are you sure?', message: 'This operation will associate the selected environments with OpenAMT.', @@ -114,6 +115,8 @@ angular.module('portainer.app').controller('EndpointsDatatableController', [ if (!confirmed) { return; } + + setLoadingMessage('Activating Active Management Technology on selected devices...'); for (let endpoint of endpoints) { try { await OpenAMTService.activateDevice(endpoint.Id); diff --git a/app/portainer/views/endpoints/endpoints.html b/app/portainer/views/endpoints/endpoints.html index 657cceb86..dbb0a1c06 100644 --- a/app/portainer/views/endpoints/endpoints.html +++ b/app/portainer/views/endpoints/endpoints.html @@ -7,7 +7,24 @@ Environment management -
+
+
+
+
+
+
+
+ + {{ state.loadingMessage }} + + +
+ +
diff --git a/app/portainer/views/endpoints/endpointsController.js b/app/portainer/views/endpoints/endpointsController.js index de39bda59..d71346954 100644 --- a/app/portainer/views/endpoints/endpointsController.js +++ b/app/portainer/views/endpoints/endpointsController.js @@ -4,8 +4,16 @@ import EndpointHelper from 'Portainer/helpers/endpointHelper'; angular.module('portainer.app').controller('EndpointsController', EndpointsController); function EndpointsController($q, $scope, $state, $async, EndpointService, GroupService, ModalService, Notifications, EndpointProvider, StateManager) { - $scope.removeAction = removeAction; + $scope.state = { + loadingMessage: '', + }; + $scope.setLoadingMessage = setLoadingMessage; + function setLoadingMessage(message) { + $scope.state.loadingMessage = message; + } + + $scope.removeAction = removeAction; function removeAction(endpoints) { ModalService.confirmDeletion('This action will remove all configurations associated to your environment(s). Continue?', (confirmed) => { if (!confirmed) {