rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3408 from westlywright/catalog.app.answer.sync 

[2.3.2] Parse yaml answers from project level app & edit as yaml
This commit is contained in:
Westly Wright 2019-10-02 14:01:26 -07:00 committed by GitHub
parent 7004f1e500 c50db32ad7
commit c253ebc33e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/components/new-catalog/component.js
View File

@ -15,6 +15,7 @@ import CatalogApp from 'shared/mixins/catalog-app';
import { isNumeric } from 'shared/utils/util';
import convertDotAnswersToYaml from 'shared/utils/convert-yaml';
import ChildHook from 'shared/mixins/child-hook';
import flatMap from 'shared/utils/flat-map';
export default Component.extend(NewOrEdit, CatalogApp, ChildHook, {
catalog: service(),
@ -171,15 +172,20 @@ export default Component.extend(NewOrEdit, CatalogApp, ChildHook, {
}
}),
answersString: computed('answersArray.@each.{variable,answer}', function() {
answersString: computed('answersArray.@each.{variable,answer}', 'selectedTemplateModel.valuesYaml', function() {
let model = get(this, 'selectedTemplateModel');
if (get(model, 'questions')) {
let neu = {};
(get(this, 'answersArray') || []).forEach((a) => {
neu[a.variable] = isEmpty(a.answer) ? a.default : a.answer;
});
if (model.valuesYaml && model.valuesYaml.length > 0) {
neu = YAML.parse(model.valuesYaml);
neu = flatMap(neu);
} else {
(get(this, 'answersArray') || []).forEach((a) => {
neu[a.variable] = isEmpty(a.answer) ? a.default : a.answer;
});
}
const customAnswers = get(model, 'customAnswers') || {};