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

feat: better form array validation (#2822)

Browse Source
This commit is contained in:
Alex Inkin
2025-01-28 04:46:29 +04:00
committed by GitHub
parent bb8109f67d
commit b2b98643d8
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/projects/ui/src/app/services/api/api.fixures.ts
View File

@@ -1719,6 +1719,7 @@ export module Mock {
ISB.List.text( ISB.List.text(
{ {
name: 'RPC Auth', name: 'RPC Auth',
minLength: 3,
description: description:
'api keys that are authorized to access your Bitcoin node.', 'api keys that are authorized to access your Bitcoin node.',
}, },

20
web/projects/ui/src/app/services/form.service.ts
View File

@@ -55,7 +55,10 @@ export class FormService {
getListItem(spec: IST.ValueSpecList, entry?: any) { getListItem(spec: IST.ValueSpecList, entry?: any) {
if (IST.isValueSpecListOf(spec, 'text')) { if (IST.isValueSpecListOf(spec, 'text')) {
return this.formBuilder.control(entry, stringValidators(spec.spec)) return this.formBuilder.control(entry, [
...stringValidators(spec.spec),
Validators.required,
])
} else if (IST.isValueSpecListOf(spec, 'object')) { } else if (IST.isValueSpecListOf(spec, 'object')) {
return this.getFormGroup(spec.spec.spec, [], entry) return this.getFormGroup(spec.spec.spec, [], entry)
} }
@@ -116,12 +119,15 @@ export class FormService {
case 'object': case 'object':
return this.getFormGroup(spec.spec, [], currentValue) return this.getFormGroup(spec.spec, [], currentValue)
case 'list': case 'list':
const mapped = ( const array = Array.isArray(currentValue) ? currentValue : spec.default
Array.isArray(currentValue) ? currentValue : (spec.default as any[]) const length = Math.max(array.length, spec.minLength || 0)
).map(entry => {
return this.getListItem(spec, entry) return this.formBuilder.array(
}) Array.from({ length }).map((_, index) =>
return this.formBuilder.array(mapped, listValidators(spec)) this.getListItem(spec, array[index]),
),
listValidators(spec),
)
case 'file': case 'file':
return this.formBuilder.control( return this.formBuilder.control(
currentValue || null, currentValue || null,