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

refactor(ui/modals): replace bootbox with react solution [EE-4541] (#8010)

Browse source
This commit is contained in:
Chaim Lev-Ari 2023-02-14 13:49:41 +05:30 • committed by GitHub
parent 392c7f74b8
commit e66dea44e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
111 changed files with 1330 additions and 1562 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/docker/views/images/build/buildImageController.js
View file

@ -1,9 +1,10 @@
import { confirmWebEditorDiscard } from '@@/modals/confirm';
import { options } from './options';
angular.module('portainer.docker').controller('BuildImageController', BuildImageController);
/* @ngInject */
function BuildImageController($scope, $async, $window, ModalService, BuildService, Notifications, HttpRequestHelper, endpoint) {
function BuildImageController($scope, $async, $window, BuildService, Notifications, HttpRequestHelper, endpoint) {
$scope.endpoint = endpoint;
$scope.options = options;
@ -154,7 +155,7 @@ function BuildImageController($scope, $async, $window, ModalService, BuildServic
this.uiCanExit = async function () {
if ($scope.state.BuildType === 'editor' && $scope.formValues.DockerFileContent && $scope.state.isEditorDirty) {
return ModalService.confirmWebEditorDiscard();
return confirmWebEditorDiscard();
}
};

8
app/docker/views/images/edit/imageController.js
View file

@ -1,5 +1,6 @@
import _ from 'lodash-es';
import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
import { confirmImageExport } from '@/react/docker/images/common/ConfirmExportModal';
angular.module('portainer.docker').controller('ImageController', [
'$async',
@ -13,11 +14,9 @@ angular.module('portainer.docker').controller('ImageController', [
'RegistryService',
'Notifications',
'HttpRequestHelper',
'ModalService',
'FileSaver',
'Blob',
'endpoint',
'EndpointService',
'RegistryModalService',
function (
$async,
@ -31,11 +30,9 @@ angular.module('portainer.docker').controller('ImageController', [
RegistryService,
Notifications,
HttpRequestHelper,
ModalService,
FileSaver,
Blob,
endpoint,
EndpointService,
RegistryModalService
) {
$scope.endpoint = endpoint;
@ -90,6 +87,7 @@ angular.module('portainer.docker').controller('ImageController', [
return $async(async () => {
try {
const registryModel = await RegistryModalService.registryModal(repository, $scope.registries);
if (registryModel) {
$('#uploadResourceHint').show();
await ImageService.pushImage(registryModel);
@ -171,7 +169,7 @@ angular.module('portainer.docker').controller('ImageController', [
return;
}
ModalService.confirmImageExport(function (confirmed) {
confirmImageExport(function (confirmed) {
if (!confirmed) {
return;
}

20
app/docker/views/images/imagesController.js
View file

@ -1,5 +1,9 @@
import _ from 'lodash-es';
import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
import { ModalType } from '@@/modals';
import { confirmImageExport } from '@/react/docker/images/common/ConfirmExportModal';
import { confirm } from '@@/modals/confirm';
import { buildConfirmButton } from '@@/modals/utils';
angular.module('portainer.docker').controller('ImagesController', [
'$scope',
@ -7,12 +11,11 @@ angular.module('portainer.docker').controller('ImagesController', [
'Authentication',
'ImageService',
'Notifications',
'ModalService',
'HttpRequestHelper',
'FileSaver',
'Blob',
'endpoint',
function ($scope, $state, Authentication, ImageService, Notifications, ModalService, HttpRequestHelper, FileSaver, Blob, endpoint) {
function ($scope, $state, Authentication, ImageService, Notifications, HttpRequestHelper, FileSaver, Blob, endpoint) {
$scope.endpoint = endpoint;
$scope.isAdmin = Authentication.isAdmin();
@ -52,7 +55,7 @@ angular.module('portainer.docker').controller('ImagesController', [
};
$scope.confirmRemovalAction = function (selectedItems, force) {
ModalService.confirmImageForceRemoval(function (confirmed) {
confirmImageForceRemoval().then((confirmed) => {
if (!confirmed) {
return;
}
@ -104,7 +107,7 @@ angular.module('portainer.docker').controller('ImagesController', [
return;
}
ModalService.confirmImageExport(function (confirmed) {
confirmImageExport(function (confirmed) {
if (!confirmed) {
return;
}
@ -158,3 +161,12 @@ angular.module('portainer.docker').controller('ImagesController', [
initView();
},
]);
function confirmImageForceRemoval() {
return confirm({
title: 'Are you sure?',
modalType: ModalType.Destructive,
message: 'Forcing the removal of the image will remove the image even if it has multiple tags or if it is used by stopped containers.',
confirmButton: buildConfirmButton('Remote the image', 'danger'),
});
}