flipped trigger + condition
createMode for condition editor
This commit is contained in:
1 parent
f549993d3e
commit
e7dec306df
10 files changed
+51
-30
No files matched your search
@@ -18,6 +18,7 @@ export type ConditionNodeBaseProps = {
|
||||
onDelete?: () => void;
|
||||
onUpdate: (data: AutomationCondition) => void;
|
||||
disableDelete?: boolean;
|
||||
initialViewMode?: ConditionNodeBaseViewMode;
|
||||
};
|
||||
export type ConditionNodeBaseViewMode = "edit" | "yaml" | "view";
|
||||
export const ConditionNodeBase: FC<ConditionNodeBaseProps> = (props) => {
|
||||
@@ -31,7 +32,9 @@ export const ConditionNodeBase: FC<ConditionNodeBaseProps> = (props) => {
|
||||
isEdited: false,
|
||||
condition: props.condition,
|
||||
});
|
||||
const [mode, setMode] = useState<ConditionNodeBaseViewMode>("view");
|
||||
const [mode, setMode] = useState<ConditionNodeBaseViewMode>(
|
||||
props.initialViewMode ?? "view"
|
||||
);
|
||||
// alias
|
||||
const updateCondition = (data: any) =>
|
||||
setCondition({
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
import { FC } from "react";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { ConditionNodeBase } from "./ConditionNodeBase";
|
||||
import { ConditionNodeViewMode } from "./ConditionNodeSettings";
|
||||
|
||||
export const ConditionEditor: FC<{
|
||||
condition: AutomationCondition;
|
||||
onDelete: () => void;
|
||||
onUpdate: (data: AutomationCondition) => void;
|
||||
}> = ({ condition, onDelete, onUpdate }) => {
|
||||
initialViewMode?: ConditionNodeViewMode;
|
||||
}> = ({ condition, onDelete, onUpdate, initialViewMode }) => {
|
||||
// state
|
||||
return (
|
||||
<ConditionNodeBase
|
||||
@@ -16,6 +18,7 @@ export const ConditionEditor: FC<{
|
||||
onUpdate(update);
|
||||
}}
|
||||
disableDelete={true}
|
||||
initialViewMode={initialViewMode}
|
||||
/>
|
||||
);
|
||||
};
|
||||
@@ -41,7 +41,6 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = (props) => {
|
||||
modalBody = (
|
||||
<NodeEditor
|
||||
node={modalState.node}
|
||||
isErrored={modalState.isError}
|
||||
onClose={() => setModalState(null)}
|
||||
onSave={(n) => {
|
||||
modalState.update(n as any);
|
||||
|
||||
@@ -34,7 +34,6 @@ export const DAGGraphBoard: FC<DAGGraphBoardProps> = ({
|
||||
modalBody = (
|
||||
<NodeEditor
|
||||
node={modalState.node}
|
||||
isErrored={modalState.isError}
|
||||
onClose={closeModal}
|
||||
onSave={(n) => {
|
||||
modalState.update(n as any);
|
||||
|
||||
@@ -23,6 +23,25 @@ export const moveAlong = (
|
||||
}
|
||||
};
|
||||
|
||||
export const moveFromTo = (
|
||||
from: keyof DAGEntities,
|
||||
to: keyof DAGEntities,
|
||||
startPoint: XYPosition,
|
||||
dims: DAGDims
|
||||
): XYPosition => {
|
||||
if (!dims.flipped) {
|
||||
return {
|
||||
x: startPoint.x + dims[from].width * dims.distanceFactor,
|
||||
y: startPoint.y + (dims[from].height - dims[to].height) / 2,
|
||||
};
|
||||
} else {
|
||||
return {
|
||||
y: startPoint.y + dims[from].height * dims.distanceFactor,
|
||||
x: startPoint.x + (dims[from].width - dims[to].width) / 2,
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
export const computeSize = (
|
||||
by: keyof DAGEntities,
|
||||
dims: DAGDims,
|
||||
|
||||
@@ -5,13 +5,11 @@ import {
|
||||
ElementMakerOutput,
|
||||
} from "./types";
|
||||
import { AutomationTrigger } from "types/automations/triggers";
|
||||
import { SequenceNodeMaker } from "../nodes/SequenceNode";
|
||||
import * as distance from "./distance";
|
||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
||||
import { AutomationActionData } from "types/automations";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { CollectionNodeMaker } from "../nodes/CollectionNode";
|
||||
import { LastNode } from "./types";
|
||||
|
||||
export const makeAutomationNodes = (
|
||||
automation: AutomationActionData,
|
||||
@@ -24,22 +22,20 @@ export const makeAutomationNodes = (
|
||||
edges: [],
|
||||
},
|
||||
position: args.dims.position,
|
||||
nodeId: "trigger",
|
||||
nodeId: `${args.dims.flipped}-trigger`,
|
||||
nodeIndex: 0,
|
||||
});
|
||||
|
||||
const condOut = makeConditionNodes(automation.condition, {
|
||||
...args,
|
||||
elementData: state.elementData,
|
||||
position: {
|
||||
x:
|
||||
state.lastNode.pos.x +
|
||||
args.dims.trigger.width * args.dims.distanceFactor,
|
||||
y:
|
||||
state.lastNode.pos.y +
|
||||
(args.dims.trigger.height - args.dims.condition.height) / 2,
|
||||
},
|
||||
nodeId: "condition",
|
||||
position: distance.moveFromTo(
|
||||
"trigger",
|
||||
"condition",
|
||||
state.lastNode.pos,
|
||||
args.dims
|
||||
),
|
||||
nodeId: `${args.dims.flipped}-condition`,
|
||||
nodeIndex: 1,
|
||||
lastNodeId: state.lastNode.nodeId,
|
||||
});
|
||||
|
||||
@@ -1,18 +1,20 @@
|
||||
import { AutomationCondition } from 'types/automations/conditions';
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { ConditionEditor } from "components/ConditionEditor";
|
||||
import { OptionManager } from "./OptionManager";
|
||||
|
||||
|
||||
export const ConditionLogicState: OptionManager<AutomationCondition> = {
|
||||
defaultState: () => ({
|
||||
condition: 'and',
|
||||
condition: "and",
|
||||
alias: "",
|
||||
conditions: [],
|
||||
}),
|
||||
isReady: _ => true,
|
||||
renderOptionList: (state, setState) => <ConditionEditor
|
||||
condition={state}
|
||||
onUpdate={setState}
|
||||
onDelete={() => { }}
|
||||
/>
|
||||
}
|
||||
isReady: (_) => true,
|
||||
Component: ({ state, setState, createMode }) => (
|
||||
<ConditionEditor
|
||||
condition={state}
|
||||
onUpdate={setState}
|
||||
onDelete={() => {}}
|
||||
initialViewMode={createMode ? "edit" : "view"}
|
||||
/>
|
||||
),
|
||||
};
|
||||
@@ -19,6 +19,7 @@ export type OptionManager<T> = {
|
||||
state: T;
|
||||
setState: (s: T) => void;
|
||||
ha: HAService;
|
||||
createMode: boolean;
|
||||
}>;
|
||||
}
|
||||
);
|
||||
|
||||
@@ -18,8 +18,8 @@ type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>];
|
||||
|
||||
export const useEditorNodeState = (
|
||||
originalNode: AutomationNode,
|
||||
isErrored: boolean,
|
||||
allowedTypes: AutomationNodeTypes[],
|
||||
createMode: boolean,
|
||||
uState: UseState = useState
|
||||
) => {
|
||||
// state
|
||||
@@ -153,6 +153,7 @@ export const useEditorNodeState = (
|
||||
state={currentNode}
|
||||
setState={setState}
|
||||
ha={ha}
|
||||
createMode={createMode}
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
|
||||
@@ -15,7 +15,6 @@ export interface NodeEditorProps {
|
||||
onSave?: (n: AutomationNode) => void;
|
||||
onFlags?: (isReady: boolean, isModified: boolean) => void;
|
||||
saveBtnCreateText?: boolean;
|
||||
isErrored?: boolean;
|
||||
children?: ReactNode;
|
||||
}
|
||||
|
||||
@@ -27,10 +26,9 @@ export const NodeEditor: FC<NodeEditorProps> = ({
|
||||
onFlags = () => {},
|
||||
saveBtnCreateText = false,
|
||||
children,
|
||||
isErrored = false,
|
||||
}) => {
|
||||
// state
|
||||
const state = useEditorNodeState(node, isErrored, allowedTypes);
|
||||
const state = useEditorNodeState(node, allowedTypes, saveBtnCreateText);
|
||||
const confirm = useConfirm();
|
||||
|
||||
// alias
|
||||
|
||||
Reference in new issue
Block a user