github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5079 from portainer/fix/EE-769/code-editor-prompt-on-change 

fix(stacks): check for editor change before setting as dirty
pull/5090/head
wheresolivia 2021-05-20 18:44:46 +12:00 committed by GitHub
parent b3784792fe 5618794927
commit ef8794c2b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/edge/components/edit-edge-stack-form/editEdgeStackFormController.js
View File

@ -5,7 +5,9 @@ export class EditEdgeStackFormController {
} }
editorUpdate(cm) { editorUpdate(cm) {
if (this.model.StackFileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) {
this.model.StackFileContent = cm.getValue(); this.model.StackFileContent = cm.getValue();
this.isEditorDirty = true; this.isEditorDirty = true;
} }
}
} }

2
app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationDataController.js
View File

@ -43,9 +43,11 @@ class KubernetesConfigurationDataController {
} }
async editorUpdateAsync(cm) { async editorUpdateAsync(cm) {
if (this.formValues.DataYaml !== cm.getValue()) {
this.formValues.DataYaml = cm.getValue(); this.formValues.DataYaml = cm.getValue();
this.isEditorDirty = true; this.isEditorDirty = true;
} }
}
editorUpdate(cm) { editorUpdate(cm) {
return this.$async(this.editorUpdateAsync, cm); return this.$async(this.editorUpdateAsync, cm);

2
app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateViewController.js
View File

@ -96,9 +96,11 @@ class EditCustomTemplateViewController {
} }
editorUpdate(cm) { editorUpdate(cm) {
if (this.formValues.FileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) {
this.formValues.FileContent = cm.getValue(); this.formValues.FileContent = cm.getValue();
this.state.isEditorDirty = true; this.state.isEditorDirty = true;
} }
}
async uiCanExit() { async uiCanExit() {
if (this.formValues.FileContent !== this.oldFileContent && this.state.isEditorDirty) { if (this.formValues.FileContent !== this.oldFileContent && this.state.isEditorDirty) {

5
app/portainer/views/stacks/edit/stackController.js
View File

@ -201,12 +201,11 @@ angular.module('portainer.app').controller('StackController', [
}; };
$scope.editorUpdate = function (cm) { $scope.editorUpdate = function (cm) {
if ($scope.stackFileContent !== cm.getValue()) { if ($scope.stackFileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) {
$scope.state.isEditorDirty = true; $scope.state.isEditorDirty = true;
}
$scope.stackFileContent = cm.getValue(); $scope.stackFileContent = cm.getValue();
$scope.state.yamlError = StackHelper.validateYAML($scope.stackFileContent, $scope.containerNames); $scope.state.yamlError = StackHelper.validateYAML($scope.stackFileContent, $scope.containerNames);
$scope.state.isEditorDirty = true; }
}; };
$scope.stopStack = stopStack; $scope.stopStack = stopStack;