automation editor fixed up

This commit is contained in:
ari committed 2022-05-05 13:57:44 -04:00
1 parent a56c7ff964
commit 634f3e9219
3 files changed
+25 -62

No files matched your search

@@ -1,8 +1,8 @@
import React from "react";
import { ComponentMeta, ComponentStory } from '@storybook/react';
import { AutomationEditor } from './index';
import { NODE_HEIGHT, NODE_WIDTH, DISTANCE_FACTOR, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE } from '../DAGSvgs/constants';
import { useState } from 'react';
import * as dgconst from 'components/DAGSvgs/constants';
export default {
@@ -11,12 +11,14 @@ export default {
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
addHeight: ADD_HEIGHT,
addWidth: ADD_WIDTH,
circleSize: CIRCLE_SIZE,
distanceFactor: DISTANCE_FACTOR,
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
}
} as ComponentMeta<typeof AutomationEditor>
@@ -1,30 +1,19 @@
import "./index.css";
import { DAGBoardElmDims } from "components/DAGSvgs/DAGBoard";
import { ArrowIcon, CheckMarkIcon, ZoomIcon } from "components/Icons";
import { SequenceNodes } from "components/SequenceNodes";
import { FC, useEffect, useState } from "react";
import { AutomationData, AutomationSequenceNode } from "types/automations";
import { FC, useState } from "react";
import { AutomationData } from "types/automations";
import useWindowSize from "utils/useWindowSize";
import { AutoInfoBox } from "./AutoInfoBox";
import { useEditorStyles } from "./styles";
import { computeTriggerPos, computeExtraField } from './positions';
import { chain } from "utils/iter";
import { AutomationTrigger } from 'types/automations/triggers';
import { Modal } from "components/Modal";
import { NodeEditor } from "components/NodeEditor";
import { ButtonIcon } from "components/Icons/ButtonIcons";
import { Button } from "components/Inputs/Button";
import { useAutomatioEditorState } from "./state";
import { DAGAutomationFlow } from "components/DAGFlow";
import * as dgconst from 'components/DAGSvgs/constants';
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
interface TriggerEditorModalState {
trigger: AutomationTrigger;
onSave: (node: AutomationTrigger) => void;
}
interface Props {
automation: AutomationData;
dims: DAGBoardElmDims;
dims: DAGAutomationFlowDims;
onUpdate: (auto: AutomationData) => void;
}
export const AutomationEditor: FC<Props> = ({
@@ -41,10 +30,8 @@ export const AutomationEditor: FC<Props> = ({
save,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [zoomLevel, setZoomLevel] = useState(40);
const { ratioWbh } = useWindowSize();
const [closeInfo, setCloseInfo] = useState(false);
const [modalState, setModalState] = useState<null | TriggerEditorModalState>(null);
const { classes } = useEditorStyles({
closeInfo,
horizontalMode: ratioWbh < 0.75,
@@ -59,17 +46,6 @@ export const AutomationEditor: FC<Props> = ({
</div>
}
return <div className={classes.root}>
<Modal open={!!modalState}>
{!!modalState && <NodeEditor
node={modalState.trigger}
onClose={() => setModalState(null)}
onSave={(n) => {
modalState.onSave(n as any);
setModalState(null);
}}
allowedTypes={['trigger']}
/>}
</Modal>
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
@@ -85,16 +61,7 @@ export const AutomationEditor: FC<Props> = ({
<div className={classes.wrapper}>
<div className={classes.toolbar}>
<div style={{ display: 'flex' }}>
<ZoomIcon className={classes.zoomImg} size={1} color="white" />
<input
type="number"
min={1} max={100} step={1}
className={classes.zoom}
value={zoomLevel}
onChange={z => setZoomLevel(z.target.valueAsNumber ?? 40)}
/>
</div>
<span></span>
<Button
className={classes.saveBtn}
onClick={save}
@@ -107,19 +74,8 @@ export const AutomationEditor: FC<Props> = ({
sequence={state.data.sequence}
trigger={state.data.trigger}
onSequenceUpdate={updateSequence}
triggersOpts={{
}}
dims={{
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}}
onTriggerUpdate={updateTrigger}
dims={dims}
/>
</div>
</div>
@@ -39,14 +39,17 @@ export const useEditorStyles = createAppUseStyles<{
zoomImg: {
},
toolbar: {
toolbar: ({ autoChanged }) => ({
width: "100%",
height: autoChanged === 'changed' ? 'initial' : 0,
display: "flex",
flexDirection: "row",
justifyContent: 'space-between',
alignItems: "center",
padding: "0.5em",
},
borderBottom: autoChanged === 'changed' ? '1px solid var(--change)' : undefined,
borderLeft: autoChanged === 'changed' ? '1px solid var(--change)' : undefined,
}),
saveBtn: ({ autoChanged }) => ({
display: "flex",
opacity: autoChanged === "changed" ? 1 : 0,
@@ -56,7 +59,9 @@ export const useEditorStyles = createAppUseStyles<{
maxHeight: '1em',
justifyContent: 'center',
alignItems: 'center',
borderColor: "#bf4 !important",
color: "#bf4 !important"
borderColor: "var(--change) !important",
color: "var(--change) !important",
paddingTop: '1em !important',
paddingBottom: '1em !important',
}),
}))