fix saving of TTL and string array fields generated by Open API (#7094)

hashicorp · Jul 22, 2019 · 1213efc · 1213efc
1 parent 2d460ed
commit 1213efc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ui/app/components/string-list.js b/ui/app/components/string-list.js
@@ -62,6 +62,7 @@ export default Component.extend({
     *
     */
   inputList: computed(function() {
+    /* eslint-disable ember/no-side-effects */
     return ArrayProxy.create({
       content: [],
       // trim the `value` when accessing objects

diff --git a/ui/app/utils/openapi-to-attrs.js b/ui/app/utils/openapi-to-attrs.js
@@ -23,14 +23,17 @@ export const expandOpenApiProps = function(props) {
     }
     let attrDefn = {
       editType: editType,
-      type: details.type,
       helpText: details.description,
       sensitive: details['x-vault-displaySensitive'],
       label: details['x-vault-displayName'],
       possibleValues: details['enum'],
       defaultValue:
         details['x-vault-displayValue'] || (!isEmpty(details['default']) ? details['default'] : null),
     };
+
+    if (editType !== 'ttl' && details.type !== 'array') {
+      attrDefn.type = details.type;
+    }
     // loop to remove empty vals
     for (let attrProp in attrDefn) {
       if (attrDefn[attrProp] == null) {

diff --git a/ui/tests/unit/utils/openapi-to-attrs-test.js b/ui/tests/unit/utils/openapi-to-attrs-test.js
@@ -41,12 +41,10 @@ module('Unit | Util | OpenAPI Data Utilities', function() {
     ttl: {
       helpText: 'this is a TTL!',
       editType: 'ttl',
-      type: 'string',
       label: 'TTL',
     },
     awesomePeople: {
       editType: 'stringArray',
-      type: 'array',
       defaultValue: 'Grace Hopper,Lady Ada',
     },
     favoriteIceCream: {
@@ -105,7 +103,6 @@ module('Unit | Util | OpenAPI Data Utilities', function() {
     }),
     ttl: attr('string', {
       editType: 'ttl',
-      type: 'string',
       label: 'TTL',
       helpText: 'this is a TTL!',
     }),