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

fix(stack/template): web editor error shows for changing between same mustache templates [EE-6563] (#10976)

pull/10980/head
Oscar Zhou 2024-01-19 09:28:09 +13:00 committed by GitHub
parent 1676fefd97
commit fa63432695
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/edge/views/edge-stacks/createEdgeStackView/create-edge-stack-view.controller.js
View File

@ -85,7 +85,11 @@ export default class CreateEdgeStackViewController {
await this.onChangeTemplate(newTemplateValues.template);
}
const newFile = renderTemplate(this.state.templateValues.file, this.state.templateValues.variables, this.state.templateValues.template.Variables);
let definitions = [];
if (this.state.templateValues.template) {
definitions = this.state.templateValues.template.Variables;
}
const newFile = renderTemplate(this.state.templateValues.file, this.state.templateValues.variables, definitions);
this.formValues.StackFileContent = newFile;
});

2
app/portainer/helpers/stackHelper.js
View File

@ -33,7 +33,7 @@ function validateYAML(yaml, containerNames, originalContainersNames = []) {
let yamlObject;
try {
yamlObject = YAML.parse(yaml);
yamlObject = YAML.parse(yaml, { mapAsMap: true });
} catch (err) {
return 'There is an error in the yaml syntax: ' + err;
}

2
app/portainer/react/components/custom-templates/variables-field.ts
View File

@ -33,7 +33,7 @@ class VariablesFieldController implements IComponentController {
}
$onChanges({ value }: IOnChangesObject) {
if (value.currentValue) {
if (value?.currentValue) {
this.checkValidity(value.currentValue);
}
}

1
app/portainer/views/stacks/create/createStackController.js
View File

@ -328,6 +328,7 @@ angular
return;
}
const rendered = renderTemplate($scope.state.templateContent, $scope.formValues.Variables, $scope.state.selectedTemplate.Variables);
$scope.state.editorYamlValidationError = StackHelper.validateYAML(rendered, $scope.containerNames);
onChangeFormValues({ StackFileContent: rendered });
}