Compare commits

...
38 Commits
Author SHA1 Message Date
ari bc773154c6 all the latest socket work 2022-06-01 21:17:16 -04:00
ari a530e5e6e0 clean ups 2022-05-31 17:13:15 -04:00
ari 1ad87c205d updated emitters 2022-05-31 13:28:11 -04:00
ari d45f72b168 badges 2022-05-31 13:21:31 -04:00
ari 0c7db09c32 removed desc 2022-05-31 12:50:53 -04:00
ari 2b1648eff2 added desc to build 2022-05-31 12:50:15 -04:00
ari 06356b46e9 deployment 2022-05-31 12:46:11 -04:00
ari 21fe64f4bf added supervisor token + snackbar for errors 2022-05-31 12:19:58 -04:00
ari e22f64dd51 updated all packages to latest 2022-05-31 11:24:37 -04:00
ari f1b24ec783 device id 2022-05-30 19:48:55 -04:00
ari 8a90b56ac3 fixed tsc 2022-05-30 15:20:42 -04:00
ari 7d111c853b slight improvement on condition editor for mobile 2022-05-30 15:14:47 -04:00
ari 0c72481729 clean up 2022-05-30 15:10:33 -04:00
ari 996626f9af input entities 2022-05-30 15:05:54 -04:00
ari 878035e748 added ha websockets 2022-05-29 22:06:21 -04:00
ari cc930ee4ac dealt with linitng errors 2022-05-29 21:06:43 -04:00
ari 169a2e9059 loaders 2022-05-27 16:43:31 -04:00
ari 6275123071 v0.1.14 2022-05-27 14:37:21 -04:00
ari 0001c93792 speeding up build times 2022-05-27 13:37:43 -04:00
ari 90d3fa0587 sorting tag names 2022-05-27 13:01:50 -04:00
ari 938040e519 sorting tag values 2022-05-27 13:01:27 -04:00
ari 14b3132c64 ensured unique tag types 2022-05-27 13:00:52 -04:00
ari 17c79d7aab updated deps 2022-05-27 12:54:15 -04:00
Ari Sosnovsky 67cc57f068 Create SECURITY.md 2022-05-27 12:36:59 -04:00
ari a4743b0353 added helper text for error 2022-05-27 12:31:56 -04:00
ari 5efda5f3b2 using mui select 2022-05-27 12:25:44 -04:00
ari 7d7a788723 added unsupported 2022-05-27 12:08:58 -04:00
ari cdf67aa1a9 fixed up alias issues 2022-05-27 12:02:25 -04:00
ari 98133607ca revamp grouper 2022-05-27 11:46:54 -04:00
ari 5729b74c89 tag autocomplete 2022-05-26 21:49:28 -04:00
ari fb8eb4f38c cleaner test 2022-05-24 22:14:34 -04:00
ari 21adcb6973 better autoinfobox styling 2022-05-24 22:11:42 -04:00
ari 8a33d05ced slightly better node condition editor 2022-05-24 22:00:34 -04:00
ari 334268b5ee deprecated textarea 2022-05-24 21:31:54 -04:00
ari 3b7b17021f replaced yaml editor 2022-05-24 21:28:14 -04:00
ari 44c4ac12dd initial work with mui 2022-05-24 21:12:01 -04:00
ari f8233dd6ab added mui 2022-05-24 21:11:49 -04:00
ari 54f528deb4 simple tmux as help build 2022-05-20 15:46:10 -04:00
139 changed files with 9654 additions and 9862 deletions

No files matched your search

