From 61000f2ff1092b3908b37e57c62651827626fe02 Mon Sep 17 00:00:00 2001 From: Ari Date: Mon, 6 Jun 2022 11:28:51 -0400 Subject: [PATCH] namer in conditions --- webapp/src/components/ConditionEditor/ConditionNode.tsx | 4 +++- webapp/src/components/ConditionEditor/viewRender.tsx | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/webapp/src/components/ConditionEditor/ConditionNode.tsx b/webapp/src/components/ConditionEditor/ConditionNode.tsx index bf1c348..6880438 100644 --- a/webapp/src/components/ConditionEditor/ConditionNode.tsx +++ b/webapp/src/components/ConditionEditor/ConditionNode.tsx @@ -9,6 +9,7 @@ import { getEditor } from "./editorRender"; import { useStyles } from "./style"; import { getViewer } from "./viewRender"; import useWindowSize from "utils/useWindowSize"; +import { useHA } from "haService"; @@ -33,6 +34,7 @@ export const ConditionNode: FC<{ const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode); const [yamlMode, setYamlMode] = useState(false); const { isMobile } = useWindowSize(); + const { namer } = useHA(); // alias const effectiveDM = internalDisplayMode || yamlMode; // effect @@ -64,7 +66,7 @@ export const ConditionNode: FC<{ let childrenConditions: JSX.Element; if (effectiveDM) { const Viewer = getViewer(condition); - childrenConditions = + childrenConditions = } else { const Editor = getEditor(condition); childrenConditions = diff --git a/webapp/src/components/ConditionEditor/viewRender.tsx b/webapp/src/components/ConditionEditor/viewRender.tsx index 6de22c5..dcc5d6d 100644 --- a/webapp/src/components/ConditionEditor/viewRender.tsx +++ b/webapp/src/components/ConditionEditor/viewRender.tsx @@ -1,12 +1,13 @@ import { FC } from "react"; import { AutomationCondition, LogicCondition } from "types/automations/conditions"; -import { getDescriptionFromAutomationNode } from "utils/formatting"; +import { getDescriptionFromAutomationNode, Namer } from "utils/formatting"; import { ConditionNode } from "./ConditionNode"; import { genUpdateMethods } from "./nestedUpdater"; interface Viewer extends FC<{ condition: C; + namer: Namer; onChange: (condition: C) => void; }> { } @@ -23,9 +24,10 @@ export const getViewer = (condition: AutomationCondition): Viewer => { export const GenericViewer: Viewer = ({ condition, + namer, }) => { return <> - {getDescriptionFromAutomationNode(condition)} + {getDescriptionFromAutomationNode(condition, namer)} }