Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 20:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

all items crossed off

Browse Source
This commit is contained in:
Drew Ansbacher
2021-08-19 17:23:31 -06:00
committed by Aiden McClelland
parent a61cdb088f
commit 2e6513ed03
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ui/src/app/services/form.service.ts
View File

@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core'
import { AbstractControl, FormArray, FormBuilder, FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators } from '@angular/forms'
import { ConfigSpec, isValueSpecListOf, ListValueSpecNumber, ListValueSpecObject, ListValueSpecOf, ListValueSpecString, ListValueSpecUnion, UniqueBy, ValueSpec, ValueSpecEnum, ValueSpecList, ValueSpecListOf, ValueSpecNumber, ValueSpecObject, ValueSpecString, ValueSpecUnion } from '../pkg-config/config-types'
import { ConfigSpec, isValueSpecListOf, ListValueSpecNumber, ListValueSpecObject, ListValueSpecString, ListValueSpecUnion, UniqueBy, ValueSpec, ValueSpecEnum, ValueSpecList, ValueSpecListOf, ValueSpecNumber, ValueSpecObject, ValueSpecString, ValueSpecUnion } from '../pkg-config/config-types'
import { getDefaultString, Range } from '../pkg-config/config-utilities'
const Mustache = require('mustache')
@@ -158,7 +158,7 @@ export function numberInRange (stringRange: string): ValidatorFn {
Range.from(stringRange).checkIncludes(control.value)
return null
} catch (e) {
return { numberNotInRange: { value: control.value } }
return { numberNotInRange: { value: getRangeMessage(stringRange) } }
}
}
}
@@ -186,13 +186,25 @@ export function listInRange (stringRange: string): ValidatorFn {
const max = range.integralMax()
const length = control.value.length
if ((min && length < min) || (max && length > max)) {
return { listNotInRange: { value: control.value } }
return { listNotInRange: { value: getRangeMessage(stringRange, true) } }
} else {
return null
}
}
}
function getRangeMessage (stringRange: string, isList = false): string {
const range = Range.from(stringRange)
const min = range.integralMin()
const max = range.integralMax()
const messageStart = isList ? 'List length must be ' : 'Must be '
const minMessage = !!min ? `greater than ${min}` : ''
const and = !!min && !!max ? ' and ' : ''
const maxMessage = !!max ? `less than ${max}` : ''
return `${messageStart} ${minMessage}${and}${maxMessage}`
}
export function listUnique (spec: ValueSpecList): ValidatorFn {
return (control: AbstractControl): ValidationErrors | null => {
for (let idx = 0; idx < control.value.length; idx++) {