Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-04 22:39:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove subtype from list spec

Browse Source
This commit is contained in:
Matt Hill
2023-04-03 14:16:41 -06:00
committed by Aiden McClelland
parent e4cd4d64d7
commit bb50beb7ab
8 changed files with 30 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/projects/ui/src/app/services/form.service.ts
View File

@@ -337,13 +337,12 @@ export function listUnique(spec: ValueSpecList): ValidatorFn {
function listItemEquals(spec: ValueSpecList, val1: any, val2: any): boolean {
// TODO: fix types
switch (spec.subtype) {
switch (spec.spec.type) {
case 'string':
case 'number':
return val1 == val2
case 'object':
const obj: ListValueSpecObject = spec.spec as any
const obj = spec.spec
return listObjEquals(obj.uniqueBy, obj, val1, val2)
default:
return false
@@ -553,15 +552,15 @@ export function convertValuesRecursive(
const formArr = group.get(key) as UntypedFormArray
const { controls } = formArr
if (valueSpec.subtype === 'number') {
if (valueSpec.spec.type === 'number') {
controls.forEach(control => {
control.setValue(control.value ? Number(control.value) : null)
})
} else if (valueSpec.subtype === 'string') {
} else if (valueSpec.spec.type === 'string') {
controls.forEach(control => {
if (!control.value) control.setValue(null)
})
} else if (valueSpec.subtype === 'object') {
} else if (valueSpec.spec.type === 'object') {
controls.forEach(formGroup => {
const objectSpec = valueSpec.spec as ListValueSpecObject
convertValuesRecursive(objectSpec.spec, formGroup as UntypedFormGroup)