Skip to content

Fixes for db connection file type fields #11331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arnav28 merged 1 commit into from
Apr 9, 2021
Merged

Fixes for db connection file type fields #11331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions ui/app/models/database/connection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion ui/app/styles/components/form-section.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.form-section {
padding-top: 1.75rem;
padding: 1.75rem 0;
box-shadow: 0 -1px 0 0 rgba($black, 0.1);
}

Expand Down
3 changes: 2 additions & 1 deletion ui/lib/core/addon/templates/components/form-field.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down