From 1ea5f83590f413a9dfbcb5b8b3cd307d064794e3 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Wed, 15 Dec 2021 15:31:26 -0500 Subject: [PATCH] functional editor --- webapp/src/components/DAGSvgs/DAGCircle.tsx | 5 +- webapp/src/components/DAGSvgs/styles.ts | 13 ++- webapp/src/components/SequenceNodes/index.tsx | 54 ++++++++----- .../src/components/SequenceNodes/positions.ts | 79 ++++++++++++------- webapp/src/components/SequenceNodes/types.ts | 24 +++--- 5 files changed, 110 insertions(+), 65 deletions(-) diff --git a/webapp/src/components/DAGSvgs/DAGCircle.tsx b/webapp/src/components/DAGSvgs/DAGCircle.tsx index bd87214..5c17e47 100644 --- a/webapp/src/components/DAGSvgs/DAGCircle.tsx +++ b/webapp/src/components/DAGSvgs/DAGCircle.tsx @@ -17,7 +17,10 @@ export const DAGCircle = ({ onEdit, onAdd, }: AddProps) => { - const { classes } = useCircleStyles({ size: size * 0.9 }); + const { classes } = useCircleStyles({ + size: size * 0.9, + hasOnFunction: !!onEdit || !!onAdd + }); console.log({ onEdit }) return <> diff --git a/webapp/src/components/DAGSvgs/styles.ts b/webapp/src/components/DAGSvgs/styles.ts index 6972c42..77a176a 100644 --- a/webapp/src/components/DAGSvgs/styles.ts +++ b/webapp/src/components/DAGSvgs/styles.ts @@ -149,15 +149,20 @@ export const useNodeStyles = createAppUseStyles<{ } }) -export const useCircleStyles = createAppUseStyles<{ size: number }>(theme => ({ - root: ({size}) => ({ +export const useCircleStyles = createAppUseStyles<{ + size: number, + hasOnFunction: boolean, + }>(theme => ({ + root: ({size, hasOnFunction}) => ({ backgroundColor: Color(theme.primary).set('rgb.g', 100).hex(), borderRadius: 500, height: size, width: size, - cursor: "pointer", + cursor: hasOnFunction ? "pointer" : 'default', "&:hover": { - backgroundColor: Color(theme.primary).set('rgb.g', 150).hex(), + backgroundColor: hasOnFunction ? + Color(theme.primary).set('rgb.g', 150).hex() : + Color(theme.primary).set('rgb.g', 100).hex(), }, fontSize: `${size * 0.4}px`, display: 'flex', diff --git a/webapp/src/components/SequenceNodes/index.tsx b/webapp/src/components/SequenceNodes/index.tsx index b4e4ac6..e2549cf 100644 --- a/webapp/src/components/SequenceNodes/index.tsx +++ b/webapp/src/components/SequenceNodes/index.tsx @@ -1,23 +1,48 @@ import { DAGBoard } from "components/DAGSvgs/DAGBoard"; import { FC, useState } from "react"; -import { AutomationSequenceNode } from 'types/automations'; import { useTheme } from "styles/theme"; -import { SequenceNodeProps } from './types'; +import { SequenceNodeProps, ModalState } from './types'; import Color from 'chroma-js'; import { computeNodesEdgesPos } from './positions'; import { Modal } from 'components/Modal'; import { NodeEditor } from 'components/NodeEditor'; - -interface ModalState { - node: AutomationSequenceNode; - update: (n: AutomationSequenceNode) => void; - onlyConditions: boolean; -} +import { MultiNodeEditor } from "components/MultiNodeEditors"; export const SequenceNodes: FC = (props) => { const theme = useTheme(); const [modalState, setModalState] = useState(null); - console.log({ modalState }); + let modalBody = <> + if (modalState) { + if (modalState.single) { + modalBody = setModalState(null)} + onSave={n => { modalState.update(n as any); setModalState(null) }} + allowedTypes={modalState.onlyConditions ? ['condition'] : ['action', 'condition']} + /> + } else { + modalBody = setModalState(null)} + onSave={(i, n) => { + modalState.update([ + ...modalState.node.slice(0, i), + n as any, + ...modalState.node.slice(i + 1), + ]); setModalState(null) + }} + onAdd={n => modalState.update([...modalState.node, n as any])} + onRemove={(i) => { + modalState.update([ + ...modalState.node.slice(0, i), + ...modalState.node.slice(i + 1), + ]); + }} + allowedTypes={modalState.onlyConditions ? ['condition'] : ['action', 'condition']} + /> + } + } + return <> = (pro props.startPoint, props.sequence, props.onChange, - (node, update, onlyConditions) => setModalState({ - node, update, onlyConditions, - }) + s => setModalState(s) )} settings={{ ...props.dims, @@ -36,12 +59,7 @@ export const SequenceNodes: FC = (pro }} /> - {modalState && setModalState(null)} - onSave={n => { modalState.update(n as any); setModalState(null) }} - allowedTypes={modalState.onlyConditions ? ['condition'] : ['action', 'condition']} - />} + {modalBody} } diff --git a/webapp/src/components/SequenceNodes/positions.ts b/webapp/src/components/SequenceNodes/positions.ts index f17520d..d1b61a9 100644 --- a/webapp/src/components/SequenceNodes/positions.ts +++ b/webapp/src/components/SequenceNodes/positions.ts @@ -4,11 +4,11 @@ import { Point } from "types/graphs"; import { makeUpdater, Updater } from './updater'; import { ChooseAction } from 'types/automations/actions'; import { AutomationCondition } from "types/automations/conditions"; +import { ModalState } from "./types"; +import { AutomationNode } from '../../types/automations/index'; -export type UpdateNode = ( - node: AutomationSequenceNode, - updateNode: (n: AutomationSequenceNode) => void, - onlyConditions: boolean, +export type UpdateModalState = ( + s: ModalState ) => void; const offsetPoint = ( @@ -44,8 +44,8 @@ function* dealWithNested( innerStartLoc: Point, updater: Updater, sequence: AutomationSequenceNode[], - openModal: UpdateNode, - onEdit: () => void, + openModal: UpdateModalState, + onEdit?: () => void, ): Generator { const np = offsetPoint(innerStartLoc, [0.5, 0]); yield { @@ -57,7 +57,7 @@ function* dealWithNested( yield { type: 'circle', loc: innerStartLoc, - onClick: ['edit', onEdit], + onClick: onEdit ? ['edit', onEdit]: undefined, } yield { type: 'edge', @@ -82,7 +82,7 @@ function* dealWithChoose( nodeLoc: Point, makeUpdater: (j: number | null) => Updater, updateData: (data: ChooseAction['action_data']) => void, - openModal: UpdateNode, + openModal: UpdateModalState, offset: ReturnType, ): Generator { offset.resetY() @@ -96,23 +96,10 @@ function* dealWithChoose( updater, node.action_data.choose[j].sequence, openModal, - () => openModal( - node.action_data.choose[j].conditions[0] ?? { - '$smType': 'condition', 'condition': 'and', 'condition_data': { - 'conditions': [] - }}, - (n) => updateData({ - ...node.action_data, - choose: [ - ...node.action_data.choose.slice(0, j), - { - sequence: node.action_data.choose[j].sequence, - conditions: [n] as AutomationCondition[], - }, - ...node.action_data.choose.slice(j+1), - ] - }), - true, + onModalOpenForConditions( + openModal, j, + node.action_data, + updateData, ), )) { yield elm @@ -134,8 +121,7 @@ function* dealWithChoose( innerStartLoc, makeUpdater(null), node.action_data.default, - openModal, - () => {} + openModal )) { yield elm if (elm.type === 'node') { @@ -168,7 +154,7 @@ export function* computeNodesEdgesPos( startPoint: Point, sequence: AutomationSequenceNode[], onChange: (s: AutomationSequenceNode[]) => void, - openModal: UpdateNode, + openModal: UpdateModalState, ): Generator { const rootUpdater = makeUpdater(sequence, onChange); const offset = makeOffsetMaintainer(startPoint) @@ -181,7 +167,7 @@ export function* computeNodesEdgesPos( type: 'node', loc: nodeLoc, node, - onOpen: () => openModal(node, n => rootUpdater.updateNode(i, n), false), + onOpen: onModalOpenForNode(openModal, i, node, rootUpdater), onRemove: () => rootUpdater.removeNode(i), onAdd: i === sequence.length - 1 ? rootUpdater.addNode : undefined, } @@ -208,3 +194,38 @@ export function* computeNodesEdgesPos( } } } + + +export const onModalOpenForNode = ( + openModal: UpdateModalState, + i: number, + node: AutomationSequenceNode, + rootUpdater: Updater, +) => () => openModal({ + single: true, + node, + onlyConditions: false, + update: n => rootUpdater.updateNode(i, n), +}) + +export const onModalOpenForConditions = ( + openModal: UpdateModalState, + j: number, + data: ChooseAction['action_data'], + updateData: (data: ChooseAction['action_data']) => void, +) => () => openModal({ + single: false, + node: data.choose[j].conditions, + onlyConditions: true, + update: conditions => updateData({ + ...data, + choose: [ + ...data.choose.slice(0, j), + { + sequence: data.choose[j].sequence, + conditions: conditions as AutomationCondition[], + }, + ...data.choose.slice(j+1), + ] + }), +}) diff --git a/webapp/src/components/SequenceNodes/types.ts b/webapp/src/components/SequenceNodes/types.ts index 252014d..40c1d88 100644 --- a/webapp/src/components/SequenceNodes/types.ts +++ b/webapp/src/components/SequenceNodes/types.ts @@ -9,16 +9,14 @@ export interface SequenceNodeProps { onChange: (s: AutomationSequenceNode[]) => void; } -// export interface SequenceNodeSettings extends BaseSequenceNodeSettings{ -// sequence: AutomationSequenceNode[], -// onChange?: (s: AutomationSequenceNode[]) => void; -// } - -// export interface BaseSequenceNodeSettings { -// startPoint: Point; -// nodeHeight: number; -// nodeWidth: number; -// distanceFactor: number; -// edgeColor: string; -// keyPrefix?: string; -// } +export type ModalState = { + single: true, + node: AutomationSequenceNode + update: (n: AutomationSequenceNode) => void; + onlyConditions: boolean; +} | { + single: false, + node: AutomationSequenceNode[] + update: (n: AutomationSequenceNode[]) => void; + onlyConditions: boolean; +}