From d579f991be5456ec64bf5c01198164d3316e0c83 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Tue, 12 Apr 2022 11:46:57 +0530
Subject: [PATCH 1/4] ui: Fix uploadCustomCertificate form in infraSummary view

---
 ui/src/views/infra/InfraSummary.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/infra/InfraSummary.vue b/ui/src/views/infra/InfraSummary.vue
index 3bb16f494673..fe89951b03d8 100644
--- a/ui/src/views/infra/InfraSummary.vue
+++ b/ui/src/views/infra/InfraSummary.vue
@@ -109,7 +109,7 @@
                 ></a-textarea>
               </a-form-item>
 
-              <a-form-item name="pkcsKey" ref="pkcsKey" :required="true">
+              <a-form-item name="pkcs" ref="pkcs" :required="true">
                 <template #label>
                   <tooltip-label :title="$t('label.pkcs.private.certificate')" :tooltip="apiParams.privatekey.description" tooltipPlacement="bottom"/>
                 </template>
@@ -138,7 +138,7 @@
                 <a-button @click="sslModalClose" class="close-button">
                   {{ $t('label.cancel' ) }}
                 </a-button>
-                <a-button type="primary" ref="submit" :loading="sslFormSubmitting">
+                <a-button type="primary" ref="submit" :loading="sslFormSubmitting" @click="handleSslFormSubmit">
                   {{ $t('label.submit' ) }}
                 </a-button>
               </a-form-item>

From b971e9a12ebc32d2487f6a3a28c447501b6a4b20 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Tue, 12 Apr 2022 12:55:07 +0530
Subject: [PATCH 2/4] vertical form layout

---
 ui/src/views/infra/InfraSummary.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/src/views/infra/InfraSummary.vue b/ui/src/views/infra/InfraSummary.vue
index fe89951b03d8..d3a19c7c4e0c 100644
--- a/ui/src/views/infra/InfraSummary.vue
+++ b/ui/src/views/infra/InfraSummary.vue
@@ -49,6 +49,7 @@
               {{ $t('message.update.ssl') }}
             </p>
             <a-form
+              layout="vertical"
               :ref="formRef"
               :model="form"
               :rules="rules"

From 759881c16724ecc92a196cffd80ba806a820ebce Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Tue, 12 Apr 2022 13:02:47 +0530
Subject: [PATCH 3/4] align buttons

---
 ui/src/views/infra/InfraSummary.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ui/src/views/infra/InfraSummary.vue b/ui/src/views/infra/InfraSummary.vue
index d3a19c7c4e0c..d192aeb97f54 100644
--- a/ui/src/views/infra/InfraSummary.vue
+++ b/ui/src/views/infra/InfraSummary.vue
@@ -134,15 +134,14 @@
                   v-model:value="form.dns"
                 ></a-input>
               </a-form-item>
-
-              <a-form-item class="controls">
+              <div :span="24" class="action-button">
                 <a-button @click="sslModalClose" class="close-button">
                   {{ $t('label.cancel' ) }}
                 </a-button>
                 <a-button type="primary" ref="submit" :loading="sslFormSubmitting" @click="handleSslFormSubmit">
                   {{ $t('label.submit' ) }}
                 </a-button>
-              </a-form-item>
+              </div>
             </a-form>
           </a-modal>
         </a-col>

From 0d3844f93b6a5ae20abfdf16b733f31257dac6ef Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Tue, 12 Apr 2022 17:22:11 +0530
Subject: [PATCH 4/4] update form rules

---
 ui/src/views/infra/InfraSummary.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/views/infra/InfraSummary.vue b/ui/src/views/infra/InfraSummary.vue
index d192aeb97f54..8b6278b276ab 100644
--- a/ui/src/views/infra/InfraSummary.vue
+++ b/ui/src/views/infra/InfraSummary.vue
@@ -207,7 +207,7 @@ export default {
       this.rules = reactive({
         root: [{ required: true, message: this.$t('label.required') }],
         server: [{ required: true, message: this.$t('label.required') }],
-        pkcsKey: [{ required: true, message: this.$t('label.required') }],
+        pkcs: [{ required: true, message: this.$t('label.required') }],
         dns: [{ required: true, message: this.$t('label.required') }]
       })
     },