Merge branch 'admin/user-management-ui' of github.com:Budibase/budibase into admin/user-management-ui

This commit is contained in:
Keviin Åberg Kultalahti 2021-05-12 16:45:25 +02:00
commit 5a26be6cef
1 changed files with 6 additions and 6 deletions

View File

@ -25,9 +25,9 @@ function smtpValidation() {
function settingValidation() { function settingValidation() {
// prettier-ignore // prettier-ignore
return Joi.object({ return Joi.object({
platformUrl: Joi.string(), platformUrl: Joi.string().optional(),
logoUrl: Joi.string(), logoUrl: Joi.string().optional(),
docsUrl: Joi.string(), docsUrl: Joi.string().optional(),
company: Joi.string().required(), company: Joi.string().required(),
}).unknown(true) }).unknown(true)
} }
@ -44,9 +44,9 @@ function googleValidation() {
function buildConfigSaveValidation() { function buildConfigSaveValidation() {
// prettier-ignore // prettier-ignore
return joiValidator.body(Joi.object({ return joiValidator.body(Joi.object({
_id: Joi.string(), _id: Joi.string().optional(),
_rev: Joi.string(), _rev: Joi.string().optional(),
group: Joi.string(), group: Joi.string().optional(),
type: Joi.string().valid(...Object.values(Configs)).required(), type: Joi.string().valid(...Object.values(Configs)).required(),
config: Joi.alternatives() config: Joi.alternatives()
.conditional("type", { .conditional("type", {