From 79734c522283f276ecf838847075d0a25989d8bf Mon Sep 17 00:00:00 2001
From: Arnav Palnitkar <arnav.28@gmail.com>
Date: Fri, 9 Apr 2021 13:00:39 -0700
Subject: [PATCH] Fixes for db connection file type field (#11331)

- Fixed helper text for file type form fields
- Added padding bottom to form section
---
 ui/app/models/database/connection.js                  | 6 ++++--
 ui/app/styles/components/form-section.scss            | 2 +-
 ui/lib/core/addon/templates/components/form-field.hbs | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/app/models/database/connection.js b/ui/app/models/database/connection.js
index e80610fa41..84995b51b5 100644
--- a/ui/app/models/database/connection.js
+++ b/ui/app/models/database/connection.js
@@ -72,12 +72,14 @@ export default Model.extend({
   max_connection_lifetime: attr('string'),
   tls: attr('string', {
     label: 'TLS Certificate Key',
-    subText: 'x509 certificate for connecting to the database.',
+    helpText:
+      'x509 certificate for connecting to the database. This must be a PEM encoded version of the private key and the certificate combined.',
     editType: 'file',
   }),
   tls_ca: attr('string', {
     label: 'TLS CA',
-    subText: 'x509 CA file for validating the certificate presented by the MongoDB server.',
+    helpText:
+      'x509 CA file for validating the certificate presented by the MongoDB server. Must be PEM encoded.',
     editType: 'file',
   }),
   root_rotation_statements: attr({
diff --git a/ui/app/styles/components/form-section.scss b/ui/app/styles/components/form-section.scss
index 721bd04d56..81f8eedbb2 100644
--- a/ui/app/styles/components/form-section.scss
+++ b/ui/app/styles/components/form-section.scss
@@ -1,5 +1,5 @@
 .form-section {
-  padding-top: 1.75rem;
+  padding: 1.75rem 0;
   box-shadow: 0 -1px 0 0 rgba($black, 0.1);
 }
 
diff --git a/ui/lib/core/addon/templates/components/form-field.hbs b/ui/lib/core/addon/templates/components/form-field.hbs
index e97f842b51..362fce706c 100644
--- a/ui/lib/core/addon/templates/components/form-field.hbs
+++ b/ui/lib/core/addon/templates/components/form-field.hbs
@@ -111,7 +111,8 @@
 {{!-- File Input --}}
   {{text-file
     index=""
-    helpText=attr.options.helpText
+    fileHelpText=attr.options.helpText
+    textareaHelpText=attr.options.helpText
     file=file
     onChange=(action "setFile")
     warning=attr.options.warning