Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6275123071 | ||
|
|
0001c93792 | ||
|
|
90d3fa0587 | ||
|
|
938040e519 | ||
|
|
14b3132c64 | ||
|
|
17c79d7aab | ||
|
|
67cc57f068 | ||
|
|
a4743b0353 | ||
|
|
5efda5f3b2 | ||
|
|
7d7a788723 | ||
|
|
cdf67aa1a9 | ||
|
|
98133607ca | ||
|
|
5729b74c89 | ||
|
|
fb8eb4f38c | ||
|
|
21adcb6973 | ||
|
|
8a33d05ced | ||
|
|
334268b5ee | ||
|
|
3b7b17021f | ||
|
|
44c4ac12dd | ||
|
|
f8233dd6ab | ||
|
|
54f528deb4 |
No files matched your search
@@ -35,7 +35,10 @@ jobs:
|
||||
- metadata
|
||||
strategy:
|
||||
matrix:
|
||||
action: [lint, coverage, security-checks]
|
||||
action:
|
||||
- lint
|
||||
- coverage
|
||||
- security-checks
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up Python
|
||||
@@ -59,7 +62,6 @@ jobs:
|
||||
action:
|
||||
- "test:ci"
|
||||
- "tsc:ci"
|
||||
- "build"
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v3
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
# Changelog
|
||||
|
||||
## [0.1.14] - Material UI + Autocomplete v2
|
||||
|
||||
- Brought some Material UI elements for input and text
|
||||
- Autocomplete for tags
|
||||
- Using 'id' as alias for trigger (as it seems to break HA otherwise)
|
||||
- Not using 'alias' for conditions, always auto-generating it (again, this used to break HA)
|
||||
- Added missing `data` object to service-actions
|
||||
|
||||
## [0.1.13] - YAML
|
||||
|
||||
- Better YAML
|
||||
|
||||
+18
-13
@@ -1,11 +1,17 @@
|
||||
# <--- Build Args -->
|
||||
# <--- Pre-Build Args -->
|
||||
ARG BUILD_ARCH
|
||||
ARG BUILD_VERSION
|
||||
|
||||
# <--- Image Setup -->
|
||||
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
||||
WORKDIR /app
|
||||
|
||||
# <--- Post-Build Args -->
|
||||
ARG BUILD_VERSION
|
||||
|
||||
# <--- Environment Variables -->
|
||||
ENV HASSIO_TOKEN ""
|
||||
ENV BUILD_VERSION $BUILD_VERSION
|
||||
|
||||
# <--- System Wide Dependencies -->
|
||||
ENV LANG C.UTF-8
|
||||
RUN apk add --no-cache \
|
||||
@@ -13,30 +19,29 @@ RUN apk add --no-cache \
|
||||
npm \
|
||||
build-base \
|
||||
python3-dev
|
||||
RUN pip install -U wheel setuptools pip && \
|
||||
npm i -g yarn
|
||||
|
||||
# <--- Scripts -->
|
||||
COPY docker/bin /app/bin
|
||||
|
||||
# <--- PREP -->
|
||||
RUN /app/bin/prep.sh
|
||||
|
||||
# <--- Python Dependencies -->
|
||||
COPY api/setup.py /app/setup.py
|
||||
RUN pip install . /app
|
||||
|
||||
# <--- Webapp Build -->
|
||||
COPY webapp/ /app/web-builder
|
||||
RUN cd /app/web-builder && \
|
||||
yarn && \
|
||||
yarn build && \
|
||||
cp -r /app/web-builder/build /app/web && \
|
||||
rm -rf /app/web-builder
|
||||
echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
|
||||
|
||||
# <--- BUILD -->
|
||||
RUN /app/bin/build.sh /app /app/web-builder
|
||||
|
||||
# <--- Api Code -->
|
||||
COPY api/src /app/src
|
||||
COPY run.sh /app/run.sh
|
||||
RUN chmod +x /app/run.sh
|
||||
|
||||
# <--- Environment Variables -->
|
||||
ENV HASSIO_TOKEN ""
|
||||
ENV BUILD_VERSION $BUILD_VERSION
|
||||
|
||||
# <--- Ports -->
|
||||
EXPOSE 8000
|
||||
|
||||
|
||||
@@ -3,22 +3,18 @@ DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
|
||||
build:
|
||||
$(DC) build
|
||||
|
||||
push:
|
||||
$(DC) push
|
||||
|
||||
local_run:
|
||||
run:
|
||||
$(MAKE) build
|
||||
$(DC) up -d
|
||||
sleep 1
|
||||
$(DC) ps
|
||||
|
||||
local_logs:
|
||||
logs:
|
||||
$(DC) logs -f
|
||||
|
||||
local_ps:
|
||||
ps:
|
||||
$(DC) ps
|
||||
|
||||
|
||||
local_stop:
|
||||
stop:
|
||||
$(DC) stop
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
|
||||
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
||||
|
||||

|
||||

|
||||
|
||||

|
||||

