Merge pull request #1427 from vincent99/master

More bool defaults
rancher · Sep 25, 2020 · 0b19f3f · 0b19f3f
2 parents c124cf3 + 7373288
commit 0b19f3f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git a/assets/translations/en-us.yaml b/assets/translations/en-us.yaml
@@ -219,10 +219,10 @@ catalog:
       placeholder: e.g. https://charts.rancher.io
     gitRepo:
       label: Git Repo URL
-      placeholder: e.g. https://github.com/rancher/charts.git
+      placeholder: e.g. https://github.com/your-company/charts.git
     gitBranch:
       label: Git Branch
-      placeholder: e.g. dev-v2.5
+      placeholder: e.g. master
   charts:
     header: Deploy Chart
     certified:

diff --git a/components/Questions/Question.js b/components/Questions/Question.js
@@ -34,13 +34,13 @@ export default {
   },
 
   created() {
-    if ( !this.value && this.question.default !== undefined ) {
-      let def = this.question.default;
+    let def = this.question.default;
 
-      if ( this.question.type === 'boolean' && typeof def === 'string' ) {
-        def = def === 'true';
-      }
+    if ( this.question.type === 'boolean' && typeof def === 'string' ) {
+      def = def === 'true';
+    }
 
+    if ( this.value === undefined && def !== undefined ) {
       this.$emit('input', def);
     }
   },

diff --git a/pages/c/_cluster/apps/install.vue b/pages/c/_cluster/apps/install.vue
@@ -445,10 +445,6 @@ export default {
 
       this.$nextTick(() => {
         window.location.hash = '#values-yaml';
-        if ( this.$refs.yaml ) {
-          this.$refs.yaml.refresh();
-          this.$refs.yaml.focus();
-        }
       });
     },
 
@@ -678,8 +674,17 @@ export default {
       window.scrollTop = 0;
 
       this.selectedTabName = tab.name;
+
+      if ( tab.name === 'values-yaml' ) {
+        this.$nextTick(() => {
+          if ( this.$refs.yaml ) {
+            this.$refs.yaml.refresh();
+            this.$refs.yaml.focus();
+          }
+        });
+      }
     },
-  }
+  },
 };
 </script>
 
@@ -905,7 +910,7 @@ export default {
             </template>
 
             <button
-              v-if="(showValuesComponent || hasQuestions) && isValuesTab"
+              v-if="(showValuesComponent || hasQuestions) && isValuesTab && !showPreview"
               type="button"
               class="btn role-secondary"
               @click="preview"