From 596c3363e790fb75339cde4dcf6c12aa33cc2a6c Mon Sep 17 00:00:00 2001 From: Ari Date: Tue, 14 Jun 2022 22:01:21 -0400 Subject: [PATCH] fixed up unit of measure --- .../components/ServiceEditor/ServiceEditorField.tsx | 4 ++-- webapp/src/components/ServiceEditor/index.tsx | 4 +--- webapp/src/haService/fieldTypes.ts | 10 +--------- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/webapp/src/components/ServiceEditor/ServiceEditorField.tsx b/webapp/src/components/ServiceEditor/ServiceEditorField.tsx index ee743f9..7c7db1e 100644 --- a/webapp/src/components/ServiceEditor/ServiceEditorField.tsx +++ b/webapp/src/components/ServiceEditor/ServiceEditorField.tsx @@ -73,8 +73,8 @@ export const ServiceEditorField: FC = ({ /> ); } else { - if ("domain" in option.data) { - if (option.id === "entity") { + if (option.id === "entity") { + if ("domain" in option.data) { return ( = ({ if (newField) { setAdditionalFields({ ...additionalFields, - [newField.type]: additionalFields[newField.type].concat([ - newField.id, - ]), + field: additionalFields.field.concat([newField.id]), optionalList: additionalFields.optionalList.filter( (opt) => !(opt.type === newField.type && opt.id === newField.id) diff --git a/webapp/src/haService/fieldTypes.ts b/webapp/src/haService/fieldTypes.ts index da29ea1..2961178 100644 --- a/webapp/src/haService/fieldTypes.ts +++ b/webapp/src/haService/fieldTypes.ts @@ -48,7 +48,7 @@ interface SelectorColorTemp { interface SelectorNumber { min: number; max: number; - unit_of_measurement?: UnitOfMeasurement; + unit_of_measurement?: string; mode?: Mode; step?: number; } @@ -57,14 +57,6 @@ enum Mode { Box = "box", } -enum UnitOfMeasurement { - Days = "days", - Empty = "%", - K = "K", - Seconds = "seconds", - Times = "times", -} - interface SelectorSelect { options: OptionElement[]; }