Merge pull request #1115 from vincent99/master

Show chart version picker even if name/ns are fixed
rancher · Aug 27, 2020 · 7af7cea · 7af7cea
2 parents f035bdc + b854348
commit 7af7cea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/components/form/NameNsDescription.vue b/components/form/NameNsDescription.vue
@@ -51,6 +51,10 @@ export default {
       type:    Boolean,
       default: false,
     },
+    nameNsHidden: {
+      type:    Boolean,
+      default: false,
+    },
     descriptionPlaceholder: {
       type:    String,
       default: 'Any text you want that better describes this resource'
@@ -151,7 +155,7 @@ export default {
     },
 
     colSpan() {
-      const cols = 2 + this.extraColumns.length;
+      const cols = (this.nameNsHidden ? 0 : 1) + 1 + this.extraColumns.length;
       const span = 12 / cols;
 
       return `span-${ span }`;
@@ -212,7 +216,7 @@ export default {
 <template>
   <div>
     <div class="row mb-20">
-      <div :class="{col: true, [colSpan]: true}">
+      <div v-show="!nameNsHidden" :class="{col: true, [colSpan]: true}">
         <slot name="namespace">
           <InputWithSelect
             v-if="namespaced"

diff --git a/pages/c/_cluster/apps/install.vue b/pages/c/_cluster/apps/install.vue
@@ -594,10 +594,10 @@ export default {
       </div>
       <NameNsDescription
         v-else
-        v-show="showNameEditor"
         v-model="value"
         :mode="mode"
         :name-disabled="nameDisabled"
+        :name-ns-hidden="!showNameEditor"
         :force-namespace="forceNamespace"
         :extra-columns="showVersions ? ['versions'] : []"
       >