Merge pull request #1222 from vincent99/master

Fix question charts saving to values (#1221)
rancher · Sep 11, 2020 · 9ab4ea3 · 9ab4ea3
2 parents 7dd90c7 + 000ad98
commit 9ab4ea3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pages/c/_cluster/apps/install.vue b/pages/c/_cluster/apps/install.vue
@@ -306,6 +306,10 @@ export default {
 
       return EDITOR_MODES.EDIT_CODE;
     },
+
+    hasQuestions() {
+      return this.versionInfo && !!this.versionInfo.questions;
+    }
   },
 
   watch: {
@@ -525,7 +529,7 @@ export default {
     actionInput(isUpgrade) {
       const fromChart = this.versionInfo.values || {};
 
-      if ( !this.valuesComponent ) {
+      if ( !this.valuesComponent && !this.hasQuestions ) {
         try {
           this.chartValues = jsyaml.safeLoad(this.valuesYaml);
         } catch (err) {
@@ -787,7 +791,7 @@ export default {
           </tab>
         </template>
         <Questions
-          v-else-if="versionInfo && versionInfo.questions"
+          v-else-if="hasQuestions"
           v-model="chartValues"
           :chart="chart"
           :version="version"

diff --git a/plugins/steve/resource-instance.js b/plugins/steve/resource-instance.js
@@ -958,10 +958,10 @@ export default {
 
       for ( const item of items ) {
         let name = `${ item.nameDisplay }.yaml`;
-        const i = 2;
+        let i = 2;
 
         while ( names.includes(name) ) {
-          name = `${ item.nameDisplay }_${ i }.yaml`;
+          name = `${ item.nameDisplay }_${ i++ }.yaml`;
         }
 
         names.push(name);