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

feat: better form array validation (#2821)

Browse Source
This commit is contained in:
Alex Inkin
2025-01-28 04:46:21 +04:00
committed by GitHub
parent e8d727c07a
commit b83eeeb131
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

@@ -1623,6 +1623,7 @@ export module Mock {
ISB.List.text(
{
name: 'RPC Auth',
minLength: 3,
description:
'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) {
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')) {
return this.getFormGroup(spec.spec.spec, [], entry)
}
@@ -116,12 +119,15 @@ export class FormService {
case 'object':
return this.getFormGroup(spec.spec, [], currentValue)
case 'list':
const mapped = (
Array.isArray(currentValue) ? currentValue : (spec.default as any[])
).map(entry => {
return this.getListItem(spec, entry)
})
return this.formBuilder.array(mapped, listValidators(spec))
const array = Array.isArray(currentValue) ? currentValue : spec.default
const length = Math.max(array.length, spec.minLength || 0)
return this.formBuilder.array(
Array.from({ length }).map((_, index) =>
this.getListItem(spec, array[index]),
),
listValidators(spec),
)
case 'union':
const currentSelection = currentValue?.selection
const isValid = !!spec.variants[currentSelection]