diff --git a/webapp/package.json b/webapp/package.json index b8e0e5f..e9867f3 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -18,6 +18,7 @@ "autosuggest-highlight": "3.2.1", "home-assistant-js-websocket": "7.1.0", "jss": "10.9.0", + "material-ui-confirm": "^3.0.4", "notistack": "2.0.5", "react": "18.2.0", "react-cookie": "4.1.1", diff --git a/webapp/src/components/DAGFlow/DAGNode.tsx b/webapp/src/components/DAGFlow/DAGNode.tsx index 2b46ccf..fce9516 100644 --- a/webapp/src/components/DAGFlow/DAGNode.tsx +++ b/webapp/src/components/DAGFlow/DAGNode.tsx @@ -13,6 +13,8 @@ import { SpeedDial } from "components/SpeedDial"; import Edit from "@mui/icons-material/Edit"; import { useTheme } from "@mui/material"; import InputBoolean from "components/Inputs/InputBoolean"; +import { useConfirm } from "material-ui-confirm"; +import { useSnackbar } from "notistack"; export type DAGNodeOnMove = Record< Direction, @@ -77,6 +79,8 @@ export const DAGNode: FC = ({ onSetEnabled, }) => { const theme = useTheme(); + const confirm = useConfirm(); + const snackbr = useSnackbar(); return ( <>
= ({ ))} - - - + {onXClick && ( + { + confirm({ + description: "Are you sure you want to delete this node?", + }) + .then(() => { + onXClick(); + snackbr.enqueueSnackbar("Deleted.", { + variant: "info", + }); + }) + .catch(() => + snackbr.enqueueSnackbar("Did not delete node.", { + variant: "info", + }) + ); + }} + size="small" + > + + + )} {!!onSetEnabled && ( = ({ onSetEnabled: (i) => onTriggerUpdate([ ...trigger.slice(0, i), - { ...trigger[i], enabled: !(trigger[i] ?? true) }, + { ...trigger[i], enabled: !(trigger[i].enabled ?? true) }, ...trigger.slice(i + 1), ]), }); diff --git a/webapp/src/components/DAGFlow/sequenceConvertor.ts b/webapp/src/components/DAGFlow/sequenceConvertor.ts index d3a5ab7..3037c80 100644 --- a/webapp/src/components/DAGFlow/sequenceConvertor.ts +++ b/webapp/src/components/DAGFlow/sequenceConvertor.ts @@ -239,6 +239,9 @@ const addChooseNode = ( }), }); let lastPos: XYPosition = position; + if (!(node.enabled ?? true)) { + return { lastPos, flowData }; + } // conditions node.choose.forEach(({ sequence, conditions }, j) => { const sequenceId = `${nodeId}.${j}`; diff --git a/webapp/src/components/Page/index.tsx b/webapp/src/components/Page/index.tsx index c254f20..ab2b3ec 100644 --- a/webapp/src/components/Page/index.tsx +++ b/webapp/src/components/Page/index.tsx @@ -5,6 +5,7 @@ import { VersionBox } from "components/VersionBox"; import { SnackbarKey, SnackbarProvider, useSnackbar } from "notistack"; import Button from "@mui/material/Button"; import { useHAConnection } from "haService/connection"; +import { ConfirmProvider } from "material-ui-confirm"; const theme = createTheme({ palette: { @@ -104,18 +105,22 @@ export const Page: FC<{ }; return ( - } - dense - preventDuplicate - > - {children} - + + ( + + )} + dense + preventDuplicate + > + {children} + + ); }; diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 98e6f17..5432530 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -10705,6 +10705,11 @@ markdown-to-jsx@^7.1.0: resolved "https://registry.yarnpkg.com/markdown-to-jsx/-/markdown-to-jsx-7.1.7.tgz#a5f22102fb12241c8cea1ca6a4050bb76b23a25d" integrity sha512-VI3TyyHlGkO8uFle0IOibzpO1c1iJDcXcS/zBrQrXQQvJ2tpdwVzVZ7XdKsyRz1NdRmre4dqQkMZzUHaKIG/1w== +material-ui-confirm@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/material-ui-confirm/-/material-ui-confirm-3.0.4.tgz#db4892452f65628f4bb9da3166bfbc0c53877d3b" + integrity sha512-2Aqh1gU6JqGvFtm2KTEUsFf+SKkNQPxWXz6CU3lJlbuFkLmIm28kjmT9sUjNkcdFOL0WhRmI3UwIbBVVBPckiA== + md5.js@^1.3.4: version "1.3.5" resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"