Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 13:55:21 +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

7
app/edge/views/edge-jobs/createEdgeJobView/createEdgeJobViewController.js
View file

@ -1,6 +1,8 @@
import { confirmWebEditorDiscard } from '@@/modals/confirm';
export class CreateEdgeJobViewController {
/* @ngInject */
constructor($async, $q, $state, $window, ModalService, EdgeJobService, GroupService, Notifications, TagService) {
constructor($async, $q, $state, $window, EdgeJobService, GroupService, Notifications, TagService) {
this.state = {
actionInProgress: false,
isEditorDirty: false,
@ -20,7 +22,6 @@ export class CreateEdgeJobViewController {
this.$q = $q;
this.$state = $state;
this.$window = $window;
this.ModalService = ModalService;
this.Notifications = Notifications;
this.GroupService = GroupService;
this.EdgeJobService = EdgeJobService;
@ -59,7 +60,7 @@ export class CreateEdgeJobViewController {
async uiCanExit() {
if (this.model.FileContent && this.state.isEditorDirty) {
return this.ModalService.confirmWebEditorDiscard();
return confirmWebEditorDiscard();
}
}

6
app/edge/views/edge-jobs/edgeJob/edgeJobController.js
View file

@ -1,9 +1,10 @@
import _ from 'lodash-es';
import { getEnvironments } from '@/react/portainer/environments/environment.service';
import { confirmWebEditorDiscard } from '@@/modals/confirm';
export class EdgeJobController {
/* @ngInject */
constructor($async, $q, $state, $window, ModalService, EdgeJobService, FileSaver, GroupService, HostBrowserService, Notifications, TagService) {
constructor($async, $q, $state, $window, EdgeJobService, FileSaver, GroupService, HostBrowserService, Notifications, TagService) {
this.state = {
actionInProgress: false,
showEditorTab: false,
@ -14,7 +15,6 @@ export class EdgeJobController {
this.$q = $q;
this.$state = $state;
this.$window = $window;
this.ModalService = ModalService;
this.EdgeJobService = EdgeJobService;
this.FileSaver = FileSaver;
this.GroupService = GroupService;
@ -127,7 +127,7 @@ export class EdgeJobController {
async uiCanExit() {
if (this.edgeJob && this.edgeJob.FileContent !== this.oldFileContent && this.state.isEditorDirty) {
return this.ModalService.confirmWebEditorDiscard();
return confirmWebEditorDiscard();
}
}

6
app/edge/views/edge-jobs/edgeJobsView/edgeJobsViewController.js
View file

@ -1,12 +1,12 @@
import _ from 'lodash-es';
import { confirmDelete } from '@@/modals/confirm';
export class EdgeJobsViewController {
/* @ngInject */
constructor($async, $state, EdgeJobService, ModalService, Notifications) {
constructor($async, $state, EdgeJobService, Notifications) {
this.$async = $async;
this.$state = $state;
this.EdgeJobService = EdgeJobService;
this.ModalService = ModalService;
this.Notifications = Notifications;
this.removeAction = this.removeAction.bind(this);
@ -15,7 +15,7 @@ export class EdgeJobsViewController {
}
removeAction(selectedItems) {
this.ModalService.confirmDeletion('Do you want to remove the selected edge job(s) ?', (confirmed) => {
confirmDelete('Do you want to remove the selected edge job(s)?').then((confirmed) => {
if (!confirmed) {
return;
}

7
app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js
View file

@ -1,11 +1,12 @@
import { EditorType } from '@/react/edge/edge-stacks/types';
import { PortainerEndpointTypes } from '@/portainer/models/endpoint/models';
import { getValidEditorTypes } from '@/react/edge/edge-stacks/utils';
import { confirmWebEditorDiscard } from '@@/modals/confirm';
export default class CreateEdgeStackViewController {
/* @ngInject */
constructor($state, $window, ModalService, EdgeStackService, EdgeGroupService, EdgeTemplateService, Notifications, FormHelper, $async, $scope) {
Object.assign(this, { $state, $window, ModalService, EdgeStackService, EdgeGroupService, EdgeTemplateService, Notifications, FormHelper, $async, $scope });
constructor($state, $window, EdgeStackService, EdgeGroupService, EdgeTemplateService, Notifications, FormHelper, $async, $scope) {
Object.assign(this, { $state, $window, EdgeStackService, EdgeGroupService, EdgeTemplateService, Notifications, FormHelper, $async, $scope });
this.formValues = {
Name: '',
@ -75,7 +76,7 @@ export default class CreateEdgeStackViewController {
uiCanExit() {
if (this.state.Method === 'editor' && this.formValues.StackFileContent && this.state.isEditorDirty) {
return this.ModalService.confirmWebEditorDiscard();
return confirmWebEditorDiscard();
}
}

6
app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js
View file

@ -1,13 +1,13 @@
import _ from 'lodash-es';
import { getEnvironments } from '@/react/portainer/environments/environment.service';
import { confirmWebEditorDiscard } from '@@/modals/confirm';
export class EditEdgeStackViewController {
/* @ngInject */
constructor($async, $state, $window, ModalService, EdgeGroupService, EdgeStackService, Notifications) {
constructor($async, $state, $window, EdgeGroupService, EdgeStackService, Notifications) {
this.$async = $async;
this.$state = $state;
this.$window = $window;
this.ModalService = ModalService;
this.EdgeGroupService = EdgeGroupService;
this.EdgeStackService = EdgeStackService;
this.Notifications = Notifications;
@ -64,7 +64,7 @@ export class EditEdgeStackViewController {
this.formValues.StackFileContent.replace(/(\r\n|\n|\r)/gm, '') !== this.oldFileContent.replace(/(\r\n|\n|\r)/gm, '') &&
this.state.isEditorDirty
) {
return this.ModalService.confirmWebEditorDiscard();
return confirmWebEditorDiscard();
}
}