83fc61c16b
* OIDC Config Routing (#16028) * adds oidc config routes * renames oidc applications route to clients * UI/vault 6646/landing page (#16069) * add to sidebar * add landing image and text * add permissions * add permissions to permissions service * remove comment * fix. * UI/OIDC models (#16091) * add models and fix routing * add ClientsCreate route * remove form functions from client model * update comment * address comments, cleanup models * add comment * OIDC Adapters and Serializers (#16120) * adds named-path base adapter * adds oidc adapters with tests * adds oidc serializers * fixes issue with supported_scopes relationship in oidc provider model * make radio card size flex (#16125) * OIDC config details routes (#16126) * adds details routes for oidc config resources * adds details templates for oidc config resources * OIDC parent route and index redirection (#16139) * adds parent oidc route with header and adds redirection if clients have been created * updates learn link * adds findRecord override to named-path adapter (#16145) * OIDC Scope Create/Edit View (#16174) * adds oidc scope-form to create and edit views * moves oidc header set logic from route to controller * OIDC Scope Details View (#16191) * adds oidc scope details view * removes disabled arg from scope delete confirm action * updates oidc scope template params link to use DocLink and adds success message on scope create success * updates oidc scope delete confirm action copy * adds oidc scopes list (#16196) * UI/vault 6655/OIDC create view (#16331) * setup header * wip * wip * wip * validations * error validations * cleanup * wip * fix error * clean up * handle modelValidations * add documentation on the decorator * remove spread attrs * first test and some fixes * halfway with test * fix error where the data object was sending param entiyIds and not entity_ids * validations or situation * fix test * small nit: * test if this fixes the test * fix * cleanup * nit * Assignments Update/Edit View (#16412) * wip * fix * render search-select after promise is fulfilled * add test coverage Co-authored-by: clairebontempo@gmail.com <cbontempo@hashicorp.com> * Added list view for keys (#16454) * Added list view for providers (#16442) * Added list view for providers * Removed check for model data length * Added new line at end of file * Fixed linting issues causing ui tests to fail * Added list view for application (#16469) * UI/remove has many relationship (#16470) * remove hasMany from models * remove relationships from assignments create form * update tests * Assignment list view (#16340) * inital setup * handle default allow all * add learn more link * Fixed the default allow_all for assignment list view to match Figma design * Fixed linting * Fixed hbs file syntax Co-authored-by: linda9379 <linda.jiang@hashicorp.com> * configure mirage and helper (#16482) * UI/OIDC client form (#16131) * WIP client form * wip * still WIP * fix form!; * remove computeds, cache form attrs instead * update scope form component name * add white space validation * add validations, cleanup * add edit form * fix link to in edit form * disable edit form * fix linkto * wip/ search select filter * WIP/search-select bug * fix assignment save * delete old modal js file * glimmerize/create new search select modal component * component cleanup * fix bugginess * fix search select and radio select action * add tests * revert some test changes * oops, removed test tag * add key list to response * fix test * move search select component to separate PR, revert changes * one more revert * remove oidc helper from this pr * remove hasMany relationship * minor cleanup * update assignment form to use fallback * fix allow_all appearing in dropdown on edit (#16508) * UI/ OIDC Application (client) details view (#16507) * fix test * finish details page * finish details view * clean u[ * fix typo * configure oidc mirage handler for tests * remove params, add new route instead * fix headers * remove console.log * remove controller/template reliance on tracked variable * rename variable * UI/Client route acceptance tests - fixed branch (#16654) * WIP client route tests * refactor client form so clientType is not edit-able * fix ttl in client form * wip// more acceptance tests and tags for hbs files * fix typo * fix syntax error * finish tests * fix client form test * resolve commits * update form test * OIDC Assignments Details view. (#16511) * setup * cleanup * view all fix * wip setting up tabs * wip * revert to no queryParam or tabs * add the read more component and styling * rename folder * cleanup * fix * UI/OIDC providers create/edit route (#16612) * update to use DocLink component * provider create form * cleaup * add formt est * revert label text * update doclink test * disallow new scopes from ss * fix test typo * fix provider form flash message * add period * test new form field attr * refactor form input * fix edit portion of issuer field * add test selector to new input field * add comment * Cleanup OIDC Config Mirage handler (#16674) * cleaup mirage * change to .then * pull out into config file * Scope acceptance tests (#16707) * Started writing acceptance tests * Added some more acceptance tests * Added tags for hbs and more tests * Modified variable names in scope form test * Fixed tests and linting * UI/OIDC Provider read view (#16632) * add providers/provider/client route * provider details view * add disabled button and tooltip for default * add toolbar separators * revert unrelated change * query all client records and filter by allowed client id" * refactor adapter to filter for clientId * cleanup adapter method * update test * refactor test * fix tests to accommodate for serializer change * update empty state message * fix linting * metadata for client list view (#16725) * Added metadata for list view in clients * Fixed linting * Fixed failing ui test * fix scopes and clients tests (#16768) * Initial fix of tests * Fixed failing scopes and clients acceptance tests * Fixed linting * UI: Key create/edit form (#16729) * add route models * add forms * add test * remove helperText attr * metadata for provider list view (#16738) * Added meta-data for provider list view * Added comment for serializer * Fixed import path for scopes and clients acceptance test files * UI/Add client ids to search select (#16744) * WIP use clientID instead of name * add client ids to search select * remove provider form component changes * fix search select on edit * cleanup comments and method * fix adapter query method * clean up comments * add test * remove destructuring so linting passes * fix tests * add accidentally deleted param * add clarifying comments * cleanup * change how shouldRenderName is set * cleanup tests * address comments * OIDC Assignment Acceptance tests (#16741) * test and fixes * merge stuff * fix * fixes * add waituntil * inconsistent nav issue * fixes * blah * UI/Key details view (#16776) * add details view * reformat model file * todo for when listing applications * add comment * update key form with refactored search select * add applications list * update test * update test * add names to flash messages * add rollbackAttributes to delete catch (#16796) * UI: Checks if records exists before creating record when URL contains :name (#16823) * check for record existing in createRecord * use error banner instead of flash messages for forms * add inline form message for validations * add error count message to inlinealert * add test for adapter * add tests * remove unused vars * UI: Disable limiting clients when creating key, filter clients when editing (#16926) * add tooltip to disabled radio button * pass query object to search select * update copy * add comment * cleanup console log and comment * fix tests * revert change because addressed in other pr * fix diff * fix test * UI: Add redirect when last client is deleted (#16927) * afterModel redirect if no models exist * fix test * change space * fix incorrect text * UI: Add InfoTooltip to selected 'ghost' client_ids (#16942) * return option if undefined * add info tooltip to search select * change word * add test * UI: OIDC config keys acceptance tests (#16968) * add keys test * update other oidc tests * remove-search select comment * UI: Filter Client providers list view (#17027) * pass param to adapter * add test * UI: OIDC Config Acceptance Tests (#17050) * WIP/provider acceptance tests" * WIP/this commit breaks lots of things * fix tests * update test selectors * combine key and client tests * cleanup clients and keys test * finish tests * small tidying * UI: Remove trailing comma from scopes, provider details page (#17069) * use info table row to cleanup scope logic * infotableitemarray cleanup * tidying * add changelog * teeny little empty state * fix wildcard string helper not working Co-authored-by: Jordan Reimer <zofskeez@gmail.com> Co-authored-by: Angel Garbarino <Monkeychip@users.noreply.github.com> Co-authored-by: Angel Garbarino <argarbarino@gmail.com> Co-authored-by: linda9379 <57650314+linda9379@users.noreply.github.com> Co-authored-by: linda9379 <linda.jiang@hashicorp.com>
135 lines
5.9 KiB
JavaScript
135 lines
5.9 KiB
JavaScript
/* eslint-disable no-console */
|
|
import validators from 'vault/utils/validators';
|
|
import { get } from '@ember/object';
|
|
|
|
/**
|
|
* used to validate properties on a class
|
|
*
|
|
* decorator expects validations object with the following shape:
|
|
* { [propertyKeyName]: [{ type, options, message, validator }] }
|
|
* each key in the validations object should refer to the property on the class to apply the validation to
|
|
* type refers to the type of validation to apply -- must be exported from validators util for lookup
|
|
* options is an optional object for given validator -- min, max, nullable etc. -- see validators in util
|
|
* message is added to the errors array and returned from the validate method if validation fails
|
|
* validator may be used in place of type to provide a function that gets executed in the validate method
|
|
* validator is useful when specific validations are needed (dependent on other class properties etc.)
|
|
* validator must be passed as function that takes the class context (this) as the only argument and returns true or false
|
|
* each property supports multiple validations provided as an array -- for example, presence and length for string
|
|
*
|
|
* validations must be invoked using the validate method which is added directly to the decorated class
|
|
* const { isValid, state } = this.model.validate();
|
|
* isValid represents the validity of the full class -- if no properties provided in the validations object are invalid this will be true
|
|
* state represents the error state of the properties defined in the validations object
|
|
* const { isValid, errors } = state[propertyKeyName];
|
|
* isValid represents the validity of the property
|
|
* errors will be populated with messages defined in the validations object when validations fail. message must be a complete sentence (and include punctuation)
|
|
* since a property can have multiple validations, errors is always returned as an array
|
|
*
|
|
*** basic example
|
|
*
|
|
* import Model from '@ember-data/model';
|
|
* import withModelValidations from 'vault/decorators/model-validations';
|
|
*
|
|
* Notes: all messages need to have a period at the end of them.
|
|
* const validations = { foo: [{ type: 'presence', message: 'foo is a required field.' }] };
|
|
* @withModelValidations(validations)
|
|
* class SomeModel extends Model { foo = null; }
|
|
*
|
|
* const model = new SomeModel();
|
|
* const { isValid, state } = model.validate();
|
|
* -> isValid = false;
|
|
* -> state.foo.isValid = false;
|
|
* -> state.foo.errors = ['foo is a required field'];
|
|
*
|
|
*** example using custom validator
|
|
*
|
|
* const validations = { foo: [{ validator: (model) => model.bar.includes('test') ? model.foo : false, message: 'foo is required if bar includes test.' }] };
|
|
* @withModelValidations(validations)
|
|
* class SomeModel extends Model { foo = false; bar = ['foo', 'baz']; }
|
|
*
|
|
* const model = new SomeModel();
|
|
* const { isValid, state } = model.validate();
|
|
* -> isValid = false;
|
|
* -> state.foo.isValid = false;
|
|
* -> state.foo.errors = ['foo is required if bar includes test.'];
|
|
*
|
|
* *** example adding class in hbs file
|
|
* all form-validations need to have a red border around them. Add this by adding a conditional class 'has-error-border'
|
|
* class="input field {{if this.errors.name.errors 'has-error-border'}}"
|
|
*/
|
|
|
|
export function withModelValidations(validations) {
|
|
return function decorator(SuperClass) {
|
|
return class ModelValidations extends SuperClass {
|
|
static _validations;
|
|
|
|
constructor() {
|
|
super(...arguments);
|
|
if (!validations || typeof validations !== 'object') {
|
|
throw new Error('Validations object must be provided to constructor for setup');
|
|
}
|
|
this._validations = validations;
|
|
}
|
|
|
|
validate() {
|
|
let isValid = true;
|
|
const state = {};
|
|
let errorCount = 0;
|
|
|
|
for (const key in this._validations) {
|
|
const rules = this._validations[key];
|
|
|
|
if (!Array.isArray(rules)) {
|
|
console.error(
|
|
`Must provide validations as an array for property "${key}" on ${this.modelName} model`
|
|
);
|
|
continue;
|
|
}
|
|
|
|
state[key] = { errors: [] };
|
|
|
|
for (const rule of rules) {
|
|
const { type, options, message, validator: customValidator } = rule;
|
|
// check for custom validator or lookup in validators util by type
|
|
const useCustomValidator = typeof customValidator === 'function';
|
|
const validator = useCustomValidator ? customValidator : validators[type];
|
|
if (!validator) {
|
|
console.error(
|
|
!type
|
|
? 'Validator not found. Define either type or pass custom validator function under "validator" key in validations object'
|
|
: `Validator type: "${type}" not found. Available validators: ${Object.keys(
|
|
validators
|
|
).join(', ')}`
|
|
);
|
|
continue;
|
|
}
|
|
const passedValidation = useCustomValidator
|
|
? validator(this)
|
|
: validator(get(this, key), options); // dot notation may be used to define key for nested property
|
|
|
|
if (!passedValidation) {
|
|
// consider setting a prop like validationErrors directly on the model
|
|
// for now return an errors object
|
|
state[key].errors.push(message);
|
|
if (isValid) {
|
|
isValid = false;
|
|
}
|
|
}
|
|
}
|
|
errorCount += state[key].errors.length;
|
|
state[key].isValid = !state[key].errors.length;
|
|
}
|
|
|
|
return { isValid, state, invalidFormMessage: this.generateErrorCountMessage(errorCount) };
|
|
}
|
|
|
|
generateErrorCountMessage(errorCount) {
|
|
if (errorCount < 1) return null;
|
|
// returns count specific message: 'There is an error/are N errors with this form.'
|
|
let isPlural = errorCount > 1 ? `are ${errorCount} errors` : false;
|
|
return `There ${isPlural ? isPlural : 'is an error'} with this form.`;
|
|
}
|
|
};
|
|
};
|
|
}
|