081db3a240
* Update ember-cli to ~3.20 * Remove bad optional-feature * Remove ember-fetch dep * re-install ember-fetch * update model fragments pr * update ember model fragments correct package name * update ember composable helpers to solve array helper error * update ember-concurrency * add back engine dependencies, automatically removed during ember-cli-upgrade * make author-form-options component js file otherwise error * for now comment out withTestWaiter * add eslint-node and fix if not with unless in templates * fix linting for tab index of false is now -1 and add type button to all buttons without types * fix href errors for linting, likely have to come back and fix * using eslint fix flag to fix all this.gets * ember modules codemode removed files that had module twice, will fix in next commit * finish codemode ember-data-codemod needed to rename const model * more this.get removal codemode did not work * cont. removal of this.get * stop mixin rules until figure out how to reconfig them all * smaller eslint ignores * get codemode * testing app small fixes to bring it back after all the changes * small changes to eslint * test removal of getProperties * fix issue with baseKey because value could be unknown needed to add a question mark in nested get * smaller linting fixes * get nested fixes * small linting error fixes * small linting changes * working through more small linting changes * another round of linting modifications * liniting fixes * ember module codemod * quinit dom codemod * angle bracket codemod * discovered that components must have js files * ran all codemods this is all that's left * small changes to fix get needs two object, should not have been using get. * fix issue with one input in form field * fun times with set and onChange from oninput * fix issue with model not being passed through on secret-edit-display * fix issue with yarn run test not working, revert without npm run all * linting and small fix when loading without a selectAuthBackend * fix failing test with ui-wizard issue * fix test failure due to model not being asked for correctly with new changes, probably run into this more. * fix issue with component helper and at props specific to wizard * rename log to clilog due to conflict with new eslint rule * small changes for test failures * component helper at fixes * Revert to old component style something with new one broke this and can't figure it out for now * small fishy smelling test fixes will revisit * small test changes * more small test changes, appears upgrade treats spaces differently * comment out code and test that no longer seems relevant but confirm * clean run on component test though still some potential timing issues on ui-console test * fixing one auth test issue and timing issue on enable-test * small mods * fix this conditional check from upgrade * linting fixes after master merge * package updates using yarn upgrade-interactive * update libraries that did not effect any of the test failures. * update ember truth helpers library * settling tests * Fix ui-panel control group output * fix features selection test failures * Fix auth tests (x-vault-token) * fix shared test * fix issue with data null on backend * Revert "Fix auth tests (x-vault-token)" This reverts commit 89cb174b2f1998efa56d9604d14131415ae65d6f. * Fix auth tests (x-vault-token) without updating this.set * Update redirect-to tests * fix wrapped token test * skip some flaky test * fix issue with href and a tags vs buttons * fix linting * updates to get tests running (#10409) * yarn isntall * increasing resource_class * whoops * trying large * back to xlarge * Fix param issue on transform item routes * test fixes * settle on policies (old) test * fix browserstack test warning and skips of test confirmed worked * Fix redirect-to test * skips * fix transformation test and skip some kmip * Skip tests * Add meep marker to remaining failing tests * Skip test with failing component * rever skip on secret-create test * Skip piece of test that fails due to navigation-input * fix settings test where can and skip in others after confirming * fix circle ci test failures * ssh role settle * Fix navigate-input and add settled to test * Remove extra import * secret cubbyhole and alicloud * Add settled to gcpkms test * settles on redirect to test * Bump browserstack test resource to large * Update browserstack resource size to xlarge * update todos * add back in withTestWaiter * try and fix credentials conditional action added comment instead * Update volatile computed properies to get functions * this step was never reached and we never defined secretType anywhere so I removed * add settled to policy old test * Fix navigate-input on policies and leases * replace ssh test with no var hoping that helps and add settled to other failing tests, unskip console tests * kmip, transit, role test remove a skip and add in settled * fix hover copy button, had to remove some testing functionality * Remove private router service * remove skip on control ssh and ui panel, fix search select by restructuring how to read the error * final bit of working through skipped test * Replace clearNonGlobalModels by linking directly to namespace with href-to * Remove unused var * Fix role-ssh id bug by updating form-field-from-model to form-field-group-loop * Fix transit create id would not update * Update option toggle selector for ssh-role * Fix ssh selector * cleanup pt1 * small clean up * cleanup part2 * Fix computed on pricing-metrics-form * small cleanup based on chelseas comments. Co-authored-by: Chelsea Shaw <chelshaw.dev@gmail.com> Co-authored-by: Sarah Thompson <sthompson@hashicorp.com>
119 lines
3.1 KiB
JavaScript
119 lines
3.1 KiB
JavaScript
import { attr } from '@ember-data/model';
|
|
import { assign } from '@ember/polyfills';
|
|
import { camelize, capitalize } from '@ember/string';
|
|
|
|
export const expandOpenApiProps = function(props) {
|
|
let attrs = {};
|
|
// expand all attributes
|
|
for (const propName in props) {
|
|
const prop = props[propName];
|
|
let { description, items, type, format, isId, deprecated } = prop;
|
|
if (deprecated === true) {
|
|
continue;
|
|
}
|
|
let { name, value, group, sensitive, editType } = prop['x-vault-displayAttrs'] || {};
|
|
|
|
if (type === 'integer') {
|
|
type = 'number';
|
|
}
|
|
|
|
editType = editType || type;
|
|
|
|
if (format === 'seconds') {
|
|
editType = 'ttl';
|
|
} else if (items) {
|
|
editType = items.type + capitalize(type);
|
|
}
|
|
|
|
let attrDefn = {
|
|
editType,
|
|
helpText: description,
|
|
possibleValues: prop['enum'],
|
|
fieldValue: isId ? 'id' : null,
|
|
fieldGroup: group || 'default',
|
|
readOnly: isId,
|
|
defaultValue: value || null,
|
|
};
|
|
|
|
if (type === 'object' && !!value) {
|
|
attrDefn.defaultValue = () => {
|
|
return value;
|
|
};
|
|
}
|
|
|
|
if (sensitive) {
|
|
attrDefn.sensitive = true;
|
|
}
|
|
|
|
//only set a label if we have one from OpenAPI
|
|
//otherwise the propName will be humanized by the form-field component
|
|
if (name) {
|
|
attrDefn.label = name;
|
|
}
|
|
|
|
// ttls write as a string and read as a number
|
|
// so setting type on them runs the wrong transform
|
|
if (editType !== 'ttl' && type !== 'array') {
|
|
attrDefn.type = type;
|
|
}
|
|
|
|
// loop to remove empty vals
|
|
for (let attrProp in attrDefn) {
|
|
if (attrDefn[attrProp] == null) {
|
|
delete attrDefn[attrProp];
|
|
}
|
|
}
|
|
attrs[camelize(propName)] = attrDefn;
|
|
}
|
|
return attrs;
|
|
};
|
|
|
|
export const combineAttributes = function(oldAttrs, newProps) {
|
|
let newAttrs = {};
|
|
let newFields = [];
|
|
if (oldAttrs) {
|
|
oldAttrs.forEach(function(value, name) {
|
|
if (newProps[name]) {
|
|
newAttrs[name] = attr(newProps[name].type, assign({}, newProps[name], value.options));
|
|
} else {
|
|
newAttrs[name] = attr(value.type, value.options);
|
|
}
|
|
});
|
|
}
|
|
for (let prop in newProps) {
|
|
if (newAttrs[prop]) {
|
|
continue;
|
|
} else {
|
|
newAttrs[prop] = attr(newProps[prop].type, newProps[prop]);
|
|
newFields.push(prop);
|
|
}
|
|
}
|
|
return { attrs: newAttrs, newFields };
|
|
};
|
|
|
|
export const combineFields = function(currentFields, newFields, excludedFields) {
|
|
let otherFields = newFields.filter(field => {
|
|
return !currentFields.includes(field) && !excludedFields.includes(field);
|
|
});
|
|
if (otherFields.length) {
|
|
currentFields = currentFields.concat(otherFields);
|
|
}
|
|
return currentFields;
|
|
};
|
|
|
|
export const combineFieldGroups = function(currentGroups, newFields, excludedFields) {
|
|
let allFields = [];
|
|
for (let group of currentGroups) {
|
|
let fieldName = Object.keys(group)[0];
|
|
allFields = allFields.concat(group[fieldName]);
|
|
}
|
|
let otherFields = newFields.filter(field => {
|
|
return !allFields.includes(field) && !excludedFields.includes(field);
|
|
});
|
|
if (otherFields.length) {
|
|
currentGroups[0].default = currentGroups[0].default.concat(otherFields);
|
|
}
|
|
|
|
return currentGroups;
|
|
};
|