|
||||
|
||||
|
||||
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
# Security Policy
|
||||
|
||||
## Supported Versions
|
||||
|
||||
| Version | Supported |
|
||||
| ------- | ------------------ |
|
||||
| 0.1.x | :white_check_mark: |
|
||||
|
||||
|
||||
## Reporting a Vulnerability
|
||||
|
||||
Please open an issue with the tag 'Vulnerability', and include your reasoning in it.
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
name: Shortumation
|
||||
version: 0.1.13
|
||||
version: v0.1.14
|
||||
slug: shortumation
|
||||
image: asosnovsky/shortumation-{arch}
|
||||
url: "https://github.com/asosnovsky/Shortumation"
|
||||
@@ -26,6 +26,6 @@ map:
|
||||
- config:rw
|
||||
options: {}
|
||||
ports:
|
||||
8000/tcp: 8000
|
||||
8000/tcp:
|
||||
ports_description:
|
||||
8000/tcp: Main port for the API & Web.
|
||||
@@ -6,4 +6,5 @@ services:
|
||||
context: "./"
|
||||
dockerfile: "./Dockerfile"
|
||||
args:
|
||||
- BUILD_ARCH=${ARCH:-amd64}
|
||||
BUILD_ARCH: ${ARCH:-amd64}
|
||||
BUILD_VERSION: ${BUILD_TAG:-latest}
|
||||
Executable
+28
@@ -0,0 +1,28 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
api_location=${1}
|
||||
web_location=${2}
|
||||
|
||||
function install_yarn() {
|
||||
pushd $web_location
|
||||
yarn
|
||||
yarn build
|
||||
cp -r $web_location/build $api_location/web
|
||||
popd
|
||||
}
|
||||
|
||||
function install_py() {
|
||||
pushd $api_location
|
||||
pip install . $api_location
|
||||
popd
|
||||
}
|
||||
|
||||
declare -i err=0 werr=0
|
||||
install_py &
|
||||
install_yarn &
|
||||
while wait -fn || werr=$?; ((werr != 127)); do
|
||||
err=$werr
|
||||
done
|
||||
|
||||
echo "DONE BUILD"
|
||||
Executable
+19
@@ -0,0 +1,19 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
function prep_yarn() {
|
||||
npm i -g yarn
|
||||
}
|
||||
|
||||
function prep_py() {
|
||||
pip install -U wheel setuptools pip
|
||||
}
|
||||
|
||||
declare -i err=0 werr=0
|
||||
prep_py &
|
||||
prep_yarn &
|
||||
while wait -fn || werr=$?; ((werr != 127)); do
|
||||
err=$werr
|
||||
done
|
||||
|
||||
echo "DONE PREP"
|
||||
@@ -8,5 +8,8 @@ module.exports = {
|
||||
"@storybook/addon-essentials",
|
||||
"@storybook/preset-create-react-app",
|
||||
"@storybook/addon-queryparams",
|
||||
]
|
||||
],
|
||||
"features": {
|
||||
"emotionAlias": false,
|
||||
},
|
||||
}
|
||||
Vendored
+6
-13
@@ -2,24 +2,17 @@
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Debug CRA Tests",
|
||||
"name": "Debug Jest Tests",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
|
||||
"args": [
|
||||
"test",
|
||||
"--runInBand",
|
||||
"--no-cache",
|
||||
"--watchAll=false"
|
||||
"runtimeArgs": [
|
||||
"--inspect-brk",
|
||||
"${workspaceRoot}/node_modules/.bin/jest",
|
||||
"--runInBand"
|
||||
],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"console": "integratedTerminal",
|
||||
"internalConsoleOptions": "neverOpen",
|
||||
"env": {
|
||||
"CI": "true"
|
||||
},
|
||||
"disableOptimisticBPs": true
|
||||
"port": 9229
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -4,6 +4,10 @@
|
||||
"private": true,
|
||||
"homepage": ".",
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.9.0",
|
||||
"@emotion/styled": "^11.8.1",
|
||||
"@mui/material": "^5.8.0",
|
||||
"@mui/styles": "^5.8.0",
|
||||
"@types/jest": "^26.0.15",
|
||||
"@types/node": "^12.0.0",
|
||||
"@types/react": "^17.0.0",
|
||||
|
||||
@@ -15,7 +15,7 @@ export const useMockAPI = (
|
||||
method = "POST",
|
||||
data = {}
|
||||
}) {
|
||||
console.debug("[[mockCall]]", method, path, data);
|
||||
// console.debug("[[mockCall]]", method, path, data);
|
||||
if (path === AUTOMTAION_LIST) {
|
||||
return {
|
||||
ok: true,
|
||||
|
||||
@@ -34,6 +34,13 @@
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag-list {
|
||||
max-height: 30vh;
|
||||
overflow-y: scroll;
|
||||
padding-left: 0.25em;
|
||||
padding-right: 0.25em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tags>h1 {
|
||||
font-size: 1.5em;
|
||||
}
|
||||
@@ -49,6 +56,7 @@
|
||||
|
||||
.automation-editor--info-box--tag>div {
|
||||
margin: 0;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag>div>input {
|
||||
@@ -56,29 +64,11 @@
|
||||
padding: 1em 0.25em 0.2em 0.25em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag>button {
|
||||
height: 1.25em;
|
||||
width: 1.25em;
|
||||
.automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
|
||||
height: 2em;
|
||||
width: 2em;
|
||||
font-size: 1em;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag--error {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag--error.hide {
|
||||
height: 0;
|
||||
opacity: 0;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag--error.show {
|
||||
height: fit-content;
|
||||
opacity: 1;
|
||||
}
|
||||
@@ -1,19 +1,29 @@
|
||||
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { makeTagDB } from "components/AutomationList/TagDB";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
import { AutoInfoBox } from "./AutoInfoBox";
|
||||
import { defaultAutomation } from 'utils/defaults';
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList/Editor/InfoBox',
|
||||
component: AutoInfoBox,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
tagDB: makeTagDB([
|
||||
defaultAutomation("test")
|
||||
])
|
||||
}
|
||||
} as ComponentMeta<typeof AutoInfoBox>;
|
||||
|
||||
|
||||
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
||||
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
|
||||
return (
|
||||
<div className="page">
|
||||
<Page>
|
||||
<AutoInfoBox
|
||||
{...args}
|
||||
className=""
|
||||
metadata={metadata}
|
||||
tags={tags}
|
||||
@@ -22,7 +32,7 @@ export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
||||
setState([m, t])
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
)
|
||||
}
|
||||
NoTags.args = {
|
||||
|
||||
@@ -2,16 +2,18 @@ import "./AutoInfoBox.css";
|
||||
import { AutomationMetadata } from "types/automations";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import InputTextArea from "components/Inputs/InputTextArea";
|
||||
import { FC, useRef, useState } from 'react';
|
||||
import { AddIcon, TrashIcon } from "components/Icons";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import InputAutoText from "components/Inputs/InputAutoText";
|
||||
import { TagDB } from "components/AutomationList/TagDB";
|
||||
|
||||
interface Props {
|
||||
className: string;
|
||||
metadata: AutomationMetadata;
|
||||
tags: Array<[string, string]>;
|
||||
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
||||
tagDB: TagDB;
|
||||
}
|
||||
export const AutoInfoBox: FC<Props> = ({
|
||||
metadata,
|
||||
@@ -19,6 +21,7 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
onUpdate,
|
||||
className,
|
||||
children,
|
||||
tagDB,
|
||||
}) => {
|
||||
// state
|
||||
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
|
||||
@@ -26,6 +29,7 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
const errorTimeoutId = useRef(-1);
|
||||
|
||||
// aliases
|
||||
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
|
||||
const setError = (index: number | 'new', msg: string) => {
|
||||
_setError([index, msg])
|
||||
if (errorTimeoutId.current >= 0) {
|
||||
@@ -69,7 +73,9 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
if (error) {
|
||||
return setError('new', error)
|
||||
}
|
||||
onUpdate(metadata, tags.concat([newTag]));
|
||||
onUpdate(metadata, tags.concat([
|
||||
newTag.map(x => x.trim()) as [string, string]
|
||||
]));
|
||||
setNewTag(['', '']);
|
||||
}
|
||||
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
|
||||
@@ -81,7 +87,7 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
<div className="automation-editor--info-box-inner">
|
||||
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
|
||||
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
|
||||
<InputTextArea label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
|
||||
<InputText multiline label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
|
||||
<InputList
|
||||
label="Mode"
|
||||
current={metadata.mode}
|
||||
@@ -95,22 +101,42 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
/>
|
||||
<div className="automation-editor--info-box--tags">
|
||||
<h1>Tags</h1>
|
||||
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
||||
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
||||
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
|
||||
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
|
||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
|
||||
{error}
|
||||
</span>
|
||||
</div>)}
|
||||
<div className="automation-editor--info-box--tag-list">
|
||||
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
||||
<InputAutoText
|
||||
value={tagName}
|
||||
label="Name"
|
||||
onChange={v => updateTagName(v, tagIndex)}
|
||||
options={foundNewTagNames}
|
||||
error={errorIndex === tagIndex ? error : undefined}
|
||||
/>
|
||||
<InputAutoText
|
||||
value={tagValue}
|
||||
label="Tag"
|
||||
onChange={v => onUpdateTags(v, tagIndex)}
|
||||
options={tagDB.getTagValues(tagName)}
|
||||
error={errorIndex === tagIndex ? error : undefined}
|
||||
/>
|
||||
<Button className="automation-editor--info-box--tag--trash" onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
||||
</div>)}
|
||||
</div>
|
||||
<hr />
|
||||
<div className="automation-editor--info-box--tag">
|
||||
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
|
||||
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
|
||||
<Button onClick={addNewTag} ><AddIcon /></Button>
|
||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
|
||||
{error}
|
||||
</span>
|
||||
<InputAutoText
|
||||
value={newTag[0]}
|
||||
label="Name"
|
||||
onChange={v => setNewTag([v, newTag[1]])}
|
||||
options={foundNewTagNames}
|
||||
error={errorIndex === 'new' ? error : undefined}
|
||||
/>
|
||||
<InputAutoText
|
||||
value={newTag[1]}
|
||||
label="Tag"
|
||||
onChange={v => setNewTag([newTag[0], v])}
|
||||
options={tagDB.getTagValues(newTag[0])}
|
||||
error={errorIndex === 'new' ? error : undefined}
|
||||
/>
|
||||
<Button className="automation-editor--info-box--tag--add" onClick={addNewTag} ><AddIcon /></Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -3,6 +3,8 @@ import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { AutomationEditor } from './index';
|
||||
import { useState } from 'react';
|
||||
import * as dgconst from 'components/DAGFlow/constants';
|
||||
import { Page } from "components/Page";
|
||||
import { makeTagDB } from "components/AutomationList/TagDB";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -10,21 +12,22 @@ export default {
|
||||
component: AutomationEditor,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
dims: dgconst.DEFAULT_DIMS
|
||||
dims: dgconst.DEFAULT_DIMS,
|
||||
}
|
||||
} as ComponentMeta<typeof AutomationEditor>
|
||||
|
||||
const Template: ComponentStory<typeof AutomationEditor> = args => {
|
||||
const [state, setState] = useState(args.automation)
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<AutomationEditor
|
||||
{...args}
|
||||
tagDB={makeTagDB([state as any])}
|
||||
automation={state}
|
||||
onUpdate={s => {
|
||||
window.setTimeout(() => setState(s), 3000)
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const Loading = Template.bind({});
|
||||
|
||||
@@ -10,16 +10,19 @@ import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
|
||||
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
||||
import { MiniFailure } from 'types/validators/helper';
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
import { TagDB } from "components/AutomationList/TagDB";
|
||||
|
||||
interface Props {
|
||||
automation?: AutomationData;
|
||||
dims: DAGAutomationFlowDims;
|
||||
onUpdate: (auto: AutomationData) => void;
|
||||
tagDB: TagDB;
|
||||
}
|
||||
export const AutomationEditor: FC<Props> = ({
|
||||
dims,
|
||||
automation: propsAutos,
|
||||
onUpdate: propsOnUpdate,
|
||||
tagDB,
|
||||
}) => {
|
||||
// state
|
||||
const {
|
||||
@@ -55,6 +58,7 @@ export const AutomationEditor: FC<Props> = ({
|
||||
metadata={state.data.metadata}
|
||||
tags={state.data.tags}
|
||||
onUpdate={updateMetadata}
|
||||
tagDB={tagDB}
|
||||
>
|
||||
<ButtonIcon
|
||||
className="automation-editor--info-box--icon"
|
||||
|
||||
@@ -2,8 +2,9 @@ import "styles/root.css";
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { AutomationList } from ".";
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
import { bigMockAutoList } from "utils/mocks";
|
||||
import * as dgconst from 'components/DAGFlow/constants';
|
||||
import { Page } from "components/Page";
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList',
|
||||
@@ -17,7 +18,7 @@ export default {
|
||||
|
||||
const Template: ComponentStory<typeof AutomationList> = args => {
|
||||
const [autos, setAutos] = useState(args.automations)
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<AutomationList {...args} automations={autos}
|
||||
onAdd={a => {
|
||||
args.onAdd(a);
|
||||
@@ -39,7 +40,7 @@ const Template: ComponentStory<typeof AutomationList> = args => {
|
||||
]);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const EmptyStart = Template.bind({})
|
||||
@@ -51,457 +52,7 @@ EmptyStart.args = {
|
||||
export const FewAutos = Template.bind({})
|
||||
FewAutos.args = {
|
||||
...FewAutos.args,
|
||||
automations: [
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
|
||||
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
|
||||
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
|
||||
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
|
||||
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
||||
createMockAuto({ "Room": "Office" }),
|
||||
createMockAuto(),
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1649947692702",
|
||||
"alias": "Bed Remote",
|
||||
"description": "",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "turn_on",
|
||||
"id": "turn_on"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "turn_off",
|
||||
"id": "turn_off"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "dim_up",
|
||||
"id": "dim_up"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "dim_down",
|
||||
"id": "dim_down"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_double_press",
|
||||
"subtype": "turn_on",
|
||||
"id": "up_dbclk"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "turn_off"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"type": "turn_off",
|
||||
"device_id": "asdasdasdasdas",
|
||||
"entity_id": "light.bulb_ari_lamp",
|
||||
"domain": "light"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "turn_on"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "light.turn_on",
|
||||
"data": {
|
||||
"color_temp": 153,
|
||||
"brightness_pct": 100
|
||||
},
|
||||
"target": {
|
||||
"device_id": "asdasdasdasdas"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "dim_up"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"device_id": "asdasdasdasdas",
|
||||
"domain": "light",
|
||||
"entity_id": "light.bulb_ari_lamp",
|
||||
"type": "brightness_increase"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "dim_down"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"device_id": "asdasdasdasdas",
|
||||
"domain": "light",
|
||||
"entity_id": "light.bulb_ari_lamp",
|
||||
"type": "brightness_decrease"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "up_dbclk"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "light.turn_on",
|
||||
"data": {
|
||||
"color_temp": 500,
|
||||
"brightness_pct": 100
|
||||
},
|
||||
"target": {
|
||||
"device_id": "asdasdasdasdas"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"default": []
|
||||
}
|
||||
],
|
||||
"tags": {
|
||||
"Type": "Remote",
|
||||
"Room": "Bedroom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1641617168123",
|
||||
"alias": "Ensure On",
|
||||
"description": "",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"platform": "device",
|
||||
"type": "turned_off",
|
||||
"device_id": "tasdasdasdasdasdasda",
|
||||
"entity_id": "switch.power_washer",
|
||||
"domain": "switch"
|
||||
},
|
||||
{
|
||||
"platform": "device",
|
||||
"type": "turned_off",
|
||||
"device_id": "dasdasdasdasdas",
|
||||
"entity_id": "switch.plug_living_room_tv",
|
||||
"domain": "switch"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"type": "turn_on",
|
||||
"device_id": "tasdasdasdasdasdasda",
|
||||
"entity_id": "switch.power_washer",
|
||||
"domain": "switch"
|
||||
},
|
||||
{
|
||||
"type": "turn_on",
|
||||
"device_id": "dasdasdasdasdas",
|
||||
"entity_id": "switch.plug_living_room_tv",
|
||||
"domain": "switch"
|
||||
}
|
||||
],
|
||||
"tags": {}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1649726828269",
|
||||
"alias": "Climate Heat Mode Settings",
|
||||
"description": "Ensures that the climate is always in sync with the house settings",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"platform": "state",
|
||||
"entity_id": "climate.main_floor",
|
||||
"id": "main"
|
||||
},
|
||||
{
|
||||
"platform": "state",
|
||||
"entity_id": "climate.second_floor",
|
||||
"id": "second"
|
||||
},
|
||||
{
|
||||
"platform": "state",
|
||||
"entity_id": "input_boolean.thermostats_house_is_heating",
|
||||
"id": "setting"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "setting"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "climate.turn_off",
|
||||
"data": {},
|
||||
"target": {
|
||||
"device_id": [
|
||||
"d88dcfe82bc9a1c0f2b77b871848155e",
|
||||
"ef2d47fdeef19f8984b85f92f2597f73"
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "input_boolean.thermostats_house_is_heating",
|
||||
"state": "on"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'heat' }}"
|
||||
},
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'off' }}"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "climate.set_hvac_mode",
|
||||
"data": {
|
||||
"hvac_mode": "heat"
|
||||
},
|
||||
"target": {
|
||||
"entity_id": "{{ trigger.entity_id }}"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"default": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'cool' }}"
|
||||
},
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'off' }}"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "climate.set_hvac_mode",
|
||||
"data": {
|
||||
"hvac_mode": "cool"
|
||||
},
|
||||
"target": {
|
||||
"entity_id": "{{ trigger.entity_id }}"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"tags": {}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1628024070687",
|
||||
"alias": "Baby Light Setting",
|
||||
"description": "Configures max/min light settings for the baby ",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"platform": "time",
|
||||
"at": "21:00:00",
|
||||
"id": "night"
|
||||
},
|
||||
{
|
||||
"platform": "time",
|
||||
"at": "07:30:00",
|
||||
"id": "day"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "night"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "zwave_js.set_config_parameter",
|
||||
"data": {
|
||||
"parameter": "5",
|
||||
"value": "15"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "day"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "zwave_js.set_config_parameter",
|
||||
"data": {
|
||||
"parameter": "5",
|
||||
"value": 100
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"default": []
|
||||
}
|
||||
],
|
||||
"tags": {}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "alarmanlage_an",
|
||||
"alias": "alarmanlage_an (Uhrzeit)",
|
||||
"mode": "single"
|
||||
},
|
||||
tags: {},
|
||||
"trigger": [
|
||||
{
|
||||
"entity_id": "sensor.time",
|
||||
"platform": "state",
|
||||
"to": "23:30"
|
||||
}
|
||||
],
|
||||
"condition": [
|
||||
{
|
||||
"condition": "or",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "person.simon",
|
||||
"state": "home"
|
||||
},
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "person.leni",
|
||||
"state": "home"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "alarm_control_panel.alarm_arm_night",
|
||||
"target": {
|
||||
"entity_id": [
|
||||
"alarm_control_panel.alarmo"
|
||||
]
|
||||
},
|
||||
"data": {
|
||||
"code": "xxx"
|
||||
}
|
||||
},
|
||||
{
|
||||
"service": "alarm_control_panel.alarm_arm_away",
|
||||
"data": {},
|
||||
"target": {
|
||||
"entity_id": "alarm_control_panel.blink_home"
|
||||
}
|
||||
}
|
||||
],
|
||||
}
|
||||
],
|
||||
automations: bigMockAutoList,
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
}
|
||||
|
||||
.automation-list-box--body {
|
||||
overflow: auto;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100%;
|
||||
flex: 1;
|
||||
user-select: none;
|
||||
@@ -24,7 +25,15 @@
|
||||
padding-bottom: 0.5em;
|
||||
border-width: 1px;
|
||||
border-bottom-style: solid;
|
||||
border-color: white;
|
||||
border-color: var(--primary-accent);
|
||||
}
|
||||
|
||||
.automation-list-box--body--group.other {
|
||||
border-color: var(--green);
|
||||
}
|
||||
|
||||
.automation-list-box--body--group.other>b {
|
||||
color: var(--change);
|
||||
}
|
||||
|
||||
.automation-list-box--body--group>.automation-list-box--body--group {
|
||||
@@ -40,7 +49,8 @@
|
||||
padding: 0.1em;
|
||||
}
|
||||
|
||||
.automation-list-box--body--group>b:hover {
|
||||
.automation-list-box--body--group>b:hover,
|
||||
.automation-list-box--body--group.selected>b {
|
||||
background-color: var(--secondary-accent);
|
||||
color: var(--secondary);
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { AutomationListBox } from "./AutomationListBox";
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList/Box',
|
||||
@@ -14,12 +15,12 @@ export default {
|
||||
|
||||
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
||||
const [selected, setSelected] = useState(args.selected)
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
|
||||
setSelected(i)
|
||||
args.onSelectAutomation(i)
|
||||
}} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const EmptyStart = Template.bind({})
|
||||
|
||||
@@ -1,88 +1,18 @@
|
||||
import { groupAutomations, getTagList } from './AutomationListBox';
|
||||
import { AutomationData } from 'types/automations/index';
|
||||
import { getTagList } from './AutomationListBox';
|
||||
import { createMockAuto } from 'utils/mocks';
|
||||
|
||||
test('group automations', () => {
|
||||
const automations: AutomationData[] = [
|
||||
{
|
||||
condition: [],
|
||||
metadata: {
|
||||
id: '1',
|
||||
alias: '',
|
||||
description: '',
|
||||
mode: 'single',
|
||||
},
|
||||
tags: {
|
||||
"Room": 'Living Room',
|
||||
"Type": 'Lights'
|
||||
},
|
||||
sequence: [],
|
||||
trigger: [],
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
metadata: {
|
||||
id: '2',
|
||||
alias: '',
|
||||
description: '',
|
||||
mode: 'single',
|
||||
},
|
||||
tags: {
|
||||
"Room": 'Living Room',
|
||||
"Type": 'Climate'
|
||||
},
|
||||
sequence: [],
|
||||
trigger: [],
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
metadata: {
|
||||
id: '3',
|
||||
alias: '',
|
||||
description: '',
|
||||
mode: 'single',
|
||||
},
|
||||
tags: {
|
||||
"Room": 'Kitchen',
|
||||
"Type": 'Climate'
|
||||
},
|
||||
sequence: [],
|
||||
trigger: [],
|
||||
},
|
||||
];
|
||||
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
|
||||
"Living Room": {
|
||||
"Lights": [0],
|
||||
"Climate": [1],
|
||||
},
|
||||
"Kitchen": {
|
||||
"Climate": [2],
|
||||
}
|
||||
})
|
||||
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
|
||||
"Lights": {
|
||||
"Living Room": [0],
|
||||
},
|
||||
"Climate": {
|
||||
"Living Room": [1],
|
||||
"Kitchen": [2]
|
||||
}
|
||||
})
|
||||
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
|
||||
"Lights": [0],
|
||||
"Climate": [1, 2]
|
||||
})
|
||||
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
|
||||
"Living Room": [0, 1],
|
||||
"Kitchen": [2]
|
||||
})
|
||||
|
||||
|
||||
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
|
||||
0, 1, 2
|
||||
])
|
||||
});
|
||||
|
||||
// const makeDummy = (id: string, tags: Record<string, string>) => ({
|
||||
// condition: [],
|
||||
// metadata: {
|
||||
// id,
|
||||
// alias: '',
|
||||
// description: '',
|
||||
// mode: 'single',
|
||||
// },
|
||||
// tags,
|
||||
// sequence: [],
|
||||
// trigger: [],
|
||||
// })
|
||||
|
||||
test('getTagList', () => {
|
||||
expect(getTagList([
|
||||
|
||||
@@ -4,7 +4,8 @@ import { AutomationData, AutomationMetadata } from "types/automations";
|
||||
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { TrashIcon } from "components/Icons";
|
||||
import { makeGrouping } from "./automationGrouper";
|
||||
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
|
||||
|
||||
|
||||
export type Props = {
|
||||
@@ -27,7 +28,11 @@ export const AutomationListBox: FC<Props> = ({
|
||||
const [searchText, setSearchText] = useState('');
|
||||
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
||||
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
|
||||
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
|
||||
const grouping = makeGrouping(
|
||||
filteredAutomations.map(([a, _]) => a),
|
||||
selectedTagIdx.map(i => tags[i]),
|
||||
selected,
|
||||
)
|
||||
|
||||
return <div className="automation-list-box">
|
||||
<div className="automation-list-box--nav">
|
||||
@@ -45,7 +50,15 @@ export const AutomationListBox: FC<Props> = ({
|
||||
/>
|
||||
</div>
|
||||
<div className="automation-list-box--body">
|
||||
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
|
||||
<AutomationListBoxGroup
|
||||
events={{
|
||||
onSelectAutomation,
|
||||
onRemove
|
||||
}}
|
||||
autos={filteredAutomations}
|
||||
grouping={grouping}
|
||||
selectedAutomationIdx={selected}
|
||||
/>
|
||||
</div>
|
||||
<div className="automation-list-box--bottom">
|
||||
<Button onClick={onAdd}>Add</Button>
|
||||
@@ -78,134 +91,5 @@ const filterAutomations = (autos: AutomationData[], searchText: string, selected
|
||||
return false
|
||||
}
|
||||
}
|
||||
if (selected.length > 0) {
|
||||
for (const i of selected) {
|
||||
if (!a.tags[tags[i]]) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
})
|
||||
|
||||
|
||||
export const groupAutomations = (
|
||||
autos: AutomationData[],
|
||||
selected: number[],
|
||||
tags: string[],
|
||||
) => {
|
||||
if (selected.length === 0) {
|
||||
return autos.map((_, i) => i);
|
||||
}
|
||||
const out: any = {};
|
||||
for (let ai = 0; ai < autos.length; ai++) {
|
||||
const a = autos[ai];
|
||||
let where = out;
|
||||
let tag: string = '';
|
||||
let lastKey: string | null = null;
|
||||
for (const i of selected) {
|
||||
tag = tags[i];
|
||||
if (lastKey !== null) {
|
||||
where = where[lastKey]
|
||||
}
|
||||
if (!where[a.tags[tag]]) {
|
||||
where[a.tags[tag]] = {}
|
||||
}
|
||||
lastKey = a.tags[tag]
|
||||
}
|
||||
if (lastKey !== null) {
|
||||
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
|
||||
where[lastKey] = []
|
||||
}
|
||||
where[lastKey].push(ai)
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
const convertGroupsToItems = (
|
||||
groups: any,
|
||||
autos: Array<[AutomationData, number]>,
|
||||
onSelectAutomation: (i: number) => void,
|
||||
onRemove: (i: number) => void,
|
||||
selected: number,
|
||||
) => {
|
||||
if (Array.isArray(groups)) {
|
||||
return groups.map(i => {
|
||||
const [auto, autoIndex] = autos[i];
|
||||
let title = "BadAuto<<Missing Metadata>>"
|
||||
if (auto.metadata) {
|
||||
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
|
||||
}
|
||||
return <div
|
||||
key={i}
|
||||
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
|
||||
title={title}
|
||||
onClick={() => onSelectAutomation(autoIndex)}
|
||||
>
|
||||
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
|
||||
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
||||
</div>
|
||||
})
|
||||
} else {
|
||||
return Object.keys(groups).map(groupName => {
|
||||
return <AutomationListBoxGroup
|
||||
key={groupName}
|
||||
groupName={groupName}
|
||||
groups={groups[groupName]}
|
||||
autos={autos}
|
||||
onSelectAutomation={onSelectAutomation}
|
||||
onRemove={onRemove}
|
||||
selected={selected}
|
||||
/>
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
export const MetadataBox: FC<{
|
||||
metadata: AutomationMetadata,
|
||||
tags: Record<string, string>,
|
||||
}> = (auto) => {
|
||||
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
|
||||
if (auto.metadata) {
|
||||
title = <>
|
||||
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
|
||||
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
|
||||
</>
|
||||
}
|
||||
return <div
|
||||
className="automation-list-box--body--item--title"
|
||||
>
|
||||
{title}
|
||||
<div
|
||||
className="automation-list-box--body--item--tags"
|
||||
>
|
||||
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
||||
<b>{tagName}:</b> {auto.tags[tagName]}
|
||||
</span>)}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
const AutomationListBoxGroup: FC<{
|
||||
groupName: string,
|
||||
groups: any,
|
||||
autos: Array<[AutomationData, number]>,
|
||||
onSelectAutomation: (i: number) => void,
|
||||
onRemove: (i: number) => void;
|
||||
selected: number,
|
||||
}> = ({
|
||||
groupName,
|
||||
groups,
|
||||
autos,
|
||||
onSelectAutomation,
|
||||
onRemove,
|
||||
selected,
|
||||
}) => {
|
||||
const [open, setOpen] = useState(false);
|
||||
return <div className="automation-list-box--body--group">
|
||||
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
|
||||
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
|
||||
</div>
|
||||
}
|
||||
@@ -0,0 +1,141 @@
|
||||
|
||||
import { TrashIcon } from "components/Icons";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { MetadataBox } from "./AutomationMetadataBox";
|
||||
import { AutomationData } from "types/automations";
|
||||
import { AutomationGrouping } from "./automationGrouper";
|
||||
import { FC, useState } from "react";
|
||||
|
||||
export type AutomationListBoxEvents = {
|
||||
onSelectAutomation: (i: number) => void,
|
||||
onRemove: (i: number) => void,
|
||||
}
|
||||
export type AutomationListBoxGroups = {
|
||||
grouping: AutomationGrouping,
|
||||
currentNode: number,
|
||||
}
|
||||
export type AutomationListBoxProps = {
|
||||
events: AutomationListBoxEvents,
|
||||
groups: AutomationListBoxGroups,
|
||||
autos: Array<[AutomationData, number]>,
|
||||
selectedAutomationIdx: number,
|
||||
};
|
||||
export type AutomationListBoxGroupProps = {
|
||||
events: AutomationListBoxEvents,
|
||||
grouping: AutomationGrouping,
|
||||
autos: Array<[AutomationData, number]>,
|
||||
selectedAutomationIdx: number,
|
||||
}
|
||||
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
|
||||
events, grouping, autos, selectedAutomationIdx,
|
||||
}) => {
|
||||
if (grouping.top.length === 1) {
|
||||
return <>
|
||||
{convertGroupsToItems(autos, {
|
||||
grouping, currentNode: grouping.top[0],
|
||||
}, events, selectedAutomationIdx)}
|
||||
</>
|
||||
} else {
|
||||
return <>
|
||||
{grouping.top.map(groupIdx => <AutomationListBoxGroupItem
|
||||
key={groupIdx}
|
||||
autos={autos}
|
||||
groups={{
|
||||
grouping,
|
||||
currentNode: groupIdx
|
||||
}}
|
||||
events={events}
|
||||
selectedAutomationIdx={selectedAutomationIdx}
|
||||
/>)}
|
||||
</>
|
||||
}
|
||||
}
|
||||
|
||||
export const convertGroupsToItems = (
|
||||
autos: Array<[AutomationData, number]>,
|
||||
{ grouping, currentNode }: AutomationListBoxGroups,
|
||||
events: AutomationListBoxEvents,
|
||||
selectedAutomationIdx: number,
|
||||
) => {
|
||||
const automations = grouping.getAutomations(currentNode);
|
||||
if (automations.length > 0) {
|
||||
return automations.map(autoIndex =>
|
||||
<AutomationListBoxItem
|
||||
key={`${autoIndex}-${autos[autoIndex][1]}`}
|
||||
events={events}
|
||||
auto={autos[autoIndex]}
|
||||
isSelected={selectedAutomationIdx === autos[autoIndex][1]}
|
||||
/>
|
||||
)
|
||||
}
|
||||
const subgroups = grouping.getSubGroups(currentNode);
|
||||
if (subgroups.length > 0) {
|
||||
return subgroups.map(groupIdx => <AutomationListBoxGroupItem
|
||||
key={groupIdx}
|
||||
autos={autos}
|
||||
groups={{
|
||||
grouping,
|
||||
currentNode: groupIdx
|
||||
}}
|
||||
events={events}
|
||||
selectedAutomationIdx={selectedAutomationIdx}
|
||||
/>)
|
||||
}
|
||||
return <></>
|
||||
}
|
||||
|
||||
export const AutomationListBoxGroupItem: FC<{
|
||||
events: AutomationListBoxEvents,
|
||||
groups: AutomationListBoxGroups,
|
||||
autos: Array<[AutomationData, number]>,
|
||||
selectedAutomationIdx: number,
|
||||
}> = ({
|
||||
autos, groups, events, selectedAutomationIdx,
|
||||
}) => {
|
||||
const groupData = groups.grouping.getData(groups.currentNode);
|
||||
const automations = groups.grouping.getAutomations(groups.currentNode);
|
||||
const [open, setOpen] = useState(false);
|
||||
const isOther = groupData.isOther;
|
||||
const openIcon = !open ? "⊕" : "⊖";
|
||||
const total = isOther ? <small>
|
||||
{automations.length} automation{automations.length !== 1 ? 's' : ''} {groupData.isOther ? "" : "(untagged)"}
|
||||
</small> : <></>
|
||||
return <div className={[
|
||||
"automation-list-box--body--group",
|
||||
isOther ? 'other' : '',
|
||||
groupData.selected ? 'selected' : '',
|
||||
].join(' ')}>
|
||||
<b onClick={() => setOpen(!open)}>{groupData.name} {openIcon} {total}</b>
|
||||
{open && convertGroupsToItems(autos, groups, events, selectedAutomationIdx)}
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
export const AutomationListBoxItem: FC<{
|
||||
auto: [AutomationData, number],
|
||||
isSelected: boolean,
|
||||
events: AutomationListBoxEvents,
|
||||
}> = ({
|
||||
events: {
|
||||
onRemove,
|
||||
onSelectAutomation,
|
||||
},
|
||||
auto: [
|
||||
auto, autoIndex
|
||||
],
|
||||
isSelected,
|
||||
}) => {
|
||||
let title = "BadAuto<<Missing Metadata>>"
|
||||
if (auto.metadata) {
|
||||
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
|
||||
}
|
||||
return <div
|
||||
key={autoIndex}
|
||||
className={["automation-list-box--body--item", isSelected ? 'selected' : ''].join(' ')}
|
||||
title={title}
|
||||
onClick={() => onSelectAutomation(autoIndex)}
|
||||
>
|
||||
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
|
||||
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
||||
</div>
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
import { FC } from "react"
|
||||
import { AutomationMetadata } from "types/automations"
|
||||
|
||||
export const MetadataBox: FC<{
|
||||
metadata: AutomationMetadata,
|
||||
tags: Record<string, string>,
|
||||
}> = (auto) => {
|
||||
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
|
||||
if (auto.metadata) {
|
||||
title = <>
|
||||
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
|
||||
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
|
||||
</>
|
||||
}
|
||||
return <div
|
||||
className="automation-list-box--body--item--title"
|
||||
>
|
||||
{title}
|
||||
<div
|
||||
className="automation-list-box--body--item--tags"
|
||||
>
|
||||
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
||||
<b>{tagName}:</b> {auto.tags[tagName]}
|
||||
</span>)}
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
@@ -3,6 +3,7 @@ import { ConnectedAutomationList } from ".";
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
import { useMockApiService } from "apiService";
|
||||
import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
|
||||
import { Page } from "components/Page";
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList/Connected',
|
||||
@@ -17,12 +18,12 @@ export default {
|
||||
|
||||
const Template: ComponentStory<any> = args => {
|
||||
const api = useMockApiService(args.initialAutomations);
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ConnectedAutomationList
|
||||
{...args}
|
||||
api={api}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const EmptyStart = Template.bind({})
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
import { AutomationData } from "types/automations";
|
||||
|
||||
export type TagDB = ReturnType<typeof makeTagDB>;
|
||||
export const makeTagDB = (automations: AutomationData[]) => {
|
||||
const allTags: Record<string, Set<string>> = {};
|
||||
automations.forEach(({ tags }) =>
|
||||
Object.keys(tags).forEach(tagName => {
|
||||
const tagValue = tags[tagName];
|
||||
if (!allTags[tagName]) {
|
||||
allTags[tagName] = new Set()
|
||||
}
|
||||
allTags[tagName].add(tagValue);
|
||||
})
|
||||
);
|
||||
const allTagNames = Object.keys(allTags);
|
||||
return {
|
||||
getTagNames(myTags: string[]): string[] {
|
||||
return allTagNames.filter(n => !myTags.includes(n)).sort()
|
||||
},
|
||||
getTagValues(tagName: string): string[] {
|
||||
return allTags[tagName] ? Array.from(allTags[tagName].values()).sort() : [];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
import { makeGrouping } from "./automationGrouper";
|
||||
import { AutomationData } from 'types/automations/index';
|
||||
import { bigMockAutoList, createMockAuto } from 'utils/mocks';
|
||||
|
||||
const automations: AutomationData[] = [
|
||||
createMockAuto({
|
||||
"Room": 'Living Room',
|
||||
"Type": 'Lights'
|
||||
}),
|
||||
createMockAuto({
|
||||
"Room": 'Living Room',
|
||||
"Type": 'Climate'
|
||||
}),
|
||||
createMockAuto({
|
||||
"Room": 'Kitchen',
|
||||
"Type": 'Climate'
|
||||
}),
|
||||
createMockAuto({
|
||||
"Type": 'Climate'
|
||||
}),
|
||||
createMockAuto({
|
||||
"Room": 'Living Room'
|
||||
}),
|
||||
createMockAuto({}),
|
||||
];
|
||||
|
||||
test('no grouping', () => {
|
||||
const grouped = makeGrouping(automations, [], 0);
|
||||
expect(grouped.top).toStrictEqual([0])
|
||||
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 2, 3, 4, 5])
|
||||
});
|
||||
test('1 grouping', () => {
|
||||
const grouped = makeGrouping(automations, ["Room"], 0);
|
||||
expect(grouped.top).toHaveLength(3);
|
||||
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 4])
|
||||
expect(grouped.getAutomations(1)).toStrictEqual([2])
|
||||
expect(grouped.getAutomations(2)).toStrictEqual([3, 5])
|
||||
});
|
||||
test('2 groupings', () => {
|
||||
const grouped = makeGrouping(automations, ["Room", "Type"], 0);
|
||||
expect(grouped.top).toHaveLength(3);
|
||||
expect(grouped.getAutomations(grouped.top[0])).toHaveLength(0)
|
||||
expect(grouped.getSubGroups(grouped.top[0])).toHaveLength(3)
|
||||
expect(grouped.getAutomations(grouped.top[1])).toHaveLength(0)
|
||||
expect(grouped.getSubGroups(grouped.top[1])).toHaveLength(1)
|
||||
expect(grouped.getAutomations(grouped.top[2])).toHaveLength(2)
|
||||
expect(grouped.getSubGroups(grouped.top[2])).toHaveLength(0)
|
||||
});
|
||||
test('bigAutoList groupings has not duplicate ids', () => {
|
||||
const grouped = makeGrouping(bigMockAutoList, ['Room', "Remote"], 0);
|
||||
const flattenAndCount = (gid: number): Record<number, number[]> => {
|
||||
const subgroups = grouped.getSubGroups(gid);
|
||||
if (subgroups.length > 0) {
|
||||
return flattenAndConsolidate(subgroups)
|
||||
} else {
|
||||
return grouped.getAutomations(gid).reduce((sum: Record<number, number[]>, b) => {
|
||||
sum[b] = (sum[b] ?? []).concat(gid)
|
||||
return sum
|
||||
}, {})
|
||||
}
|
||||
}
|
||||
const flattenAndConsolidate = (gids: number[]): Record<number, number[]> => gids.map(flattenAndCount).reduce((a, b) => {
|
||||
for (const k of Object.keys(b).map(Number)) {
|
||||
a[k] = (a[k] ?? []).concat(b[k])
|
||||
}
|
||||
return a
|
||||
}, {})
|
||||
const countedAutos = flattenAndConsolidate(grouped.top)
|
||||
for (const key of Object.keys(countedAutos).map(Number)) {
|
||||
expect(countedAutos[key]).toHaveLength(1)
|
||||
}
|
||||
})
|
||||
@@ -0,0 +1,130 @@
|
||||
import { AutomationData } from "types/automations";
|
||||
|
||||
const makeGrouper = () => {
|
||||
const groupIdNames: string[] = []
|
||||
const groupSubGroups: Array<Set<number>> = []
|
||||
const groupAutomations: number[][] = []
|
||||
const groupData: Array<{
|
||||
name: string;
|
||||
selected: boolean;
|
||||
isOther: boolean;
|
||||
isTop: boolean;
|
||||
}> = [];
|
||||
const topGroups: number[] = [];
|
||||
|
||||
return {
|
||||
groupIdNames,
|
||||
groupSubGroups,
|
||||
groupAutomations,
|
||||
groupData,
|
||||
topGroups,
|
||||
addNew(groupId: string, groupName: string, theChosenOne: boolean, isTopLevel: boolean, isOther: boolean = false): number {
|
||||
groupIdNames.push(groupId);
|
||||
groupSubGroups.push(new Set());
|
||||
groupAutomations.push([]);
|
||||
groupData.push({
|
||||
name: groupName,
|
||||
selected: theChosenOne,
|
||||
isTop: isTopLevel,
|
||||
isOther
|
||||
})
|
||||
const groupIdx = groupIdNames.length - 1;
|
||||
if (isTopLevel) {
|
||||
topGroups.push(groupIdx);
|
||||
}
|
||||
return groupIdx;
|
||||
},
|
||||
updateGroup(
|
||||
groupIdx: number,
|
||||
update: {
|
||||
isChosen: boolean,
|
||||
lastGroupIdx: number | null,
|
||||
autoIdx: number | null,
|
||||
}
|
||||
) {
|
||||
if (update.isChosen) {
|
||||
groupData[groupIdx].selected = true;
|
||||
}
|
||||
if (update.lastGroupIdx !== null) {
|
||||
groupSubGroups[update.lastGroupIdx].add(groupIdx);
|
||||
}
|
||||
if (update.autoIdx !== null) {
|
||||
groupAutomations[groupIdx].push(update.autoIdx)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export type AutomationGrouping = ReturnType<typeof makeGrouping>;
|
||||
export const makeGrouping = (
|
||||
autos: AutomationData[],
|
||||
selectedTags: string[],
|
||||
selectedAutomationIdx: number,
|
||||
) => {
|
||||
const grouper = makeGrouper();
|
||||
|
||||
if (selectedTags.length === 0) {
|
||||
grouper.addNew("$", "", selectedAutomationIdx >= 0, true, true)
|
||||
grouper.groupAutomations = [autos.map((_, i) => i)];
|
||||
} else {
|
||||
autos.forEach((auto, autoIdx) => {
|
||||
const theChosenOne = selectedAutomationIdx === autoIdx;
|
||||
let lastGroupIdx: number | null = null;
|
||||
let lastGroupId: string = "$";
|
||||
for (let ti = 0; ti < selectedTags.length; ti++) {
|
||||
const isTopLevel = ti === 0;
|
||||
const selTag = selectedTags[ti];
|
||||
if (selTag in auto.tags) {
|
||||
const groupName = auto.tags[selTag];
|
||||
const groupId = `${lastGroupId}>${selTag}:${groupName}`;
|
||||
let groupIdx = grouper.groupIdNames.indexOf(groupId);
|
||||
if (groupIdx < 0) {
|
||||
groupIdx = grouper.addNew(groupId, groupName, theChosenOne, isTopLevel);
|
||||
}
|
||||
grouper.updateGroup(groupIdx, {
|
||||
isChosen: theChosenOne,
|
||||
lastGroupIdx,
|
||||
autoIdx: ti === selectedTags.length - 1 ? autoIdx : null,
|
||||
})
|
||||
lastGroupIdx = groupIdx;
|
||||
lastGroupId = groupId;
|
||||
} else {
|
||||
const groupId = `${lastGroupId}>${selTag}:$`;
|
||||
let groupIdx = grouper.groupIdNames.indexOf(groupId);
|
||||
if (groupIdx < 0) {
|
||||
groupIdx = grouper.addNew(groupId, "", theChosenOne, isTopLevel, true);
|
||||
}
|
||||
grouper.updateGroup(groupIdx, {
|
||||
isChosen: theChosenOne,
|
||||
lastGroupIdx,
|
||||
autoIdx,
|
||||
})
|
||||
break
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
const sortGroupIds = (groupIds: number[]) => groupIds.sort((a, b) => {
|
||||
const adata = grouper.groupData[a];
|
||||
const bdata = grouper.groupData[b];
|
||||
if (adata.isOther) {
|
||||
return 1
|
||||
} else {
|
||||
return adata.name > bdata.name ? -1 : 1
|
||||
}
|
||||
})
|
||||
return {
|
||||
top: sortGroupIds(grouper.topGroups),
|
||||
getSubGroups(groupIdx: number) {
|
||||
return sortGroupIds(Array.from(grouper.groupSubGroups[groupIdx].values()))
|
||||
},
|
||||
getAutomations(groupIdx: number) {
|
||||
return grouper.groupAutomations[groupIdx]
|
||||
},
|
||||
getData(groupIdx: number) {
|
||||
return grouper.groupData[groupIdx]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ import { ApiService } from "apiService/core";
|
||||
import { AutomationListBox } from "./AutomationListBox";
|
||||
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
import { makeTagDB } from "./TagDB";
|
||||
|
||||
|
||||
interface AutomationListParams {
|
||||
@@ -34,6 +35,7 @@ export const AutomationList: FC<AutomationListParams> = ({
|
||||
const { isMobile } = useWindowSize();
|
||||
// alias
|
||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
||||
const tagDB = makeTagDB(automations);
|
||||
// render
|
||||
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
|
||||
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
|
||||
@@ -64,6 +66,7 @@ export const AutomationList: FC<AutomationListParams> = ({
|
||||
automation={currentAuto}
|
||||
onUpdate={a => onUpdate(current, a)}
|
||||
dims={dims}
|
||||
tagDB={tagDB}
|
||||
/> : <></>}
|
||||
</div>
|
||||
{children}
|
||||
|
||||
@@ -2,6 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { ConditionEditor } from ".";
|
||||
import { AutomationCondition } from 'types/automations/conditions';
|
||||
import { Page } from "components/Page";
|
||||
|
||||
export default {
|
||||
title: 'ConditionEditor',
|
||||
@@ -40,12 +41,12 @@ export const Basic: ComponentStory<typeof ConditionEditor> = args => {
|
||||
]
|
||||
})
|
||||
return (
|
||||
<div className="page">
|
||||
<Page>
|
||||
<ConditionEditor
|
||||
onUpdate={setState}
|
||||
onDelete={() => { }}
|
||||
condition={state}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
)
|
||||
}
|
||||
@@ -117,7 +117,9 @@ export const ConditionNode: FC<{
|
||||
value={condition}
|
||||
onChange={update => onUpdate(update as any)}
|
||||
/>}
|
||||
{!yamlMode && childrenConditions}
|
||||
<div className={classes.conditionWrap}>
|
||||
{!yamlMode && childrenConditions}
|
||||
</div>
|
||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
||||
</div>}
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
import { FC } from "react";
|
||||
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
|
||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
||||
import InputNumber from "components/Inputs/InputNumber";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import InputTextArea from "components/Inputs/InputTextArea";
|
||||
import { InputEntity } from "components/Inputs/InputTextBubble";
|
||||
import { ConditionNode } from "./ConditionNode";
|
||||
import { genUpdateMethods } from "./nestedUpdater";
|
||||
import InputTime from "components/Inputs/InputTime";
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
|
||||
|
||||
interface Editor<C extends AutomationCondition> extends FC<{
|
||||
@@ -45,16 +44,12 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
<InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({
|
||||
return <>
|
||||
<InputYaml label="Template" value={condition.value_template} onChange={value_template => onChange({
|
||||
...condition,
|
||||
value_template
|
||||
})} resizable />
|
||||
</div>
|
||||
})} />
|
||||
</>
|
||||
}
|
||||
|
||||
|
||||
@@ -62,11 +57,7 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputEntity
|
||||
value={condition.entity_id}
|
||||
onChange={entity_id => onChange({
|
||||
@@ -94,11 +85,11 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
||||
below: below ? String(below) : undefined,
|
||||
})}
|
||||
/>
|
||||
<InputTextArea label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
|
||||
<InputYaml label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
|
||||
...condition,
|
||||
value_template
|
||||
})} resizable />
|
||||
</div>
|
||||
})} />
|
||||
</>
|
||||
}
|
||||
|
||||
|
||||
@@ -126,11 +117,7 @@ export const StateEditor: Editor<StateCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputEntity
|
||||
value={condition.entity_id}
|
||||
onChange={entity_id => onChange({
|
||||
@@ -158,18 +145,14 @@ export const StateEditor: Editor<StateCondition> = ({
|
||||
for: _for,
|
||||
})}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
|
||||
export const TimeEditor: Editor<TimeCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputTime
|
||||
label="After"
|
||||
value={condition.after}
|
||||
@@ -187,34 +170,26 @@ export const TimeEditor: Editor<TimeCondition> = ({
|
||||
})}
|
||||
/>
|
||||
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
|
||||
export const TriggerEditor: Editor<TriggerCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
|
||||
...condition,
|
||||
id
|
||||
})} />
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
|
||||
export const ZoneEditor: Editor<ZoneCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
|
||||
...condition,
|
||||
zone
|
||||
@@ -234,5 +209,5 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
|
||||
state,
|
||||
})}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
|
||||
@@ -14,14 +15,14 @@ export default {
|
||||
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
|
||||
|
||||
const [data, setData] = useState(condition);
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ConditionEditor {...args}
|
||||
condition={data}
|
||||
onUpdate={data => {
|
||||
setData(data)
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const TemplateViewer = Template.bind({})
|
||||
|
||||
@@ -42,8 +42,8 @@ export const useStyles = createAppUseStyles<{
|
||||
borderTopRightRadius: 0,
|
||||
borderBottomRightRadius: 0,
|
||||
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
||||
padding: 10,
|
||||
minWidth: 30,
|
||||
minWidth: '10em',
|
||||
maxWidth: '30em',
|
||||
textOverflow: 'ellipsis',
|
||||
textAlign: 'center',
|
||||
cursor: 'pointer',
|
||||
@@ -86,6 +86,9 @@ export const useStyles = createAppUseStyles<{
|
||||
}),
|
||||
icon: {},
|
||||
deleteBtn,
|
||||
conditionWrap: {
|
||||
overflow: 'auto',
|
||||
},
|
||||
children: ({ hasChildren }) => ({
|
||||
flex: 1,
|
||||
paddingLeft: hasChildren ? 50 : 10,
|
||||
@@ -96,7 +99,8 @@ export const useStyles = createAppUseStyles<{
|
||||
border: `1px solid ${theme.secondaryAccent}`,
|
||||
borderBottomRightRadius: hasChildren ? 10 : 0,
|
||||
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
||||
minHeight: hasChildren ? undefined : '100%'
|
||||
minHeight: hasChildren ? undefined : '100%',
|
||||
overflow: 'scroll'
|
||||
}),
|
||||
addBtnContainer: {
|
||||
display: 'flex',
|
||||
|
||||
@@ -7,6 +7,7 @@ import * as dgconst from "components/DAGFlow/constants";
|
||||
import ReactFlow, { Controls } from 'react-flow-renderer';
|
||||
import { DAGErrorNode } from "./DAGErrorNode";
|
||||
import { convertToFlowNode } from "./helpers";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -29,7 +30,7 @@ export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
|
||||
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
|
||||
}
|
||||
}));
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ReactFlow
|
||||
defaultNodes={nodes}
|
||||
nodeTypes={{
|
||||
@@ -42,5 +43,5 @@ export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
|
||||
>
|
||||
<Controls />
|
||||
</ReactFlow>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import * as dgconst from "components/DAGFlow/constants";
|
||||
import ReactFlow, { Controls } from 'react-flow-renderer';
|
||||
import { DAGNode } from "./DAGNode";
|
||||
import { convertToFlowNode } from "./helpers";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -30,7 +31,7 @@ export const Colors: ComponentStory<typeof DAGNode> = args => {
|
||||
"type": "mynode",
|
||||
"position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i }
|
||||
}));
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ReactFlow
|
||||
defaultNodes={nodes}
|
||||
nodeTypes={{
|
||||
@@ -43,5 +44,5 @@ export const Colors: ComponentStory<typeof DAGNode> = args => {
|
||||
>
|
||||
<Controls />
|
||||
</ReactFlow>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { DAGAutomationFlow } from '.';
|
||||
import { useState } from 'react';
|
||||
import * as dgconst from "components/DAGFlow/constants";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -22,7 +23,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
|
||||
sequence: args.sequence,
|
||||
condition: args.condition,
|
||||
})
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<DAGAutomationFlow
|
||||
{...args}
|
||||
{...state}
|
||||
@@ -32,7 +33,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
|
||||
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
||||
onConditionUpdate={condition => setState({ ...state, condition })}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const Simple = Template.bind({})
|
||||
|
||||
@@ -40,8 +40,8 @@ test("sequence updater updates nodes", () => {
|
||||
mock.updater.updateNode(0, {
|
||||
...mock.state[0],
|
||||
alias: "Hello"
|
||||
})
|
||||
expect(mock.state[0].alias).toBe("Hello")
|
||||
} as any)
|
||||
expect((mock.state[0] as any).alias).toBe("Hello")
|
||||
})
|
||||
test('update conditions for node', () => {
|
||||
const mock = mockSequenceUpdater([
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import React, { FC } from "react";
|
||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { ErrorBoundary } from ".";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -15,20 +16,20 @@ export const ErrorThrown: ComponentStory<typeof ErrorBoundary> = args => {
|
||||
const BadComponent: FC = () => {
|
||||
throw new Error("!!!")
|
||||
}
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ErrorBoundary>
|
||||
<BadComponent />
|
||||
</ErrorBoundary>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const NoError: ComponentStory<typeof ErrorBoundary> = args => {
|
||||
const GoodComponent: FC = () => {
|
||||
return <span>All Good.</span>
|
||||
}
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ErrorBoundary>
|
||||
<GoodComponent />
|
||||
</ErrorBoundary>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
@@ -39,6 +39,8 @@ export class ErrorBoundary extends Component<{}, State> {
|
||||
</div>
|
||||
}
|
||||
|
||||
return this.props.children;
|
||||
return <>
|
||||
{this.props.children}
|
||||
</>;
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ import { ComponentStory } from "@storybook/react";
|
||||
import { IconBase } from "./base";
|
||||
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from ".";
|
||||
import { ButtonIcon } from "./ButtonIcons";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
export default {
|
||||
title: 'Icons',
|
||||
@@ -12,7 +13,7 @@ export default {
|
||||
|
||||
export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
||||
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<PencilIcon {...args} />
|
||||
<CheckMarkIcon {...args} />
|
||||
<AddIcon {...args} />
|
||||
@@ -20,7 +21,7 @@ export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
||||
<InfoIcon {...args} />
|
||||
<ZoomIcon {...args} />
|
||||
<GearIcon {...args} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
IconList.args = {
|
||||
size: 2,
|
||||
@@ -30,9 +31,9 @@ IconList.args = {
|
||||
|
||||
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
|
||||
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
ButtonIconExample.args = {
|
||||
size: 2,
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
import TextField from "@mui/material/TextField";
|
||||
import Autocomplete from "@mui/material/Autocomplete";
|
||||
|
||||
export interface InputAutoTextProps {
|
||||
label: string;
|
||||
value: string;
|
||||
options?: string[];
|
||||
error?: string;
|
||||
onChange: (v: string) => void;
|
||||
}
|
||||
export default function InputAutoText({
|
||||
value = "",
|
||||
label,
|
||||
options = [],
|
||||
onChange,
|
||||
error,
|
||||
}: InputAutoTextProps) {
|
||||
|
||||
return <Autocomplete
|
||||
freeSolo
|
||||
value={value}
|
||||
options={options}
|
||||
onChange={(_e, v) => onChange(
|
||||
v === null ? "" : v
|
||||
)}
|
||||
renderInput={params => <TextField
|
||||
{...params}
|
||||
variant="filled"
|
||||
label={label}
|
||||
error={error !== undefined}
|
||||
helperText={error}
|
||||
onChange={e => {
|
||||
e.preventDefault();
|
||||
onChange(
|
||||
e.target.value
|
||||
)
|
||||
}}
|
||||
/>}
|
||||
/>
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
.input-boolean {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
max-width: fit-content;
|
||||
border: 1px solid var(--secondary-accent);
|
||||
border-radius: 5px;
|
||||
padding: 0.5em;
|
||||
background-color: var(--secondary);
|
||||
}
|
||||
|
||||
.input-boolean.disabled:hover, .input-boolean.disabled:hover * {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.input-boolean:hover, .input-boolean:hover * {
|
||||
cursor: pointer;
|
||||
background-color: var(--secondary-opaque);
|
||||
}
|
||||
|
||||
.input-boolean * {
|
||||
user-select: none;
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
|
||||
import InputBoolean from "./InputBoolean";
|
||||
@@ -12,12 +13,12 @@ export default {
|
||||
|
||||
const Template: ComponentStory<typeof InputBoolean> = args => {
|
||||
const [state, onChange] = useState(args.value)
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputBoolean {...args} value={state} onChange={v => {
|
||||
args.onChange(v)
|
||||
onChange(v)
|
||||
}} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const SimpleText = Template.bind({})
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
import "./InputBoolean.css";
|
||||
import Checkbox from "@mui/material/Checkbox";
|
||||
import FormGroup from '@mui/material/FormGroup';
|
||||
import FormControlLabel from '@mui/material/FormControlLabel';
|
||||
|
||||
export interface Props {
|
||||
label: string;
|
||||
@@ -12,8 +14,7 @@ export default function InputBoolean({
|
||||
onChange,
|
||||
disabled = false,
|
||||
}: Props) {
|
||||
return <div className={["input-boolean", disabled ? 'disabled' : ''].join(' ')} onClick={() => onChange(!value)}>
|
||||
<input type="checkbox" checked={value} onChange={() => { }} disabled={disabled} />
|
||||
<label>{label}</label>
|
||||
</div>
|
||||
return <FormGroup>
|
||||
<FormControlLabel disabled={disabled} control={<Checkbox checked={value} onChange={() => onChange(!value)} />} label={label} />
|
||||
</FormGroup>
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState, useEffect } from 'react';
|
||||
|
||||
import { InputList } from "./InputList";
|
||||
@@ -18,9 +19,9 @@ const Template: ComponentStory<typeof InputList> = args => {
|
||||
setValue(args.current)
|
||||
}
|
||||
}, [args.current])
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputList {...args} current={value} onChange={setValue} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const SimpleText = Template.bind({})
|
||||
|
||||
@@ -1,44 +1,74 @@
|
||||
import { FC } from "react";
|
||||
import InputWrapper from "./InputWrapper";
|
||||
import { useInputListStyles } from "./styles";
|
||||
|
||||
import FormHelperText from '@mui/material/FormHelperText';
|
||||
import InputLabel from '@mui/material/InputLabel';
|
||||
import MenuItem from '@mui/material/MenuItem';
|
||||
import FormControl from '@mui/material/FormControl';
|
||||
import Select from '@mui/material/Select';
|
||||
|
||||
export interface Props<T extends string> {
|
||||
current: T;
|
||||
options: readonly T[];
|
||||
onChange: (n: T) => void;
|
||||
label: string;
|
||||
id?: string;
|
||||
className?: string;
|
||||
label: string;
|
||||
}
|
||||
export const InputList: FC<Props<any>> = ({
|
||||
current, options, onChange, label,
|
||||
...selattr
|
||||
current,
|
||||
options,
|
||||
onChange,
|
||||
label,
|
||||
id,
|
||||
className,
|
||||
}) => {
|
||||
const invalidCurrent = !options.includes(current);
|
||||
const { classes } = useInputListStyles({
|
||||
invalidCurrent
|
||||
});
|
||||
return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}>
|
||||
<select
|
||||
title={invalidCurrent ? "Invalid Selection" : ""}
|
||||
className={classes.input}
|
||||
{...selattr} value={current}
|
||||
onChange={e => {
|
||||
e.preventDefault();
|
||||
if (e.currentTarget.id === 'invalid') {
|
||||
onChange(options[0])
|
||||
} else {
|
||||
onChange(e.currentTarget.value as any);
|
||||
}
|
||||
const invalidCurrent = current && !options.includes(current);
|
||||
return <FormControl variant="filled" sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}>
|
||||
<InputLabel id="demo-simple-select-filled-label">{label}</InputLabel>
|
||||
<Select
|
||||
className={className}
|
||||
autoWidth
|
||||
id={id}
|
||||
value={current}
|
||||
onChange={(e) => {
|
||||
onChange(e.target.value)
|
||||
}}
|
||||
label={label}
|
||||
variant="filled"
|
||||
placeholder={label}
|
||||
error={invalidCurrent}
|
||||
|
||||
>
|
||||
{options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
|
||||
{invalidCurrent ? <option
|
||||
id={'invalid'}
|
||||
value={current}
|
||||
style={{ display: 'none' }}
|
||||
>!{current}!</option> : <></>}
|
||||
</select>
|
||||
</InputWrapper>
|
||||
{options.map((t, i) => (
|
||||
<MenuItem
|
||||
key={i}
|
||||
value={t}
|
||||
>
|
||||
{t}
|
||||
</MenuItem>
|
||||
))}
|
||||
</Select>
|
||||
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText>
|
||||
</FormControl>
|
||||
// return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}>
|
||||
// <select
|
||||
// title={invalidCurrent ? "Invalid Selection" : ""}
|
||||
// className={classes.input}
|
||||
// {...selattr} value={current}
|
||||
// onChange={e => {
|
||||
// e.preventDefault();
|
||||
// if (e.currentTarget.id === 'invalid') {
|
||||
// onChange(options[0])
|
||||
// } else {
|
||||
// onChange(e.currentTarget.value as any);
|
||||
// }
|
||||
// }}
|
||||
// >
|
||||
// {options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
|
||||
// {invalidCurrent ? <option
|
||||
// id={'invalid'}
|
||||
// value={current}
|
||||
// style={{ display: 'none' }}
|
||||
// >!{current}!</option> : <></>}
|
||||
// </select>
|
||||
// </InputWrapper>
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
import InputMultiSelect from "./InputMultiSelect";
|
||||
@@ -18,12 +19,12 @@ const Template: ComponentStory<typeof InputMultiSelect> = args => {
|
||||
setValue(args.selected);
|
||||
}, [args.selected])
|
||||
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputMultiSelect {...args} onChange={a => {
|
||||
setValue(a);
|
||||
args.onChange(a);
|
||||
}} options={args.options} selected={value} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const Simple = Template.bind({})
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
|
||||
import InputNumber from "./InputNumber";
|
||||
@@ -18,14 +19,14 @@ export default {
|
||||
export const NullStart: ComponentStory<typeof InputNumber> = args => {
|
||||
|
||||
const [value, setValue] = useState<number | undefined>(undefined)
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputNumber {...args} value={value} onChange={setValue} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
export const SomeStuffAtStart: ComponentStory<typeof InputNumber> = args => {
|
||||
|
||||
const [value, setValue] = useState<number | undefined>(10)
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputNumber {...args} value={value} onChange={setValue} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
// import { useState } from "react";
|
||||
import InputWrapper from "./InputWrapper";
|
||||
import { useInputNumberStyles } from "./styles";
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
|
||||
import InputText from "./InputText";
|
||||
@@ -13,9 +14,9 @@ export default {
|
||||
const Template: ComponentStory<typeof InputText> = args => {
|
||||
|
||||
const [value, setValue] = useState('')
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputText {...args} value={value} onChange={setValue} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const SimpleText = Template.bind({})
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { PropsWithChildren, useState } from "react";
|
||||
import { useToolTip } from "tooltip/context";
|
||||
import TextField from '@mui/material/TextField';
|
||||
import InputWrapper from "./InputWrapper";
|
||||
import { useInputTextStyles } from "./styles";
|
||||
|
||||
export interface Props {
|
||||
textBoxFor?: string;
|
||||
@@ -10,6 +10,8 @@ export interface Props {
|
||||
onChange: (v: string) => void;
|
||||
onEnter?: () => void;
|
||||
additionalTooltipFilters?: Record<string, string>;
|
||||
multiline?: boolean;
|
||||
maxRows?: number;
|
||||
}
|
||||
export default function InputText({
|
||||
label,
|
||||
@@ -18,15 +20,14 @@ export default function InputText({
|
||||
onChange,
|
||||
onEnter = () => { },
|
||||
additionalTooltipFilters = {},
|
||||
multiline = false,
|
||||
maxRows = 4,
|
||||
children,
|
||||
}: PropsWithChildren<Props>) {
|
||||
const { classes } = useInputTextStyles({});
|
||||
const tooltip = useToolTip();
|
||||
const [isFocused, setIsFocused] = useState(false)
|
||||
return <InputWrapper label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
|
||||
<input
|
||||
className={classes.input}
|
||||
value={value}
|
||||
return <InputWrapper label="">
|
||||
<TextField multiline={multiline} maxRows={maxRows} fullWidth inputMode="text" variant="filled" focused={isFocused} label={label} value={value}
|
||||
onKeyDown={e => {
|
||||
if (e.key === 'Enter') {
|
||||
onEnter();
|
||||
@@ -36,7 +37,7 @@ export default function InputText({
|
||||
e.preventDefault();
|
||||
onChange(e.target.value)
|
||||
}}
|
||||
onBlur={e => {
|
||||
onBlur={() => {
|
||||
setIsFocused(false)
|
||||
}}
|
||||
onFocus={e => {
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
|
||||
import InputTextArea from "./InputTextArea";
|
||||
|
||||
export default {
|
||||
title: 'Inputs/InputTextArea',
|
||||
component: InputTextArea,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
} as ComponentMeta<typeof InputTextArea>;
|
||||
|
||||
|
||||
const Template: ComponentStory<typeof InputTextArea> = args => {
|
||||
|
||||
const [value, setValue] = useState('')
|
||||
return <div className="page">
|
||||
<InputTextArea {...args} value={value} onChange={setValue} />
|
||||
</div>
|
||||
}
|
||||
|
||||
export const SimpleText = Template.bind({})
|
||||
SimpleText.args = {
|
||||
label: "Entity ID",
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
import { useState } from "react";
|
||||
import { useToolTip } from "tooltip/context";
|
||||
import InputWrapper from "./InputWrapper";
|
||||
import { useInputTextAreaStyles } from "./styles";
|
||||
|
||||
export interface Props {
|
||||
textBoxFor?: string;
|
||||
label: string;
|
||||
value: string;
|
||||
onChange: (v: string) => void;
|
||||
additionalTooltipFilters?: Record<string, string>;
|
||||
error?: string;
|
||||
resizable?: boolean;
|
||||
}
|
||||
export default function InputTextArea({
|
||||
label,
|
||||
textBoxFor,
|
||||
value = "",
|
||||
onChange,
|
||||
error,
|
||||
additionalTooltipFilters = {},
|
||||
resizable = false,
|
||||
}: Props) {
|
||||
const { classes } = useInputTextAreaStyles({ resizable });
|
||||
const tooltip = useToolTip();
|
||||
const [isFocused, setIsFocused] = useState(false)
|
||||
return <InputWrapper error={error} label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
|
||||
<textarea
|
||||
className={classes.input}
|
||||
value={value}
|
||||
onChange={e => {
|
||||
e.preventDefault();
|
||||
onChange(e.target.value)
|
||||
}}
|
||||
onBlur={e => {
|
||||
setIsFocused(false)
|
||||
}}
|
||||
onFocus={e => {
|
||||
setIsFocused(true)
|
||||
if (textBoxFor) {
|
||||
tooltip.setFocus(
|
||||
e.target.getBoundingClientRect(),
|
||||
{
|
||||
searchObject: textBoxFor,
|
||||
searchText: value,
|
||||
filterObjects: additionalTooltipFilters,
|
||||
},
|
||||
onChange
|
||||
)
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</InputWrapper>
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
|
||||
import InputTextBubble, { InputEntity } from "./InputTextBubble";
|
||||
@@ -18,26 +19,50 @@ export default {
|
||||
export const ArrayText: ComponentStory<typeof InputTextBubble> = args => {
|
||||
|
||||
const [value, setValue] = useState<string | string[]>(['wow', 'lots of bubbles', 'itchen', 'bathroom'])
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<div style={{ maxWidth: '200px', overflow: 'hidden' }}>
|
||||
<InputTextBubble {...args} value={value} onChange={setValue} />
|
||||
</div>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const JustText: ComponentStory<typeof InputTextBubble> = args => {
|
||||
|
||||
const [value, setValue] = useState<string | string[]>('hello')
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputTextBubble {...args} value={value} onChange={setValue} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
|
||||
export const EntityId: ComponentStory<typeof InputTextBubble> = args => {
|
||||
|
||||
const [value, setValue] = useState<string | string[]>(['sensor.bathroom'])
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputEntity value={value} onChange={setValue} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
|
||||
export const ManyOptions: ComponentStory<typeof InputTextBubble> = args => {
|
||||
|
||||
const [value, setValue] = useState<string | string[]>('hello')
|
||||
return <Page>
|
||||
<InputTextBubble {...args} value={value} onChange={setValue} />
|
||||
</Page>
|
||||
}
|
||||
|
||||
ManyOptions.args = {
|
||||
...ManyOptions.args,
|
||||
options: [
|
||||
'sensor.humidity_bathroom',
|
||||
'sensor.humidity_bedroom',
|
||||
'sensor.humidity_laundry',
|
||||
'sensor.temp_bathroom',
|
||||
'sensor.temp_bedroom',
|
||||
'switch.living_room',
|
||||
'switch.bathroom',
|
||||
'light.bedroom_main',
|
||||
'light.bedroom_second',
|
||||
]
|
||||
}
|
||||
@@ -1,55 +1,46 @@
|
||||
import { FC, useState } from "react";
|
||||
import InputText from "./InputText";
|
||||
import { useInputBubblesStyles } from "./styles";
|
||||
import Chip from "@mui/material/Chip";
|
||||
import TextField from "@mui/material/TextField";
|
||||
import Autocomplete from "@mui/material/Autocomplete";
|
||||
import { FC } from "react";
|
||||
|
||||
export interface Props {
|
||||
label: string;
|
||||
textBoxFor?: string;
|
||||
value: string | string[];
|
||||
options?: string[];
|
||||
onChange: (v: string[]) => void;
|
||||
additionalTooltipFilters?: Record<string, string>;
|
||||
}
|
||||
export default function InputTextBubble({
|
||||
value = "",
|
||||
label,
|
||||
textBoxFor,
|
||||
options = [],
|
||||
onChange,
|
||||
additionalTooltipFilters = {},
|
||||
}: Props) {
|
||||
const { classes } = useInputBubblesStyles({});
|
||||
let selected: string[];
|
||||
if (typeof value === 'string') {
|
||||
selected = [value]
|
||||
} else {
|
||||
selected = value
|
||||
}
|
||||
const [text, setText] = useState('');
|
||||
const addNew = () => {
|
||||
if (text) {
|
||||
onChange([text].concat(selected))
|
||||
setText("")
|
||||
}
|
||||
};
|
||||
|
||||
return <InputText
|
||||
label={label}
|
||||
value={text}
|
||||
textBoxFor={textBoxFor}
|
||||
onChange={t => setText(t)}
|
||||
onEnter={() => addNew()}
|
||||
additionalTooltipFilters={additionalTooltipFilters}
|
||||
>
|
||||
<div className={classes.bubbles}>
|
||||
{selected.map((s, i) => <div className={classes.bubble} onClick={() => onChange([
|
||||
...selected.slice(0, i),
|
||||
...selected.slice(i + 1),
|
||||
])}>
|
||||
{s}
|
||||
<span className={classes.deleteIcon}>X</span>
|
||||
</div>)}
|
||||
</div>
|
||||
<button className={classes.addBtn} onClick={() => addNew()}>+</button>
|
||||
</InputText>
|
||||
const selected = Array.isArray(value) ? value : [value];
|
||||
|
||||
return <Autocomplete
|
||||
multiple
|
||||
freeSolo
|
||||
value={selected}
|
||||
options={options}
|
||||
onChange={(_e, v) => onChange(
|
||||
v === null ? [] :
|
||||
Array.isArray(v) ? v : [v]
|
||||
)}
|
||||
renderInput={params => <TextField
|
||||
{...params}
|
||||
variant="filled"
|
||||
label={label}
|
||||
/>}
|
||||
renderTags={(tagValue, getTagProps) =>
|
||||
tagValue.map((option, index) => (
|
||||
<Chip
|
||||
label={option}
|
||||
{...getTagProps({ index })}
|
||||
/>
|
||||
))
|
||||
}
|
||||
/>
|
||||
}
|
||||
|
||||
export const InputEntity: FC<{
|
||||
@@ -62,5 +53,4 @@ export const InputEntity: FC<{
|
||||
value={value}
|
||||
onChange={onChange}
|
||||
label="Entity ID"
|
||||
textBoxFor="entity_id"
|
||||
/>
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
import { AutomationTime } from "types/automations/common";
|
||||
|
||||
@@ -14,9 +15,9 @@ export default {
|
||||
const Template: ComponentStory<typeof InputTime> = args => {
|
||||
|
||||
const [value, setValue] = useState<AutomationTime | undefined>(undefined);
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputTime {...args} value={value} onChange={setValue} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const SimpleText = Template.bind({})
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
|
||||
import InputYaml from "./InputYaml";
|
||||
@@ -15,9 +16,9 @@ const Template: ComponentStory<typeof InputYaml> = args => {
|
||||
const [value, setValue] = useState({
|
||||
"test": "data"
|
||||
})
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<InputYaml {...args} value={value} onChange={setValue} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const SimpleText = Template.bind({})
|
||||
|
||||
@@ -1,5 +1,22 @@
|
||||
.multinode-editor {
|
||||
max-width: 80vw;
|
||||
min-width: 60vw;
|
||||
}
|
||||
|
||||
.multinode-editor.mobile {
|
||||
max-width: 95vw;
|
||||
}
|
||||
|
||||
.multinode-editor .node-editor--root {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.multinode-editor .node-editor--body {
|
||||
padding-bottom: 1em;
|
||||
padding-top: 0.25em;
|
||||
padding-left: 0.25em;
|
||||
padding-right: 0.25em;
|
||||
max-height: 60vh;
|
||||
}
|
||||
|
||||
.multinode-editor--navbar {
|
||||
|
||||
@@ -3,6 +3,7 @@ import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { MultiNodeEditor } from ".";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { Modal } from "components/Modal";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -31,20 +32,20 @@ export default {
|
||||
export const Simple: ComponentStory<typeof MultiNodeEditor> = args => {
|
||||
const [state, setState] = useState(args.sequence);
|
||||
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<div className="center column" style={{ paddingTop: "1em" }}>
|
||||
<MultiNodeEditor {...args} sequence={state} onSave={s => {
|
||||
args.onSave && args.onSave(s)
|
||||
setState(s)
|
||||
}} />
|
||||
</div>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
|
||||
|
||||
const [open, setOpen] = useState(false);
|
||||
const [state, setState] = useState(props.sequence);
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<Button onClick={() => setOpen(!open)}>Open Editor</Button>
|
||||
<Modal open={open}>
|
||||
<MultiNodeEditor
|
||||
@@ -57,7 +58,7 @@ export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
|
||||
}}
|
||||
/>
|
||||
</Modal>
|
||||
</div>
|
||||
</Page>
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -4,11 +4,13 @@ import { NodeEditor } from 'components/NodeEditor';
|
||||
import { Button } from 'components/Inputs/Button';
|
||||
import { useMultiNodeEditorState } from "./state";
|
||||
import { MultiNodeEditorProps } from "./types";
|
||||
import useWindowSize from 'utils/useWindowSize';
|
||||
|
||||
|
||||
export const MultiNodeEditor: FC<MultiNodeEditorProps> = props => {
|
||||
// state
|
||||
const state = useMultiNodeEditorState(props)
|
||||
const state = useMultiNodeEditorState(props);
|
||||
const { isMobile } = useWindowSize();
|
||||
// components
|
||||
const nextOrAddBtn = <Button
|
||||
onClick={state.moveForward}
|
||||
@@ -33,7 +35,7 @@ export const MultiNodeEditor: FC<MultiNodeEditorProps> = props => {
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
return <div className={["multinode-editor", state.isModified ? "modded" : ''].join(' ')}>
|
||||
return <div className={["multinode-editor", state.isModified ? "modded" : '', isMobile ? 'mobile' : ''].join(' ')}>
|
||||
<div className="multinode-editor--navbar">
|
||||
<Button onClick={state.moveBack} disabled={state.currentSlideNumber === 0}>{"<<"}</Button>
|
||||
<Button onClick={state.onRemove}> Delete</Button>
|
||||
|
||||
@@ -7,18 +7,16 @@ import { OptionManager, updateActionData } from './OptionManager';
|
||||
export const ActionCallServiceState: OptionManager<ServiceAction> = {
|
||||
defaultState: () => ({
|
||||
service: "",
|
||||
target: "",
|
||||
target: {},
|
||||
data: {},
|
||||
}),
|
||||
isReady: ({
|
||||
service, alias, target
|
||||
service,
|
||||
}) => (
|
||||
service !== '' &&
|
||||
alias !== '' &&
|
||||
target !== ''
|
||||
service !== ''
|
||||
),
|
||||
renderOptionList: (state, setState) => {
|
||||
const { service, target } = state;
|
||||
const { service, target, data } = state;
|
||||
const update = updateActionData(state, setState);
|
||||
return <>
|
||||
<InputText
|
||||
@@ -32,6 +30,11 @@ export const ActionCallServiceState: OptionManager<ServiceAction> = {
|
||||
value={target}
|
||||
onChange={target => update({ target })}
|
||||
/>
|
||||
<InputYaml
|
||||
label="Data"
|
||||
value={data}
|
||||
onChange={data => update({ data })}
|
||||
/>
|
||||
</>
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
import { OptionManager } from './OptionManager';
|
||||
import { AutomationTriggerDevice } from 'types/automations/triggers';
|
||||
import InputText from 'components/Inputs/InputText';
|
||||
import { InputEntity } from 'components/Inputs/InputTextBubble';
|
||||
|
||||
|
||||
export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": 'device',
|
||||
"domain": "",
|
||||
"type": "",
|
||||
@@ -13,8 +13,8 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
||||
"device_id": "",
|
||||
"entity_id": "",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
@@ -34,7 +34,7 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
||||
...state,
|
||||
device_id
|
||||
})} />
|
||||
<InputText label="Entity" value={state.entity_id ?? ""} onChange={entity_id => setState({
|
||||
<InputEntity value={state.entity_id ?? ""} onChange={entity_id => setState({
|
||||
...state,
|
||||
entity_id
|
||||
})} />
|
||||
|
||||
@@ -6,14 +6,13 @@ import InputYaml from "components/Inputs/InputYaml";
|
||||
|
||||
export const TriggerEventState: OptionManager<AutomationTriggerEvent> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": "event",
|
||||
"event_type": "",
|
||||
"event_data": {},
|
||||
"context": {},
|
||||
}),
|
||||
isReady: ({ alias, event_type }) => {
|
||||
return (alias !== '') && (event_type !== "")
|
||||
isReady: ({ event_type }) => {
|
||||
return (event_type !== "")
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
|
||||
@@ -5,12 +5,11 @@ import { InputList } from "components/Inputs/InputList";
|
||||
|
||||
export const TriggerHAState: OptionManager<AutomationTriggerHA> = {
|
||||
defaultState: () => ({
|
||||
"alias": "HA Starts",
|
||||
"platform": "homeassistant",
|
||||
"event": "start",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
@@ -20,7 +19,6 @@ export const TriggerHAState: OptionManager<AutomationTriggerHA> = {
|
||||
options={['start', 'shutdown']}
|
||||
onChange={event => setState({
|
||||
...state, event,
|
||||
alias: event === 'shutdown' ? "HA Shutdown" : "HA Starts"
|
||||
})}
|
||||
/>
|
||||
</>
|
||||
|
||||
@@ -5,14 +5,13 @@ import InputText from 'components/Inputs/InputText';
|
||||
|
||||
export const TriggerMQTTState: OptionManager<AutomationTriggerMQTT> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": "mqtt",
|
||||
"payload": "",
|
||||
"topic": "",
|
||||
"value_template": ""
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
|
||||
@@ -3,18 +3,17 @@ import { AutomationTriggerNumericState } from 'types/automations/triggers';
|
||||
import InputText from 'components/Inputs/InputText';
|
||||
import { InputEntity } from 'components/Inputs/InputTextBubble';
|
||||
import InputNumber from 'components/Inputs/InputNumber';
|
||||
import InputTextArea from 'components/Inputs/InputTextArea';
|
||||
import InputTime from 'components/Inputs/InputTime';
|
||||
import InputYaml from 'components/Inputs/InputYaml';
|
||||
|
||||
|
||||
export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": 'numeric_state',
|
||||
"entity_id": "",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
@@ -45,10 +44,14 @@ export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> =
|
||||
below: below ? String(below) : undefined,
|
||||
})}
|
||||
/>
|
||||
<InputTextArea label="Template" value={state.value_template ?? ""} onChange={value_template => setState({
|
||||
...state,
|
||||
value_template
|
||||
})} resizable />
|
||||
<InputYaml
|
||||
label="Template"
|
||||
value={state.value_template ?? ""}
|
||||
onChange={value_template => setState({
|
||||
...state,
|
||||
value_template
|
||||
})}
|
||||
/>
|
||||
<InputTime
|
||||
label="For"
|
||||
value={state.for}
|
||||
|
||||
@@ -7,12 +7,11 @@ import InputTime from 'components/Inputs/InputTime';
|
||||
|
||||
export const TriggerState: OptionManager<AutomationTriggerState> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": 'state',
|
||||
"entity_id": "",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
|
||||
@@ -6,12 +6,11 @@ import InputTime from 'components/Inputs/InputTime';
|
||||
|
||||
export const TriggerTemplate: OptionManager<AutomationTriggerTemplate> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": 'template',
|
||||
"value_template": "",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
|
||||
@@ -6,12 +6,11 @@ import { convertObjectToAutomationTimeString } from 'utils/time';
|
||||
|
||||
export const TriggerTime: OptionManager<AutomationTriggerTime> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": 'time',
|
||||
"at": "",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
|
||||
@@ -5,11 +5,10 @@ import InputText from 'components/Inputs/InputText';
|
||||
|
||||
export const TriggerTimePattern: OptionManager<AutomationTriggerTimePattern> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": 'time_pattern',
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
|
||||
@@ -5,12 +5,11 @@ import InputText from 'components/Inputs/InputText';
|
||||
|
||||
export const TriggerWebhook: OptionManager<AutomationTriggerWebhook> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": 'webhook',
|
||||
"webhook_id": "",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
|
||||
@@ -7,14 +7,13 @@ import { InputEntity } from 'components/Inputs/InputTextBubble';
|
||||
|
||||
export const TriggerZone: OptionManager<AutomationTriggerZone> = {
|
||||
defaultState: () => ({
|
||||
"alias": "",
|
||||
"platform": 'zone',
|
||||
"zone": "",
|
||||
"event": "enter",
|
||||
"entity_id": "",
|
||||
}),
|
||||
isReady: ({ alias }) => {
|
||||
return (alias !== '')
|
||||
isReady: ({ }) => {
|
||||
return true
|
||||
},
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
|
||||
@@ -59,10 +59,27 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
|
||||
return currentNode
|
||||
},
|
||||
renderOptionList() {
|
||||
const aliasEditor = <InputText label="Alias" value={getDescriptionFromAutomationNode(allState.node)} onChange={alias => setState({
|
||||
...allState.node,
|
||||
alias
|
||||
})} />
|
||||
let aliasEditor = <></>
|
||||
if (nodeType === 'trigger') {
|
||||
aliasEditor = <InputText
|
||||
label="Trigger ID"
|
||||
value={(allState.node as any).id}
|
||||
onChange={id => setState({
|
||||
...allState.node,
|
||||
id
|
||||
} as any)}
|
||||
/>
|
||||
}
|
||||
if (nodeType === 'action') {
|
||||
aliasEditor = <InputText
|
||||
label="Alias"
|
||||
value={getDescriptionFromAutomationNode(allState.node)}
|
||||
onChange={alias => setState({
|
||||
...allState.node,
|
||||
alias
|
||||
} as any)}
|
||||
/>
|
||||
}
|
||||
if (yamlMode || allState.isErrored) {
|
||||
return <>
|
||||
{aliasEditor}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
height: 100%;
|
||||
padding: 1em;
|
||||
padding: 0.5em;
|
||||
margin-top: 0.5em;
|
||||
}
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
|
||||
min-width: 100%;
|
||||
min-height: fit-content;
|
||||
max-width: 100%;
|
||||
}
|
||||
|
||||
.node-editor--footer {
|
||||
|
||||
@@ -6,6 +6,7 @@ import { AutomationCondition } from "types/automations/conditions";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { useState } from 'react';
|
||||
import { Modal } from "components/Modal";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -23,9 +24,9 @@ export default {
|
||||
|
||||
const Base: ComponentStory<typeof NodeEditor> = props => {
|
||||
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<NodeEditor {...props} />
|
||||
</div>
|
||||
</Page>
|
||||
};
|
||||
export const Action = Base.bind({})
|
||||
export const SingleOption = Action.bind({})
|
||||
@@ -55,14 +56,23 @@ Condition.args = {
|
||||
} as AutomationCondition,
|
||||
}
|
||||
|
||||
export const UnSupported = Action.bind({})
|
||||
UnSupported.args = {
|
||||
...UnSupported.args,
|
||||
node: {
|
||||
"condition": "bargs",
|
||||
"platform": "rouge"
|
||||
} as any,
|
||||
}
|
||||
|
||||
|
||||
export const InAModal: ComponentStory<typeof NodeEditor> = props => {
|
||||
|
||||
const [open, setOpen] = useState(false);
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<Button onClick={() => setOpen(!open)}>Open Editor</Button>
|
||||
<Modal open={open}>
|
||||
<NodeEditor {...props} onClose={() => setOpen(!open)} />
|
||||
</Modal>
|
||||
</div>
|
||||
</Page>
|
||||
};
|
||||
@@ -52,7 +52,7 @@ export const NodeEditor: FC<NodeEditorProps> = ({
|
||||
onChange={state.setNodeType}
|
||||
/> : <></>}
|
||||
{state.nodeType !== 'condition' ? <InputList
|
||||
label={`${state.nodeType} type`}
|
||||
label={`${state.nodeType.slice(0, 1).toUpperCase()}${state.nodeType.slice(1)} Type`}
|
||||
current={state.subType as any}
|
||||
options={state.subTypes}
|
||||
onChange={state.setSubType}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
.page {
|
||||
/* dims */
|
||||
height: 100vh;
|
||||
width: 100vw;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
max-width: 100vw;
|
||||
max-height: 100vh;
|
||||
|
||||
/* font */
|
||||
font-size: 16px;
|
||||
font-family: Tahoma, Geneva, sans-serif;
|
||||
/* color : var(--primary-accent); */
|
||||
|
||||
/* background */
|
||||
/* background-color: var(--primary); */
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
import "./index.css";
|
||||
import { FC } from 'react';
|
||||
import { createTheme, ThemeProvider } from '@mui/material/styles';
|
||||
import { VersionBox } from "components/VersionBox";
|
||||
|
||||
const theme = createTheme({
|
||||
palette: {
|
||||
mode: 'dark'
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
export const Page: FC = ({ children }) => {
|
||||
return <ThemeProvider theme={theme}>
|
||||
<main className="page" style={{
|
||||
color: theme.palette.text.primary,
|
||||
background: theme.palette.background.default,
|
||||
}}>
|
||||
<VersionBox />
|
||||
{children}
|
||||
</main>
|
||||
</ThemeProvider>
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
.version-box {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
font-size: 0.5em;
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
import "./index.css";
|
||||
import { FC } from "react";
|
||||
|
||||
export const VersionBox: FC = () => {
|
||||
const version = process.env.REACT_APP_BUILD_VERSION ?? "n/a";
|
||||
return <div className="version-box">
|
||||
version: {version}
|
||||
</div>
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { ApiService } from 'apiService/core';
|
||||
import { ConnectedAutomationList } from "components/AutomationList";
|
||||
import { DEFAULT_DIMS } from "components/DAGFlow/constants";
|
||||
import { Page } from 'components/Page';
|
||||
import { FC } from "react";
|
||||
|
||||
|
||||
@@ -11,10 +12,10 @@ export const AutomationRoute: FC<{ api: ApiService }> = ({
|
||||
}) => {
|
||||
|
||||
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ConnectedAutomationList
|
||||
dims={DEFAULT_DIMS}
|
||||
api={api}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
.page {
|
||||
/* dims */
|
||||
height : 100vh;
|
||||
width : 100vw;
|
||||
margin : 0;
|
||||
padding : 0;
|
||||
overflow : hidden;
|
||||
max-width : 100vw;
|
||||
max-height: 100vh;
|
||||
|
||||
/* font */
|
||||
font-size : 16px;
|
||||
font-family: Tahoma, Geneva, sans-serif;
|
||||
color : var(--primary-accent);
|
||||
|
||||
/* background */
|
||||
background-color: var(--primary);
|
||||
}
|
||||
@@ -1,3 +1,6 @@
|
||||
@import url(https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap);
|
||||
@import url(https://fonts.googleapis.com/icon?family=Material+Icons);
|
||||
|
||||
:root {
|
||||
--primary: #111;
|
||||
--primary-light: #333;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import "styles/root.css";
|
||||
import "styles/page.css";
|
||||
|
||||
import { Classes } from "jss";
|
||||
import { Context, createContext } from "react"
|
||||
|
||||
@@ -3,7 +3,6 @@ import * as st from 'superstruct';
|
||||
import * as v from "types/validators/conditions";
|
||||
type AutomationConditionNodeBase<Name extends String, Data extends Object> = {
|
||||
condition: Name;
|
||||
alias?: string;
|
||||
} & Data;
|
||||
export type LogicCondition = AutomationConditionNodeBase<'and' | 'or' | 'not', {
|
||||
conditions: AutomationCondition[];
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
import * as st from 'superstruct'
|
||||
import * as v from "types/validators/triggers";
|
||||
|
||||
interface AutomationTriggerBase {
|
||||
alias?: string;
|
||||
}
|
||||
|
||||
export type AutomationTriggerEvent = st.Infer<typeof v.AutomationTriggerEvent>;
|
||||
export type AutomationTriggerHA = st.Infer<typeof v.AutomationTriggerHA>;
|
||||
export type AutomationTriggerMQTT = st.Infer<typeof v.AutomationTriggerMQTT>;
|
||||
|
||||
@@ -2,9 +2,7 @@ import * as st from 'superstruct'
|
||||
import { AutomationTime, EntityId } from './common';
|
||||
|
||||
|
||||
export const AutomationConditionNodeBase = st.type({
|
||||
alias: st.optional(st.string()),
|
||||
});
|
||||
export const AutomationConditionNodeBase = st.type({});
|
||||
export const LogicCondition = st.intersection([
|
||||
AutomationConditionNodeBase,
|
||||
st.type({
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import * as st from 'superstruct'
|
||||
import { AutomationTimeString, AutomationTime } from './common'
|
||||
import { AutomationTimeString, AutomationTime, EntityId } from './common'
|
||||
|
||||
|
||||
const AutomationTriggerBase = {
|
||||
alias: st.optional(st.string()),
|
||||
id: st.optional(st.string()),
|
||||
}
|
||||
|
||||
@@ -95,7 +94,7 @@ export const AutomationTriggerZone = st.type({
|
||||
export const AutomationTriggerDevice = st.type({
|
||||
...AutomationTriggerBase,
|
||||
platform: st.literal('device'),
|
||||
entity_id: st.optional(st.string()),
|
||||
entity_id: st.optional(EntityId),
|
||||
device_id: st.string(),
|
||||
domain: st.string(),
|
||||
type: st.string(),
|
||||
|
||||
@@ -16,10 +16,14 @@ export const convertTimeToString = (t: AutomationTime) => {
|
||||
}
|
||||
}
|
||||
export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(node: AutomationNode<N>): string => {
|
||||
if (node.alias) {
|
||||
if (('alias' in node) && node.alias) {
|
||||
return node.alias;
|
||||
}
|
||||
|
||||
if ('platform' in node) {
|
||||
if (node.id) {
|
||||
return node.id ?? '';
|
||||
}
|
||||
if (node.platform === 'time') {
|
||||
return node.at
|
||||
}
|
||||
|
||||
@@ -51,3 +51,456 @@ export const createMockAuto = (tags: Record<string, string> = {}): AutomationDat
|
||||
}
|
||||
]
|
||||
})
|
||||
|
||||
|
||||
export const bigMockAutoList: AutomationData[] = [
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
|
||||
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
|
||||
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
|
||||
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
|
||||
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
||||
createMockAuto({ "Room": "Office" }),
|
||||
createMockAuto(),
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1649947692702",
|
||||
"alias": "Bed Remote",
|
||||
"description": "",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "turn_on",
|
||||
"id": "turn_on"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "turn_off",
|
||||
"id": "turn_off"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "dim_up",
|
||||
"id": "dim_up"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_short_press",
|
||||
"subtype": "dim_down",
|
||||
"id": "dim_down"
|
||||
},
|
||||
{
|
||||
"device_id": "asdasdasdas",
|
||||
"domain": "zha",
|
||||
"platform": "device",
|
||||
"type": "remote_button_double_press",
|
||||
"subtype": "turn_on",
|
||||
"id": "up_dbclk"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "turn_off"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"type": "turn_off",
|
||||
"device_id": "asdasdasdasdas",
|
||||
"entity_id": "light.bulb_ari_lamp",
|
||||
"domain": "light"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "turn_on"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "light.turn_on",
|
||||
"data": {
|
||||
"color_temp": 153,
|
||||
"brightness_pct": 100
|
||||
},
|
||||
"target": {
|
||||
"device_id": "asdasdasdasdas"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "dim_up"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"device_id": "asdasdasdasdas",
|
||||
"domain": "light",
|
||||
"entity_id": "light.bulb_ari_lamp",
|
||||
"type": "brightness_increase"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "dim_down"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"device_id": "asdasdasdasdas",
|
||||
"domain": "light",
|
||||
"entity_id": "light.bulb_ari_lamp",
|
||||
"type": "brightness_decrease"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "up_dbclk"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "light.turn_on",
|
||||
"data": {
|
||||
"color_temp": 500,
|
||||
"brightness_pct": 100
|
||||
},
|
||||
"target": {
|
||||
"device_id": "asdasdasdasdas"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"default": []
|
||||
}
|
||||
],
|
||||
"tags": {
|
||||
"Type": "Remote",
|
||||
"Room": "Bedroom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1641617168123",
|
||||
"alias": "Ensure On",
|
||||
"description": "",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"platform": "device",
|
||||
"type": "turned_off",
|
||||
"device_id": "tasdasdasdasdasdasda",
|
||||
"entity_id": "switch.power_washer",
|
||||
"domain": "switch"
|
||||
},
|
||||
{
|
||||
"platform": "device",
|
||||
"type": "turned_off",
|
||||
"device_id": "dasdasdasdasdas",
|
||||
"entity_id": "switch.plug_living_room_tv",
|
||||
"domain": "switch"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"type": "turn_on",
|
||||
"device_id": "tasdasdasdasdasdasda",
|
||||
"entity_id": "switch.power_washer",
|
||||
"domain": "switch"
|
||||
},
|
||||
{
|
||||
"type": "turn_on",
|
||||
"device_id": "dasdasdasdasdas",
|
||||
"entity_id": "switch.plug_living_room_tv",
|
||||
"domain": "switch"
|
||||
}
|
||||
],
|
||||
"tags": {}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1649726828269",
|
||||
"alias": "Climate Heat Mode Settings",
|
||||
"description": "Ensures that the climate is always in sync with the house settings",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"platform": "state",
|
||||
"entity_id": "climate.main_floor",
|
||||
"id": "main"
|
||||
},
|
||||
{
|
||||
"platform": "state",
|
||||
"entity_id": "climate.second_floor",
|
||||
"id": "second"
|
||||
},
|
||||
{
|
||||
"platform": "state",
|
||||
"entity_id": "input_boolean.thermostats_house_is_heating",
|
||||
"id": "setting"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "setting"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "climate.turn_off",
|
||||
"data": {},
|
||||
"target": {
|
||||
"device_id": [
|
||||
"d88dcfe82bc9a1c0f2b77b871848155e",
|
||||
"ef2d47fdeef19f8984b85f92f2597f73"
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "input_boolean.thermostats_house_is_heating",
|
||||
"state": "on"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'heat' }}"
|
||||
},
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'off' }}"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "climate.set_hvac_mode",
|
||||
"data": {
|
||||
"hvac_mode": "heat"
|
||||
},
|
||||
"target": {
|
||||
"entity_id": "{{ trigger.entity_id }}"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"default": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "and",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'cool' }}"
|
||||
},
|
||||
{
|
||||
"condition": "template",
|
||||
"value_template": "{{ trigger.to_state.state != 'off' }}"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "climate.set_hvac_mode",
|
||||
"data": {
|
||||
"hvac_mode": "cool"
|
||||
},
|
||||
"target": {
|
||||
"entity_id": "{{ trigger.entity_id }}"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"tags": {}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "1628024070687",
|
||||
"alias": "Baby Light Setting",
|
||||
"description": "Configures max/min light settings for the baby ",
|
||||
"trigger_variables": null,
|
||||
"mode": "single"
|
||||
},
|
||||
"trigger": [
|
||||
{
|
||||
"platform": "time",
|
||||
"at": "21:00:00",
|
||||
"id": "night"
|
||||
},
|
||||
{
|
||||
"platform": "time",
|
||||
"at": "07:30:00",
|
||||
"id": "day"
|
||||
}
|
||||
],
|
||||
"condition": [],
|
||||
"sequence": [
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "night"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "zwave_js.set_config_parameter",
|
||||
"data": {
|
||||
"parameter": "5",
|
||||
"value": "15"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "trigger",
|
||||
"id": "day"
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "zwave_js.set_config_parameter",
|
||||
"data": {
|
||||
"parameter": "5",
|
||||
"value": 100
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"default": []
|
||||
}
|
||||
],
|
||||
"tags": {}
|
||||
},
|
||||
{
|
||||
"metadata": {
|
||||
"id": "alarmanlage_an",
|
||||
"alias": "alarmanlage_an (Uhrzeit)",
|
||||
"mode": "single"
|
||||
},
|
||||
tags: {},
|
||||
"trigger": [
|
||||
{
|
||||
"entity_id": "sensor.time",
|
||||
"platform": "state",
|
||||
"to": "23:30"
|
||||
}
|
||||
],
|
||||
"condition": [
|
||||
{
|
||||
"condition": "or",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "person.simon",
|
||||
"state": "home"
|
||||
},
|
||||
{
|
||||
"condition": "state",
|
||||
"entity_id": "person.leni",
|
||||
"state": "home"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"sequence": [
|
||||
{
|
||||
"service": "alarm_control_panel.alarm_arm_night",
|
||||
"target": {
|
||||
"entity_id": [
|
||||
"alarm_control_panel.alarmo"
|
||||
]
|
||||
},
|
||||
"data": {
|
||||
"code": "xxx"
|
||||
}
|
||||
},
|
||||
{
|
||||
"service": "alarm_control_panel.alarm_arm_away",
|
||||
"data": {},
|
||||
"target": {
|
||||
"entity_id": "alarm_control_panel.blink_home"
|
||||
}
|
||||
}
|
||||
],
|
||||
}
|
||||
]
|
||||
Executable
+11
@@ -0,0 +1,11 @@
|
||||
#!/bin/bash
|
||||
TMUX_SESSION=shortu-webapp
|
||||
|
||||
tmux kill-ses -t $TMUX_SESSION
|
||||
tmux new -s $TMUX_SESSION -d
|
||||
tmux send-keys -t $TMUX_SESSION 'yarn tsc' C-m
|
||||
tmux splitw -h -p 66 -t $TMUX_SESSION
|
||||
tmux send-keys -t $TMUX_SESSION 'yarn test' C-m
|
||||
tmux splitw -h -t $TMUX_SESSION
|
||||
tmux send-keys -t $TMUX_SESSION 'yarn storybook' C-m
|
||||
tmux a -t $TMUX_SESSION
|
||||
+3910
-5467
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user