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

inputspec and required instead of nullable

Browse Source
This commit is contained in:
Matt Hill
2023-03-31 10:31:23 -06:00
committed by Aiden McClelland
parent 5675fc51a0
commit e4cd4d64d7
14 changed files with 143 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ export class FormService {
spec: ValueSpecUnion,
selection: string | null,
): UntypedFormGroup {
const { name, description, warning, variants, nullable } = spec
const { name, description, warning, variants, required } = spec
const selectSpec: ValueSpecSelect = {
type: 'select',
@@ -55,7 +55,7 @@ export class FormService {
description,
warning,
default: selection,
nullable,
required,
values: Object.keys(variants).reduce(
(prev, curr) => ({
...prev,
@@ -172,7 +172,7 @@ function stringValidators(
): ValidatorFn[] {
const validators: ValidatorFn[] = []
if (!(spec as ValueSpecString).nullable) {
if ((spec as ValueSpecString).required) {
validators.push(Validators.required)
}
@@ -186,7 +186,7 @@ function stringValidators(
function textareaValidators(spec: ValueSpecTextarea): ValidatorFn[] {
const validators: ValidatorFn[] = []
if (!spec.nullable) {
if (spec.required) {
validators.push(Validators.required)
}
@@ -200,7 +200,7 @@ function numberValidators(
validators.push(isNumber())
if (!(spec as ValueSpecNumber).nullable) {
if ((spec as ValueSpecNumber).required) {
validators.push(Validators.required)
}
@@ -216,7 +216,7 @@ function numberValidators(
function selectValidators(spec: ValueSpecSelect): ValidatorFn[] {
const validators: ValidatorFn[] = []
if (!spec.nullable) {
if (spec.required) {
validators.push(Validators.required)
}
@@ -239,7 +239,7 @@ function listValidators(spec: ValueSpecList): ValidatorFn[] {
function fileValidators(spec: ValueSpecFile): ValidatorFn[] {
const validators: ValidatorFn[] = []
if (!spec.nullable) {
if (spec.required) {
validators.push(Validators.required)
}