+9
View File
@@ -2,3 +2,12 @@ webapp/node_modules
webapp/build
webapp/.storybook
webapp/.vscode
webapp/.env.local
webapp/tmux.sh
api/.env
api/.coverage
api/venv
api/build
api/.mypy_cache
api/.vscode
api/.coverage
-1
View File
@@ -30,5 +30,4 @@ jobs:
args: |
--${{ matrix.arch }} \
--version ${{ github.event.inputs.version }} \
--additional-tag edge \
--target .
+4 -3
View File
@@ -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
@@ -99,5 +101,4 @@ jobs:
args: |
--${{ matrix.arch }} \
--version ${{ needs.metadata.outputs.version }} \
--additional-tag edge \
--target .
+9 -1
View File
@@ -1,4 +1,12 @@
# Changelog
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [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
+22 -16
View File
@@ -1,11 +1,18 @@
# <--- 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
ENV HASS_URL "http://supervisor/"
# <--- System Wide Dependencies -->
ENV LANG C.UTF-8
RUN apk add --no-cache \
@@ -13,29 +20,26 @@ 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
@@ -45,5 +49,7 @@ LABEL \
io.hass.type="addon" \
io.hass.arch="armhf|aarch64|i386|amd64"
CMD [ "/app/run.sh" ]
ENTRYPOINT [ "/app/bin/run.sh" ]
CMD [ "/app" ]
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
+27 -6
View File
@@ -1,24 +1,45 @@
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
build-with-builder:
docker run \
--rm \
--privileged \
-v ~/.docker:/root/.docker \
-v /var/run/docker.sock:/var/run/docker.sock:ro \
-v ${PWD}:/data \
homeassistant/amd64-builder \
--amd64 \
--test \
--version ${BUILD_TAG} \
-t /data
build:
$(DC) build
build-no-cache:
$(DC) build --no-cache
push:
$(DC) push
local_run:
start:
$(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
bash:
$(DC) exec addon bash
config:
$(DC) config
+7 -3
View File
@@ -1,12 +1,16 @@
# Shortumation
# Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/asosnovsky/Shortumation/Manual%20Build)
| | Stable | amd64-edge | i386-edge | armv7-edge | aarch64-edge | armhf-edge |
| --- | --- | --- | --- | --- | --- | --- |
| Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-i386?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-armv7?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-aarch64?&sort=date&label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-armhf?&sort=date&label=&style=for-the-badge) |
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
![image](https://user-images.githubusercontent.com/7451445/168672575-fb19997d-fe9b-4192-96b0-733b62519797.png)
![image](https://user-images.githubusercontent.com/7451445/170770378-122c6722-993d-40ac-801d-387cfaccd41f.png)
![image](https://user-images.githubusercontent.com/7451445/168672840-71ceaa8a-2bee-443e-9150-5b0f03b05d08.png)
![image](https://user-images.githubusercontent.com/7451445/170770572-fd38950a-b6b4-4b49-8c94-fb0a5f3008ce.png)
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
View File
@@ -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.
-1
View File
@@ -43,5 +43,4 @@ clean:
run-local:
rm -f web
ln -s ../webapp/build web
cd ../webapp && yarn build
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
+4 -4
View File
@@ -1,8 +1,6 @@
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
from src.env import BUILD_VERSION, HASS_URL, HASSIO_TOKEN
from src.hass_config import HassConfig
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
router = APIRouter()
@router.get("/")
def read_ping():
def read_details():
return {
"version": BUILD_VERSION,
"hassio_token": HASSIO_TOKEN,
"hass_url": HASS_URL,
"config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(),
+2
View File
@@ -4,5 +4,7 @@ from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
HASSIO_TOKEN = config("HASSIO_TOKEN", "")
HASS_URL = config("HASS_URL", "/")
LOG_LEVEL = config("LOG_LEVEL", "INFO")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+7 -8
View File
@@ -1,7 +1,7 @@
name: Shortumation
version: 0.1.13
version: v0.1.14
slug: shortumation
image: asosnovsky/shortumation-{arch}
image: ghcr.io/asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
description: "A homeassitant addon which provides better UI for automations & scripts."
arch:
@@ -16,16 +16,15 @@ init: false
ingress: true
ingress_port: 8000
ingress_entry: "web/"
panel_icon: mdi:home-automation
hassio_role: manager
privileged:
- SYS_RAWIO
host_network: false
homeassistant_api: true
auth_api: true
panel_icon: mdi:home-automation
hassio_role: homeassistant
host_network: false
map:
- config:rw
options: {}
ports:
8000/tcp: 8000
8000/tcp:
ports_description:
8000/tcp: Main port for the API & Web.
+3 -2
View File
@@ -1,9 +1,10 @@
version: '3'
services:
addon:
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
image: "ghcr.io/asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
build:
context: "./"
dockerfile: "./Dockerfile"
args:
- BUILD_ARCH=${ARCH:-amd64}
BUILD_ARCH: ${ARCH:-amd64}
BUILD_VERSION: ${BUILD_TAG:-edge}
+3
View File
@@ -3,5 +3,8 @@ services:
addon:
volumes:
- "./sample_config:/config"
- "./api/tests:/app/tests"
ports:
- "8000:8000"
env_file:
- api/.env
+28
View File
@@ -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"
+19
View File
@@ -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"
+10
View File
@@ -0,0 +1,10 @@
#!/bin/bash
api_location=${1}
pushd $api_location
echo "--------------------"
echo "BUILD_VERSION = "$BUILD_VERSION
echo $(python --version)
echo "--------------------"
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
-4
View File
@@ -1,4 +0,0 @@
#!/bin/bash
echo $(python --version)
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
+1 -1
View File
@@ -1,5 +1,5 @@
0:
Type: Generic
Type: Generic2
1:
Type: Generic
2:
+1 -1
View File
@@ -1 +1 @@
SKIP_PREFLIGHT_CHECK=true
SKIP_PREFLIGHT_CHECK=true
+7 -1
View File
@@ -1,4 +1,7 @@
module.exports = {
'core': {
builder: 'webpack5'
},
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx)"
@@ -8,5 +11,8 @@ module.exports = {
"@storybook/addon-essentials",
"@storybook/preset-create-react-app",
"@storybook/addon-queryparams",
]
],
"features": {
"emotionAlias": false,
},
}
+6 -13
View File
@@ -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
}
]
}
+27 -13
View File
@@ -4,22 +4,31 @@
"private": true,
"homepage": ".",
"dependencies": {
"@types/jest": "^26.0.15",
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@mui/material": "^5.8.0",
"@mui/styles": "^5.8.0",
"@types/jest": "^27.5.1",
"@types/node": "^17.0.36",
"@types/react": "^18.0.9",
"@types/react-dom": "^18.0.5",
"@types/ws": "^8.5.3",
"@uiw/react-codemirror": "^4.7.0",
"autosuggest-highlight": "^3.2.1",
"home-assistant-js-websocket": "^7.1.0",
"jss": "^10.8.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"notistack": "^2.0.5",
"react": "^18.1.0",
"react-dom": "^18.1.0",
"react-flow-renderer": "^10.1.2",
"react-jss": "^10.8.2",
"react-router-dom": "6",
"react-scripts": "4.0.3",
"react-scripts": "5.0.1",
"superstruct": "^0.15.4",
"theming": "^3.3.0",
"typescript": "^4.1.2",
"web-vitals": "^1.0.1",
"web-vitals": "^2.1.4",
"ws": "^8.7.0",
"yarn": "^1.22.17"
},
"scripts": {
@@ -67,16 +76,21 @@
"@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-links": "^6.4.22",
"@storybook/addon-queryparams": "^6.2.9",
"@storybook/builder-webpack5": "^6.5.6",
"@storybook/manager-webpack5": "^6.5.6",
"@storybook/node-logger": "^6.4.22",
"@storybook/preset-create-react-app": "^3.2.0",
"@storybook/preset-create-react-app": "^4.1.1",
"@storybook/react": "^6.4.22",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.2.0",
"@types/autosuggest-highlight": "^3.2.0",
"@types/chroma-js": "^2.1.3",
"@types/js-yaml": "^4.0.5",
"jest-environment-jsdom": "^27.5.1",
"ts-node": "^10.4.0"
"jest-environment-jsdom": "^28.1.0",
"ts-node": "^10.8.0",
"webpack": "^5.72.1",
"webpack-dev-server": "^4.9.0"
},
"moduleDirectories": [
"node_modules",
+1
View File
@@ -6,6 +6,7 @@ import { ErrorBoundary } from 'components/ErrorBoundary';
function App() {
const api = useConnectedApiService();
return (
<div className="app">
<ErrorBoundary>
+6 -3
View File
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
data = {}
}) {
try {
const reply = await fetch(baseURL + path, {
const payload: RequestInit = {
method,
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify(data),
});
};
if (method !== 'GET') {
payload["body"] = JSON.stringify(data);
}
const reply = await fetch(baseURL + path, payload);
let response: APIResponse<any>;
if (reply.status === 200) {
response = {
+10 -5
View File
@@ -5,13 +5,18 @@ import { useAPIService } from './core';
import { useMockAPI } from "./mock";
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
const baseURL = process.env.NODE_ENV === 'development' ?
"http://localhost:8000" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]);
export const remoteDetailsAPI = makeRemoteAPI(
baseURL + "/details"
);
export const remoteAutoAPI = makeRemoteAPI(
baseURL + "/automations"
);
export const useConnectedApiService = () => useAPIService(
makeAutomationAPI(makeRemoteAPI(
process.env.NODE_ENV === 'development' ?
"http://localhost:8000/automations" :
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
))
makeAutomationAPI(remoteAutoAPI)
);
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
makeAutomationAPI(useMockAPI(initialAutos))
+1 -1
View File
@@ -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,
+1 -1
View File
@@ -7,7 +7,7 @@ export interface ListParams {
}
export type APIRequest<D> = {
path: string;
method?: "POST" | "DELETE",
method?: "POST" | "DELETE" | "GET",
data?: D;
};
@@ -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,19 @@ 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 { FC, ReactNode, 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;
children?: ReactNode;
}
export const AutoInfoBox: FC<Props> = ({
metadata,
@@ -19,6 +22,7 @@ export const AutoInfoBox: FC<Props> = ({
onUpdate,
className,
children,
tagDB,
}) => {
// state
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
@@ -26,6 +30,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 +74,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 +88,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 +102,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 key={tagIndex} 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>
@@ -1,5 +1,6 @@
.automation-editor {
display: flex;
position: relative;
flex-direction: row;
width: 100%;
height: 100%;
@@ -74,4 +75,26 @@
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
transform: rotate(180deg);
z-index: 2;
}
.automation-editor.loading .mock-list {
position: absolute;
left: 0;
width: 40%;
height: 100%;
}
.automation-editor.loading .mock-graph {
position: absolute;
left: 40%;
width: 60%;
height: 100%;
}
.automation-editor .linear-loader {
position: absolute;
top: 0;
left: 0;
width: 100%;
}
@@ -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 ? [state] : [])}
automation={state}
onUpdate={s => {
window.setTimeout(() => setState(s), 3000)
}}
/>
</div>
</Page>
}
export const Loading = Template.bind({});
@@ -10,16 +10,21 @@ 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";
import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress";
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 {
@@ -38,7 +43,9 @@ export const AutomationEditor: FC<Props> = ({
// render
if (state.status === 'loading') {
return <div className="automation-editor loading">
Loading...
<LinearProgress className="linear-loader" />
<Skeleton className="mock-list" variant="rectangular" />
<Skeleton className="mock-graph" variant="rectangular" />
</div>
}
if (state.status === 'invalid') {
@@ -50,17 +57,20 @@ export const AutomationEditor: FC<Props> = ({
/>
}
return <div className="automation-editor">
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
<AutoInfoBox
className={closeInfo ? "hide" : "show"}
metadata={state.data.metadata}
tags={state.data.tags}
onUpdate={updateMetadata}
tagDB={tagDB}
>
<ButtonIcon
className="automation-editor--info-box--icon"
onClick={() => setCloseInfo(!closeInfo)}
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
>{ArrowIcon}</ButtonIcon>
Icon={ArrowIcon}
/>
</AutoInfoBox>
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
@@ -6,7 +6,7 @@ import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = {
status: 'unchanged' | 'changed',
status: 'unchanged' | 'changed' | 'saving',
data: EditorData
} | {
status: 'loading'
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
}), {})
};
update({
status: "loading",
status: "saving",
data,
})
onSave(cleanData);
}
@@ -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,
}
@@ -589,3 +140,41 @@ BadAutmations.args = {
}
],
}
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = args => {
const [autos, setAutos] = useState(args.automations)
return <Page>
<AutomationList {...args} automations={autos}
onAdd={a => {
window.setTimeout(() => {
args.onAdd(a);
setAutos([...autos, a]);
}, 10000)
}}
onRemove={i => {
window.setTimeout(() => {
args.onRemove(i);
setAutos([
...autos.slice(0, i),
...autos.slice(i + 1),
]);
}, 10000)
}}
onUpdate={(i, a) => {
window.setTimeout(() => {
args.onUpdate(i, a);
setAutos([
...autos.slice(0, i),
a,
...autos.slice(i + 1),
]);
}, 10000)
}}
/>
</Page>
}
FewAutosWithSlowLoader.args = {
...FewAutosWithSlowLoader.args,
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([
@@ -1,10 +1,11 @@
import "./AutomationListBox.css";
import { FC, useState } from 'react';
import { AutomationData, AutomationMetadata } from "types/automations";
import { AutomationData } 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({})
@@ -44,3 +45,20 @@ FewAutos.args = {
createMockAuto(),
],
}
export const Loading: ComponentStory<any> = args => {
const api = useMockApiService(args.initialAutomations);
return <Page>
<ConnectedAutomationList
{...args}
api={{
...api,
state: {
"automations": {
"ready": false
}
}
}}
/>
</Page>
}
@@ -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]
}
}
}
@@ -18,6 +18,25 @@
flex: 1;
}
/* Loading state */
.automation-list--root.loading {
width: 100%;
height: 100%;
flex-direction: column;
}
.automation-list--root.loading>* {
width: 100%;
}
.automation-list--root.loading .automation-list--circle-loader {
width: 100%;
height: 100%;
justify-content: center;
align-items: center;
display: flex;
}
/* list children: on hide */
.automation-list--list.hide>.automation-list-box {
width: 0;
+15 -5
View File
@@ -1,7 +1,7 @@
import "./index.css";
import "./index.mobile.css";
import { AutomationEditor } from "components/AutomationEditor";
import { FC, useState } from "react";
import { FC, ReactNode, useState } from "react";
import { AutomationData } from "types/automations";
import { defaultAutomation } from 'utils/defaults';
import { ArrowIcon } from "components/Icons";
@@ -10,6 +10,9 @@ import { ApiService } from "apiService/core";
import { AutomationListBox } from "./AutomationListBox";
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
import useWindowSize from "utils/useWindowSize";
import { makeTagDB } from "./TagDB";
import LinearProgress from "@mui/material/LinearProgress";
import CircularProgress from "@mui/material/CircularProgress";
interface AutomationListParams {
@@ -18,6 +21,7 @@ interface AutomationListParams {
onAdd: (auto: AutomationData) => void;
onRemove: (i: number) => void;
dims: DAGAutomationFlowDims;
children?: ReactNode;
}
export const AutomationList: FC<AutomationListParams> = ({
@@ -34,6 +38,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(' ')}>
@@ -55,15 +60,15 @@ export const AutomationList: FC<AutomationListParams> = ({
<ButtonIcon
onClick={() => setHideList(!hideList)}
className="automation-list--list-hide"
>
{ArrowIcon}
</ButtonIcon>
Icon={ArrowIcon}
/>
</div>
<div className="automation-list--viewer">
{currentAuto ? <AutomationEditor
automation={currentAuto}
onUpdate={a => onUpdate(current, a)}
dims={dims}
tagDB={tagDB}
/> : <></>}
</div>
{children}
@@ -85,7 +90,12 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
dims
}) => {
if (!automations.ready) {
return <span>Loading...</span>
return <div className="automation-list--root loading">
<LinearProgress />
<div className="automation-list--circle-loader">
<CircularProgress />
</div>
</div>
}
if (!automations.ok) {
return <span>Error {automations.error}</span>
@@ -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>
)
}
@@ -8,6 +8,7 @@ import InputYaml from "components/Inputs/InputYaml";
import { getEditor } from "./editorRender";
import { useStyles } from "./style";
import { getViewer } from "./viewRender";
import useWindowSize from "utils/useWindowSize";
@@ -31,6 +32,7 @@ export const ConditionNode: FC<{
// state
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
const [yamlMode, setYamlMode] = useState(false);
const { isMobile } = useWindowSize();
// alias
const effectiveDM = internalDisplayMode || yamlMode;
// effect
@@ -76,52 +78,56 @@ export const ConditionNode: FC<{
} else if (condition.condition === 'or') {
hasChildren = true
}
const { classes } = useStyles({ hasChildren });
const { classes } = useStyles({ hasChildren, isMobile });
// components
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
return <div className={classes.root}>
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
<div className={classes.title}>
<InputList
label=""
className={classes.titleText}
current={condition.condition}
options={[
'or', 'not', 'and',
'template',
'numeric_state',
'state',
'time',
'trigger',
'zone',
]}
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
{yamlMode ? 'visual' : 'yaml'}
</button>}
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
</button>}
</div>
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition}
onChange={update => onUpdate(update as any)}
/>}
{!yamlMode && childrenConditions}
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
</div>}
</div>
{children({ classes })}
<>
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
<div className={classes.title}>
<InputList
label=""
className={classes.titleText}
current={condition.condition}
options={[
'or', 'not', 'and',
'template',
'numeric_state',
'state',
'time',
'trigger',
'zone',
]}
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
{yamlMode ? 'visual' : 'yaml'}
</button>}
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
</button>}
</div>
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition}
onChange={update => onUpdate(update as any)}
/>}
<div className={classes.conditionWrap}>
{!yamlMode && childrenConditions}
</div>
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
</div>}
</div>
{children({ classes })}
</>
</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 { InputEntity } from "components/Inputs/InputEntities";
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,13 +57,10 @@ 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}
multiple
onChange={entity_id => onChange({
...condition,
entity_id
@@ -94,11 +86,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,13 +118,10 @@ 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}
multiple
onChange={entity_id => onChange({
...condition,
entity_id
@@ -158,18 +147,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,40 +172,33 @@ 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
})} />
<InputEntity
value={condition.entity_id}
multiple
onChange={entity_id => onChange({
...condition,
entity_id
@@ -234,5 +212,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({})
+11 -6
View File
@@ -2,7 +2,8 @@ import { Styles } from "jss";
import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{
hasChildren: boolean
hasChildren: boolean,
isMobile: boolean,
}>(theme => {
const deleteBtn: Styles = {
borderRadius: '10px',
@@ -20,12 +21,12 @@ export const useStyles = createAppUseStyles<{
}
}
return {
root: ({ hasChildren }) => ({
root: ({ hasChildren, isMobile }) => ({
background: theme.primary,
padding: 0,
position: 'relative',
display: 'flex',
flexDirection: hasChildren ? 'column' : 'row',
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
}),
title: ({ hasChildren }) => ({
display: 'flex',
@@ -42,8 +43,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 +87,9 @@ export const useStyles = createAppUseStyles<{
}),
icon: {},
deleteBtn,
conditionWrap: {
overflow: 'auto',
},
children: ({ hasChildren }) => ({
flex: 1,
paddingLeft: hasChildren ? 50 : 10,
@@ -96,7 +100,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>
}
@@ -1,5 +1,5 @@
import "./index.css";
import { Component, ErrorInfo } from "react";
import { Component, ErrorInfo, ReactNode } from "react";
type State = {
hasError: false;
@@ -8,7 +8,9 @@ type State = {
error: any,
errorInfo?: ErrorInfo,
}
export class ErrorBoundary extends Component<{}, State> {
export class ErrorBoundary extends Component<{
children: ReactNode
}, State> {
state: State = {
hasError: false
@@ -39,6 +41,8 @@ export class ErrorBoundary extends Component<{}, State> {
</div>
}
return this.props.children;
return <>
{this.props.children}
</>;
}
}
+3 -3
View File
@@ -5,7 +5,7 @@ import { createAppUseStyles } from 'styles/theme';
export interface ButtonIconStyleProps {
}
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
children: FC<IconBaseProps>;
Icon: FC<IconBaseProps>;
}
const useButtonIconStyles = createAppUseStyles(theme => ({
buttonIcon: {
@@ -22,9 +22,9 @@ const useButtonIconStyles = createAppUseStyles(theme => ({
export const ButtonIcon: FC<ButtonIconProps> = ({
children: Child,
Icon,
className,
...props
}) => <Child
}) => <Icon
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
/>
@@ -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">
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon>
</div>
return <Page>
<ButtonIcon {...args} Icon={ArrowIcon} />
</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>
}
@@ -0,0 +1,36 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { InputDevice } from "./InputDevice";
export default {
title: 'Inputs/InputDevice',
component: InputDevice,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof InputDevice>;
const Template: ComponentStory<typeof InputDevice> = args => {
const [value, setValue] = useState(args.value)
return <Page>
<div style={{
maxWidth: 200
}}>
<InputDevice {...args} value={value as any} onChange={(v: any) => {
setValue(v)
args.onChange(v as any)
}} />
</div>
</Page>
}
export const Single = Template.bind({})
Single.args = {
...Single.args,
multiple: false,
value: 'sensor.bathroom'
} as any
@@ -0,0 +1,117 @@
import "./InputEntities.css";
import { FC } from "react";
import { useHADeviceRegistry } from 'haService';
import Autocomplete from '@mui/material/Autocomplete';
import TextField from '@mui/material/TextField';
import Chip from '@mui/material/Chip';
import { EntityId } from 'types/automations/common';
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
import { prettyName } from 'utils/formatting';
export type InputEntityProps = {
label?: string,
} & ({
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
} | {
value: EntityId;
multiple: true;
onChange: (v: string[]) => void;
})
export const InputDevice: FC<InputEntityProps> = props => {
// state
const dr = useHADeviceRegistry();
// processing of inputs
const options = dr.getOptions();
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : [];
// events
const onChange = (_e: any, v: any) => {
const cleanValue: string[] = v === null ? [] :
Array.isArray(v) ? v.map(opt => {
if (typeof opt === 'string') {
return opt
}
return opt.id
}) : [v];
if (props.multiple) {
props.onChange(cleanValue);
} else {
props.onChange(cleanValue[cleanValue.length - 1])
}
}
return <Autocomplete
className="input-entities"
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={dr.getLabel}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.manufacturer) : ''}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase();
return opts.map(opt => {
let similarityScore = 0;
const eid = dr.getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
const name = dr.getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
return {
label: name,
id: eid,
similarityScore,
manufacturer: (typeof opt === 'string') ? '' : opt.manufacturer ?? ""
}
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
return (a.similarityScore > b.similarityScore) ? 1 : -1
})
}}
renderOption={(prop, option, { inputValue }) => {
const label = dr.getLabel(option);
const id = dr.getID(option);
return <SearchItem
listProps={prop}
id={id}
label={label}
searchTerm={inputValue}
/>
}}
renderInput={params => <TextField
{...params}
variant="filled"
label={props.label ?? "Device"}
/>}
renderTags={(tagValue, getTagProps) => <Badge badgeContent={tagValue.length} color="info">
<div className="input-entities--tags">
{tagValue.map((option, index) => {
const label = dr.getLabel(option);
const id = dr.getID(option);
const props = getTagProps({ index });
props.className += ' input-entities--chip'
return (
<Chip
size="medium"
label={<>
{(id === label) ? <span>{label}</span> : <b>{label}</b>}
{(id !== label) && <small>{id}</small>}
</>}
{...props}
/>
)
})}
</div>
</Badge>
}
/>
}
@@ -0,0 +1,35 @@
.input-entities .BaseBadge-root {
max-width: 100%;
}
.input-entities--chip>span {
display: flex;
flex-direction: row;
gap: 0.15em;
}
.input-entities--chip>span>small::before {
content: "/ ";
}
.input-entities--chip>span>small {
size: 0.15em;
}
.input-entities--errors {
margin-top: 0.75em;
}
.input-entities--errors ul {
padding: 0 0 0 1em;
margin: 0;
max-height: 2.5em;
overflow-y: auto;
overflow-x: hidden;
}
.input-entities--tags {
max-height: 5em;
max-width: 100%;
overflow: auto;
}
@@ -0,0 +1,138 @@
import "./InputEntities.css";
import { FC } from "react";
import { useHAEntities } from 'haService';
import Autocomplete from '@mui/material/Autocomplete';
import TextField from '@mui/material/TextField';
import Chip from '@mui/material/Chip';
import { prettyName } from "utils/formatting";
import { EntityId } from 'types/automations/common';
import { Badge } from "@mui/material";
import { SearchItem } from "./extras";
export type InputEntityProps = {
restrictToDomain?: string[],
label?: string,
} & ({
value: string | null;
multiple?: false;
onChange: (v: string | null) => void;
} | {
value: EntityId;
multiple: true;
onChange: (v: string[]) => void;
})
export const InputEntity: FC<InputEntityProps> = props => {
// state
const entities = useHAEntities();
// processing of inputs
const options = entities.getOptions(props.restrictToDomain);
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : [];
const errors = entities.validateOptions(value, props.restrictToDomain);
// processing of errors
let helperText = <></>;
let error: boolean = false;
if (errors !== null) {
error = true
if (errors.length > 0) {
helperText = <Badge
className="input-entities--errors"
badgeContent={errors.length} color="error"
>
<ul title={errors.join(', and')}>{errors.map((msg, i) => <li key={i}>
{msg}
</li>)}</ul>
</Badge>
}
}
// events
const onChange = (_e: any, v: any) => {
const cleanValue: string[] = v === null ? [] :
Array.isArray(v) ? v.map(opt => {
if (typeof opt === 'string') {
return opt
}
return opt.id
}) : [v];
if (props.multiple) {
props.onChange(cleanValue);
} else {
props.onChange(cleanValue[cleanValue.length - 1])
}
}
return <Autocomplete
className="input-entities"
multiple={true}
freeSolo
value={value}
options={options}
onChange={onChange}
getOptionLabel={entities.getLabel}
filterOptions={(opts, s) => {
const searchTerm = s.inputValue.toLocaleLowerCase();
return opts.map(opt => {
let similarityScore = 0;
const eid = entities.getID(opt);
if (eid.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
const name = entities.getLabel(opt);
if (name.toLocaleLowerCase().includes(searchTerm)) {
similarityScore = Math.abs(eid.length - searchTerm.length)
}
return {
label: name,
id: eid,
domain: (typeof opt === 'string') ? '' : opt.domain,
similarityScore
}
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
return (a.similarityScore > b.similarityScore) ? 1 : -1
})
}}
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
renderOption={(prop, option, { inputValue }) => {
const label = entities.getLabel(option);
const id = entities.getID(option);
return <SearchItem
listProps={prop}
id={id}
label={label}
searchTerm={inputValue}
/>
}}
renderInput={params => <TextField
{...params}
variant="filled"
label={props.label ?? "Entity ID"}
helperText={helperText}
error={error}
/>}
renderTags={(tagValue, getTagProps) => <Badge badgeContent={tagValue.length} color="info">
<div className="input-entities--tags">
{tagValue.map((option, index) => {
const label = entities.getLabel(option);
const id = entities.getID(option);
const props = getTagProps({ index });
props.className += ' input-entities--chip'
return (
<Chip
size="medium"
label={<>
{(id === label) ? <span>{label}</span> : <b>{label}</b>}
{(id !== label) && <small>{id}</small>}
</>}
{...props}
/>
)
})}
</div>
</Badge>
}
/>
}
@@ -0,0 +1,84 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import { InputEntity } from "./InputEntities";
export default {
title: 'Inputs/InputEntity',
component: InputEntity,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof InputEntity>;
const Template: ComponentStory<typeof InputEntity> = args => {
const [value, setValue] = useState(args.value)
return <Page>
<div style={{
maxWidth: 200
}}>
<InputEntity {...args} value={value as any} onChange={(v: any) => {
setValue(v)
args.onChange(v as any)
}} />
</div>
</Page>
}
export const Single = Template.bind({})
Single.args = {
...Single.args,
multiple: false,
value: 'sensor.bathroom'
} as any
export const Many = Template.bind({})
Many.args = {
...Many.args,
multiple: true,
value: ['sensor.bathroom', 'person.ari']
} as any
export const ManyEmpty = Template.bind({})
ManyEmpty.args = {
...ManyEmpty.args,
multiple: true,
value: []
} as any
export const ManyButGotSingle = Template.bind({})
ManyButGotSingle.args = {
...ManyButGotSingle.args,
multiple: true,
value: 'sensor.bathroom'
} as any
export const InvalidDomain = Template.bind({})
InvalidDomain.args = {
...InvalidDomain.args,
multiple: true,
value: 'sensor.bathroom',
restrictToDomain: ['zone'],
} as any
export const InvalidManyDomain = Template.bind({})
InvalidManyDomain.args = {
...InvalidManyDomain.args,
multiple: true,
value: 'sensor.bathroom',
restrictToDomain: ['zone', 'switch'],
} as any
export const InvalidLots = Template.bind({})
InvalidLots.args = {
...InvalidLots.args,
multiple: true,
value: ['person.ari', 'sensor.bathroom', 'binary_sensor.ping_tv', 'device_tracker.phone'],
restrictToDomain: ['zone', 'switch'],
} as any
@@ -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({})
+38 -30
View File
@@ -1,44 +1,52 @@
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>
}
@@ -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({})
+8 -7
View File
@@ -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,7 +1,8 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { useState } from "react";
import InputTextBubble, { InputEntity } from "./InputTextBubble";
import InputTextBubble from "./InputTextBubble";
export default {
title: 'Inputs/InputTextBubble',
@@ -18,26 +19,40 @@ 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 ManyOptions: ComponentStory<typeof InputTextBubble> = args => {
export const EntityId: ComponentStory<typeof InputTextBubble> = args => {
const [value, setValue] = useState<string | string[]>(['sensor.bathroom'])
return <div className="page">
<InputEntity value={value} onChange={setValue} />
</div>
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,66 +1,51 @@
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";
export interface Props {
label: string;
textBoxFor?: string;
value: string | string[];
value?: string | string[];
options?: string[];
onChange: (v: string[]) => void;
additionalTooltipFilters?: Record<string, string>;
maxAllowed?: number;
}
export default function InputTextBubble({
value = "",
label,
textBoxFor,
options = [],
onChange,
additionalTooltipFilters = {},
maxAllowed,
}: 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("")
const selected = Array.isArray(value) ? value : value ? [value] : [];
return <Autocomplete
multiple
freeSolo
value={selected}
options={options}
onChange={(_e, v) => {
let cleanValue = v === null ? [] :
Array.isArray(v) ? v : [v]
if (maxAllowed) {
cleanValue = cleanValue.slice(0, maxAllowed);
}
onChange(cleanValue)
}}
renderInput={params => <TextField
{...params}
variant="filled"
label={label}
/>}
renderTags={(tagValue, getTagProps) =>
tagValue.map((option, index) => (
<Chip
label={option}
{...getTagProps({ index })}
/>
))
}
};
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>
/>
}
export const InputEntity: FC<{
value: string | string[];
onChange: (v: string[]) => void;
}> = ({
value,
onChange,
}) => <InputTextBubble
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,4 @@
import { FC } from "react";
import { FC, ReactNode } from "react";
import { useInputWrapperStyles } from "./styles";
@@ -8,6 +8,7 @@ export interface Props {
noMargin?: boolean;
className?: string;
error?: string;
children: ReactNode;
}
const InputWrapper: FC<Props> = ({ error, label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
const { classes } = useInputWrapperStyles({ labelSize, noMargin, hasError: !!error })
@@ -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({})
@@ -0,0 +1,28 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { Page } from "components/Page";
import { SearchItem } from "./extras";
export default {
title: 'Inputs/Extras/SearchItem',
component: SearchItem,
parameters: { actions: { argTypesRegex: '^on.*' } },
argTypes: {}
} as ComponentMeta<typeof SearchItem>;
const Template: ComponentStory<typeof SearchItem> = args => {
return <Page>
<SearchItem {...args} />
</Page>
}
export const Simple = Template.bind({})
Simple.args = {
id: "sensor.humidity_main_bedroom",
label: 'Main Bedroom Humidity',
searchTerm: "bedroom",
listProps: {},
} as any
+9
View File
@@ -0,0 +1,9 @@
.input-extras--search-item--list {
display: flex;
flex-direction: row;
gap: 0.15em;
}
.input-extras--search-item--list>small::before {
content: "/ ";
}
+47
View File
@@ -0,0 +1,47 @@
import "./extras.css";
import { FC } from "react";
import parse from 'autosuggest-highlight/parse';
import match from 'autosuggest-highlight/match';
export const HighlightElm: FC<{
text: string,
searchTerm: string
}> = ({
text,
searchTerm
}) => {
const matches = match(text, searchTerm, {
"findAllOccurrences": true,
"insideWords": true
});
const parts = parse(text, matches);
return <>
{parts.map((part, index) => (
<span
key={index}
style={{
textDecoration: part.highlight ? 'underline' : 'unset'
}}
>
{part.text}
</span>
))}
</>
}
export const SearchItem: FC<{
listProps: React.HTMLAttributes<HTMLLIElement>,
label: string,
id: string,
searchTerm: string,
}> = ({
listProps,
label,
id,
searchTerm
}) => <li {...listProps} className={[listProps.className ?? "", 'input-extras--search-item--list'].join(' ')}>
<b><HighlightElm text={label} searchTerm={searchTerm} /></b> <small>
<HighlightElm text={id} searchTerm={searchTerm} />
</small>
</li>
+2 -1
View File
@@ -1,10 +1,11 @@
import { FC } from "react";
import { FC, ReactNode } from "react";
import { createAppUseStyles } from "styles/theme";
export interface ModalStyleProps {
open: boolean;
}
export interface Props extends ModalStyleProps {
children: ReactNode;
}
const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
root: ({ open }) => ({
@@ -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>
@@ -1,3 +1,5 @@
import { InputDevice } from "components/Inputs/InputDevice";
import { InputEntity } from "components/Inputs/InputEntities";
import InputText from "components/Inputs/InputText";
import { DeviceAction } from "types/automations/actions";
import { OptionManager, updateActionData } from './OptionManager';
@@ -6,44 +8,28 @@ import { OptionManager, updateActionData } from './OptionManager';
export const ActionDeviceState: OptionManager<DeviceAction> = {
defaultState: () => ({
alias: "",
type: "",
entity_id: "",
device_id: "",
domain: "",
device_id: ""
}),
isReady: ({
alias,
type,
entity_id,
device_id,
domain,
}) => (
alias !== '' &&
type !== "" &&
entity_id !== "" &&
device_id !== "" &&
domain !== ""
),
renderOptionList: (state, setState) => {
isReady: () => true,
renderOptionList: (state, setState, entities) => {
const update = updateActionData(state, setState);
return <>
<InputText
textBoxFor="device_id"
label="Device"
value={state.device_id}
onChange={device_id => update({ device_id })}
<InputDevice
value={state.device_id ?? ""}
onChange={device_id => update({ device_id: device_id ?? "" })}
/>
<InputText
textBoxFor="type"
label="Action"
value={state.type}
value={state.type ?? ""}
onChange={type => update({ type })}
/>
<InputText
textBoxFor="entity_id"
label="Entity ID"
<InputEntity
value={state.entity_id ?? ""}
onChange={entity_id => update({ entity_id, domain: entity_id.split('.')[0] })}
onChange={entity_id => update({
entity_id: entity_id ? entity_id : undefined,
domain: entity_id ? entity_id.split('.')[0] : ""
})}
/>
</>
}
@@ -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,9 +1,10 @@
import { HAEntitiesState } from 'haService';
import { AutomationAction } from 'types/automations/actions';
import { AutomationCondition } from 'types/automations/conditions';
export interface OptionManager<T> {
defaultState(): T;
isReady(s: T): boolean;
renderOptionList(s: T, set: (s: T) => void): JSX.Element;
renderOptionList(s: T, set: (s: T) => void, entities: HAEntitiesState): JSX.Element;
}
@@ -1,26 +1,21 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerDevice } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputEntities';
import InputTextBubble from 'components/Inputs/InputTextBubble';
import { InputDevice } from 'components/Inputs/InputDevice';
export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
defaultState: () => ({
"alias": "",
"platform": 'device',
"domain": "",
"type": "",
"subtype": "",
"device_id": "",
"entity_id": "",
}),
isReady: ({ alias }) => {
return (alias !== '')
},
renderOptionList: (state, setState) => {
isReady: () => true,
renderOptionList: (state, setState, { getDomainList }) => {
return <>
<InputText label="Domain" value={state.domain ?? ""} onChange={domain => setState({
<InputTextBubble label="Domain" options={getDomainList()} value={state.domain} onChange={domain => setState({
...state,
domain
domain: domain ? domain[0] : "",
})} />
<InputText label="Type" value={state.type ?? ""} onChange={type => setState({
...state,
@@ -30,11 +25,11 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
...state,
subtype
})} />
<InputText label="Device" value={state.device_id ?? ""} onChange={device_id => setState({
<InputDevice value={state.device_id ?? ""} onChange={device_id => setState({
...state,
device_id
device_id: device_id ?? "",
})} />
<InputText label="Entity" value={state.entity_id ?? ""} onChange={entity_id => setState({
<InputEntity restrictToDomain={state.domain ? [state.domain] : undefined} value={state.entity_id ?? ""} multiple 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,13 +5,10 @@ import { InputList } from "components/Inputs/InputList";
export const TriggerHAState: OptionManager<AutomationTriggerHA> = {
defaultState: () => ({
"alias": "HA Starts",
"platform": "homeassistant",
"event": "start",
}),
isReady: ({ alias }) => {
return (alias !== '')
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputList
@@ -20,7 +17,6 @@ export const TriggerHAState: OptionManager<AutomationTriggerHA> = {
options={['start', 'shutdown']}
onChange={event => setState({
...state, event,
alias: event === 'shutdown' ? "HA Shutdown" : "HA Starts"
})}
/>
</>
@@ -5,15 +5,12 @@ import InputText from 'components/Inputs/InputText';
export const TriggerMQTTState: OptionManager<AutomationTriggerMQTT> = {
defaultState: () => ({
"alias": "",
"platform": "mqtt",
"payload": "",
"topic": "",
"value_template": ""
}),
isReady: ({ alias }) => {
return (alias !== '')
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputText
@@ -1,25 +1,23 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerNumericState } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputTextBubble';
import { InputEntity } from 'components/Inputs/InputEntities';
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: () => true,
renderOptionList: (state, setState) => {
return <>
<InputEntity
value={state.entity_id}
multiple
onChange={entity_id => setState({
...state,
entity_id
@@ -45,10 +43,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}
@@ -1,23 +1,21 @@
import { OptionManager } from './OptionManager';
import { AutomationTriggerState } from 'types/automations/triggers';
import InputText from 'components/Inputs/InputText';
import { InputEntity } from 'components/Inputs/InputTextBubble';
import { InputEntity } from 'components/Inputs/InputEntities';
import InputTime from 'components/Inputs/InputTime';
export const TriggerState: OptionManager<AutomationTriggerState> = {
defaultState: () => ({
"alias": "",
"platform": 'state',
"entity_id": "",
}),
isReady: ({ alias }) => {
return (alias !== '')
},
isReady: () => true,
renderOptionList: (state, setState) => {
return <>
<InputEntity
value={state.entity_id}
multiple
onChange={entity_id => setState({
...state,
entity_id
Loaded 100 of 139 files, more files were not shown because too many files have changed in this diff. Show more