refactor inputs

This commit is contained in:
ari committed 2022-08-05 22:04:31 -04:00
1 parent 2c5d64ab86
commit 549f52655b
45 files changed
+301 -256

No files matched your search

@@ -4,13 +4,16 @@ import { ServiceEditorOption } from "./options";
import InputText from "components/Inputs/InputText";
import InputNumber from "components/Inputs/InputNumber";
import { RemoveCircle } from "@mui/icons-material";
import { InputAutoComplete, Option } from "components/Inputs/InputAutoComplete";
import {
InputAutoComplete,
Option,
} from "components/Inputs/AutoComplete/InputAutoComplete";
import { prettyName } from "utils/formatting";
import InputBoolean from "components/Inputs/InputBoolean";
import { SelectorNumber, SelectorText } from "haService/fieldTypes";
import InputYaml from "components/Inputs/InputYaml";
import { useSnackbar } from "notistack";
import { InputEntity } from "components/Inputs/InputEntities";
import { InputEntity } from "components/Inputs/AutoComplete/InputEntities";
import { ButtonIcon } from "components/Icons/ButtonIcons";
export type ServiceEditorFieldProps = {
@@ -1,9 +1,9 @@
import "./ServiceEditorTarget.css";
import { InputDevice } from "components/Inputs/InputDevice";
import { InputEntity } from "components/Inputs/InputEntities";
import { InputDevice } from "components/Inputs/AutoComplete/InputDevice";
import { InputEntity } from "components/Inputs/AutoComplete/InputEntities";
import { Targets } from "haService/fieldTypes";
import { FC } from "react";
import { InputArea } from "components/Inputs/InputArea";
import { InputArea } from "components/Inputs/AutoComplete/InputArea";
type RawTargetData = {
entity_id?: string[] | string;
@@ -10,7 +10,7 @@ import {
ServiceEditorData,
} from "./options";
import { ServiceEditorField } from "./ServiceEditorField";
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
import { InputAutoComplete } from "components/Inputs/AutoComplete/InputAutoComplete";
import { ServiceEditorTarget } from "./ServiceEditorTarget";
export type ServiceEditorProps = {
+12 -7
View File
@@ -1,4 +1,4 @@
import { BaseOption } from "components/Inputs/InputAutoComplete";
import { BaseOption } from "components/Inputs/AutoComplete/InputAutoComplete";
import { FieldData, TypedHassService } from "haService/fieldTypes";
import { prettyName } from "utils/formatting";
@@ -7,17 +7,22 @@ export type ServiceEditorData = {
target: Record<string, any>;
};
export type ServiceEditorOption = BaseOption<{
data: FieldData
data: FieldData;
}>;
export const convertFieldToOption = (id: string, data: FieldData): ServiceEditorOption => ({
export const convertFieldToOption = (
id: string,
data: FieldData
): ServiceEditorOption => ({
id,
label: data.name ?? prettyName(id),
data,
})
});
export const splitUpOptions = (service: TypedHassService, data: ServiceEditorData) => {
export const splitUpOptions = (
service: TypedHassService,
data: ServiceEditorData
) => {
const required: ServiceEditorOption[] = [];
const additional: ServiceEditorOption[] = [];
const incmFields: string[] = [];
@@ -28,7 +33,7 @@ export const splitUpOptions = (service: TypedHassService, data: ServiceEditorDat
required.push(opt);
} else {
if (data.field[opt.id]) {
incmFields.push(opt.id)
incmFields.push(opt.id);
} else {
additional.push(opt);
}