Skip to content

Commit b6bf2e4

Browse files
Pearl1594Pearl Dsilva
authored andcommitted
views: Contextual info for Service offering forms and upload custom ssl certs (#540)
Co-authored-by: Pearl Dsilva <[email protected]> Signed-off-by: Rohit Yadav <[email protected]>
1 parent 82b63a7 commit b6bf2e4

File tree

6 files changed

+577
-80
lines changed

6 files changed

+577
-80
lines changed

ui/src/views/infra/InfraSummary.vue

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@
4848
</p>
4949

5050
<a-form @submit.prevent="handleSslFormSubmit" ref="sslForm" :form="form">
51-
<a-form-item :label="$t('label.root.certificate')" :required="true">
51+
<a-form-item :required="true">
52+
<span slot="label">
53+
{{ $t('label.root.certificate') }}
54+
<a-tooltip placement="bottom" :title="apiParams.name.description">
55+
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
56+
</a-tooltip>
57+
</span>
5258
<a-textarea
5359
id="rootCert"
5460
rows="2"
@@ -66,8 +72,13 @@
6672
<a-form-item
6773
v-for="(item, index) in intermediateCertificates"
6874
:key="`key-${index}`"
69-
class="intermediate-certificate"
70-
:label="$t('label.intermediate.certificate') + ` ${index + 1}`">
75+
class="intermediate-certificate">
76+
<span slot="label">
77+
{{ $t('label.intermediate.certificate') + ` ${index + 1} ` }}
78+
<a-tooltip placement="bottom" :title="apiParams.id.description">
79+
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
80+
</a-tooltip>
81+
</span>
7182
<a-textarea
7283
:id="`intermediateCert${index}`"
7384
rows="2"
@@ -88,7 +99,13 @@
8899
</a-button>
89100
</a-form-item>
90101

91-
<a-form-item :label="$t('label.server.certificate')" :required="true">
102+
<a-form-item :required="true">
103+
<span slot="label">
104+
{{ $t('label.server.certificate') }}
105+
<a-tooltip placement="bottom" :title="apiParams.certificate.description">
106+
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
107+
</a-tooltip>
108+
</span>
92109
<a-textarea
93110
id="serverCert"
94111
rows="2"
@@ -101,7 +118,13 @@
101118
></a-textarea>
102119
</a-form-item>
103120

104-
<a-form-item :label="$t('label.pkcs.private.certificate')" :required="true">
121+
<a-form-item :required="true">
122+
<span slot="label">
123+
{{ $t('label.pkcs.private.certificate') }}
124+
<a-tooltip placement="bottom" :title="apiParams.privatekey.description">
125+
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
126+
</a-tooltip>
127+
</span>
105128
<a-textarea
106129
id="pkcsKey"
107130
rows="2"
@@ -114,7 +137,13 @@
114137
></a-textarea>
115138
</a-form-item>
116139

117-
<a-form-item :label="$t('label.domain.suffix')" :required="true">
140+
<a-form-item :required="true">
141+
<span slot="label">
142+
{{ $t('label.domain.suffix') }}
143+
<a-tooltip placement="bottom" :title="apiParams.domainsuffix.description">
144+
<a-icon type="info-circle" style="color: rgba(0,0,0,.45)" />
145+
</a-tooltip>
146+
</span>
118147
<a-input
119148
id="dnsSuffix"
120149
:placeholder="$t('label.domain.suffix')"
@@ -184,6 +213,11 @@ export default {
184213
},
185214
beforeCreate () {
186215
this.form = this.$form.createForm(this)
216+
this.apiParams = {}
217+
var apiConfig = this.$store.getters.apis.uploadCustomCertificate || {}
218+
apiConfig.params.forEach(param => {
219+
this.apiParams[param.name] = param
220+
})
187221
},
188222
mounted () {
189223
this.fetchData()

0 commit comments

Comments
 (0)