Compare commits
17
Commits
v0.1.14
...
v0.1.16.pre2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bc773154c6 | ||
|
|
a530e5e6e0 | ||
|
|
1ad87c205d | ||
|
|
d45f72b168 | ||
|
|
0c7db09c32 | ||
|
|
2b1648eff2 | ||
|
|
06356b46e9 | ||
|
|
21fe64f4bf | ||
|
|
e22f64dd51 | ||
|
|
f1b24ec783 | ||
|
|
8a90b56ac3 | ||
|
|
7d111c853b | ||
|
|
0c72481729 | ||
|
|
996626f9af | ||
|
|
878035e748 | ||
|
|
cc930ee4ac | ||
|
|
169a2e9059 |
No files matched your search
@@ -2,3 +2,12 @@ webapp/node_modules
|
|||||||
webapp/build
|
webapp/build
|
||||||
webapp/.storybook
|
webapp/.storybook
|
||||||
webapp/.vscode
|
webapp/.vscode
|
||||||
|
webapp/.env.local
|
||||||
|
webapp/tmux.sh
|
||||||
|
api/.env
|
||||||
|
api/.coverage
|
||||||
|
api/venv
|
||||||
|
api/build
|
||||||
|
api/.mypy_cache
|
||||||
|
api/.vscode
|
||||||
|
api/.coverage
|
||||||
@@ -30,5 +30,4 @@ jobs:
|
|||||||
args: |
|
args: |
|
||||||
--${{ matrix.arch }} \
|
--${{ matrix.arch }} \
|
||||||
--version ${{ github.event.inputs.version }} \
|
--version ${{ github.event.inputs.version }} \
|
||||||
--additional-tag edge \
|
|
||||||
--target .
|
--target .
|
||||||
@@ -101,5 +101,4 @@ jobs:
|
|||||||
args: |
|
args: |
|
||||||
--${{ matrix.arch }} \
|
--${{ matrix.arch }} \
|
||||||
--version ${{ needs.metadata.outputs.version }} \
|
--version ${{ needs.metadata.outputs.version }} \
|
||||||
--additional-tag edge \
|
|
||||||
--target .
|
--target .
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
# Changelog
|
# Changelog 
|
||||||
|
|
||||||
## [0.1.14] - Material UI + Autocomplete v2
|
## [0.1.14] - Material UI + Autocomplete v2
|
||||||
|
|
||||||
|
|||||||
+4
-3
@@ -11,6 +11,7 @@ ARG BUILD_VERSION
|
|||||||
# <--- Environment Variables -->
|
# <--- Environment Variables -->
|
||||||
ENV HASSIO_TOKEN ""
|
ENV HASSIO_TOKEN ""
|
||||||
ENV BUILD_VERSION $BUILD_VERSION
|
ENV BUILD_VERSION $BUILD_VERSION
|
||||||
|
ENV HASS_URL "http://supervisor/"
|
||||||
|
|
||||||
# <--- System Wide Dependencies -->
|
# <--- System Wide Dependencies -->
|
||||||
ENV LANG C.UTF-8
|
ENV LANG C.UTF-8
|
||||||
@@ -39,8 +40,6 @@ RUN /app/bin/build.sh /app /app/web-builder
|
|||||||
|
|
||||||
# <--- Api Code -->
|
# <--- Api Code -->
|
||||||
COPY api/src /app/src
|
COPY api/src /app/src
|
||||||
COPY run.sh /app/run.sh
|
|
||||||
RUN chmod +x /app/run.sh
|
|
||||||
|
|
||||||
# <--- Ports -->
|
# <--- Ports -->
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
@@ -50,5 +49,7 @@ LABEL \
|
|||||||
io.hass.type="addon" \
|
io.hass.type="addon" \
|
||||||
io.hass.arch="armhf|aarch64|i386|amd64"
|
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
|
||||||
@@ -1,9 +1,29 @@
|
|||||||
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:
|
build:
|
||||||
$(DC) build
|
$(DC) build
|
||||||
|
|
||||||
run:
|
build-no-cache:
|
||||||
|
$(DC) build --no-cache
|
||||||
|
|
||||||
|
push:
|
||||||
|
$(DC) push
|
||||||
|
|
||||||
|
start:
|
||||||
$(MAKE) build
|
$(MAKE) build
|
||||||
$(DC) up -d
|
$(DC) up -d
|
||||||
sleep 1
|
sleep 1
|
||||||
@@ -18,3 +38,8 @@ ps:
|
|||||||
stop:
|
stop:
|
||||||
$(DC) stop
|
$(DC) stop
|
||||||
|
|
||||||
|
bash:
|
||||||
|
$(DC) exec addon bash
|
||||||
|
|
||||||
|
config:
|
||||||
|
$(DC) config
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
# Shortumation
|
# Shortumation 
|
||||||
|
|
||||||
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
||||||
|

|
||||||
|
| | Stable | amd64-edge | i386-edge | armv7-edge | aarch64-edge | armhf-edge |
|
||||||
|
| --- | --- | --- | --- | --- | --- | --- |
|
||||||
|
| Version |  |  |  |  |  |  |
|
||||||
|
|
||||||
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
||||||
|
|
||||||
|
|||||||
@@ -43,5 +43,4 @@ clean:
|
|||||||
run-local:
|
run-local:
|
||||||
rm -f web
|
rm -f web
|
||||||
ln -s ../webapp/build web
|
ln -s ../webapp/build web
|
||||||
cd ../webapp && yarn build
|
|
||||||
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
|
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
from datetime import datetime
|
|
||||||
|
|
||||||
from fastapi import APIRouter
|
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
|
from src.hass_config import HassConfig
|
||||||
|
|
||||||
|
|
||||||
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
|||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
@router.get("/")
|
@router.get("/")
|
||||||
def read_ping():
|
def read_details():
|
||||||
return {
|
return {
|
||||||
"version": BUILD_VERSION,
|
"version": BUILD_VERSION,
|
||||||
|
"hassio_token": HASSIO_TOKEN,
|
||||||
|
"hass_url": HASS_URL,
|
||||||
"config": hass_config.get_configuration_path(),
|
"config": hass_config.get_configuration_path(),
|
||||||
"tags": hass_config.get_automation_tags_path(),
|
"tags": hass_config.get_automation_tags_path(),
|
||||||
"autos": hass_config.get_automation_path(),
|
"autos": hass_config.get_automation_path(),
|
||||||
|
|||||||
@@ -4,5 +4,7 @@ from decouple import Csv, config
|
|||||||
|
|
||||||
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
||||||
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
||||||
|
HASSIO_TOKEN = config("HASSIO_TOKEN", "")
|
||||||
|
HASS_URL = config("HASS_URL", "/")
|
||||||
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
||||||
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||||
+5
-6
@@ -1,7 +1,7 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: v0.1.14
|
version: v0.1.14
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
image: asosnovsky/shortumation-{arch}
|
image: ghcr.io/asosnovsky/shortumation-{arch}
|
||||||
url: "https://github.com/asosnovsky/Shortumation"
|
url: "https://github.com/asosnovsky/Shortumation"
|
||||||
description: "A homeassitant addon which provides better UI for automations & scripts."
|
description: "A homeassitant addon which provides better UI for automations & scripts."
|
||||||
arch:
|
arch:
|
||||||
@@ -16,12 +16,11 @@ init: false
|
|||||||
ingress: true
|
ingress: true
|
||||||
ingress_port: 8000
|
ingress_port: 8000
|
||||||
ingress_entry: "web/"
|
ingress_entry: "web/"
|
||||||
panel_icon: mdi:home-automation
|
homeassistant_api: true
|
||||||
hassio_role: manager
|
|
||||||
privileged:
|
|
||||||
- SYS_RAWIO
|
|
||||||
host_network: false
|
|
||||||
auth_api: true
|
auth_api: true
|
||||||
|
panel_icon: mdi:home-automation
|
||||||
|
hassio_role: homeassistant
|
||||||
|
host_network: false
|
||||||
map:
|
map:
|
||||||
- config:rw
|
- config:rw
|
||||||
options: {}
|
options: {}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
addon:
|
addon:
|
||||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
|
image: "ghcr.io/asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
|
||||||
build:
|
build:
|
||||||
context: "./"
|
context: "./"
|
||||||
dockerfile: "./Dockerfile"
|
dockerfile: "./Dockerfile"
|
||||||
args:
|
args:
|
||||||
BUILD_ARCH: ${ARCH:-amd64}
|
BUILD_ARCH: ${ARCH:-amd64}
|
||||||
BUILD_VERSION: ${BUILD_TAG:-latest}
|
BUILD_VERSION: ${BUILD_TAG:-edge}
|
||||||
@@ -3,5 +3,8 @@ services:
|
|||||||
addon:
|
addon:
|
||||||
volumes:
|
volumes:
|
||||||
- "./sample_config:/config"
|
- "./sample_config:/config"
|
||||||
|
- "./api/tests:/app/tests"
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
|
env_file:
|
||||||
|
- api/.env
|
||||||
Executable
+10
@@ -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
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo $(python --version)
|
|
||||||
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
0:
|
0:
|
||||||
Type: Generic
|
Type: Generic2
|
||||||
1:
|
1:
|
||||||
Type: Generic
|
Type: Generic
|
||||||
2:
|
2:
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
SKIP_PREFLIGHT_CHECK=true
|
SKIP_PREFLIGHT_CHECK=true
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
|
'core': {
|
||||||
|
builder: 'webpack5'
|
||||||
|
},
|
||||||
"stories": [
|
"stories": [
|
||||||
"../src/**/*.stories.mdx",
|
"../src/**/*.stories.mdx",
|
||||||
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
||||||
|
|||||||
+23
-13
@@ -8,22 +8,27 @@
|
|||||||
"@emotion/styled": "^11.8.1",
|
"@emotion/styled": "^11.8.1",
|
||||||
"@mui/material": "^5.8.0",
|
"@mui/material": "^5.8.0",
|
||||||
"@mui/styles": "^5.8.0",
|
"@mui/styles": "^5.8.0",
|
||||||
"@types/jest": "^26.0.15",
|
"@types/jest": "^27.5.1",
|
||||||
"@types/node": "^12.0.0",
|
"@types/node": "^17.0.36",
|
||||||
"@types/react": "^17.0.0",
|
"@types/react": "^18.0.9",
|
||||||
"@types/react-dom": "^17.0.0",
|
"@types/react-dom": "^18.0.5",
|
||||||
|
"@types/ws": "^8.5.3",
|
||||||
"@uiw/react-codemirror": "^4.7.0",
|
"@uiw/react-codemirror": "^4.7.0",
|
||||||
|
"autosuggest-highlight": "^3.2.1",
|
||||||
|
"home-assistant-js-websocket": "^7.1.0",
|
||||||
"jss": "^10.8.2",
|
"jss": "^10.8.2",
|
||||||
"react": "^17.0.2",
|
"notistack": "^2.0.5",
|
||||||
"react-dom": "^17.0.2",
|
"react": "^18.1.0",
|
||||||
|
"react-dom": "^18.1.0",
|
||||||
"react-flow-renderer": "^10.1.2",
|
"react-flow-renderer": "^10.1.2",
|
||||||
"react-jss": "^10.8.2",
|
"react-jss": "^10.8.2",
|
||||||
"react-router-dom": "6",
|
"react-router-dom": "6",
|
||||||
"react-scripts": "4.0.3",
|
"react-scripts": "5.0.1",
|
||||||
"superstruct": "^0.15.4",
|
"superstruct": "^0.15.4",
|
||||||
"theming": "^3.3.0",
|
"theming": "^3.3.0",
|
||||||
"typescript": "^4.1.2",
|
"typescript": "^4.1.2",
|
||||||
"web-vitals": "^1.0.1",
|
"web-vitals": "^2.1.4",
|
||||||
|
"ws": "^8.7.0",
|
||||||
"yarn": "^1.22.17"
|
"yarn": "^1.22.17"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -71,16 +76,21 @@
|
|||||||
"@storybook/addon-essentials": "^6.4.22",
|
"@storybook/addon-essentials": "^6.4.22",
|
||||||
"@storybook/addon-links": "^6.4.22",
|
"@storybook/addon-links": "^6.4.22",
|
||||||
"@storybook/addon-queryparams": "^6.2.9",
|
"@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/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",
|
"@storybook/react": "^6.4.22",
|
||||||
"@testing-library/jest-dom": "^5.11.4",
|
"@testing-library/jest-dom": "^5.11.4",
|
||||||
"@testing-library/react": "^11.1.0",
|
"@testing-library/react": "^13.3.0",
|
||||||
"@testing-library/user-event": "^12.1.10",
|
"@testing-library/user-event": "^14.2.0",
|
||||||
|
"@types/autosuggest-highlight": "^3.2.0",
|
||||||
"@types/chroma-js": "^2.1.3",
|
"@types/chroma-js": "^2.1.3",
|
||||||
"@types/js-yaml": "^4.0.5",
|
"@types/js-yaml": "^4.0.5",
|
||||||
"jest-environment-jsdom": "^27.5.1",
|
"jest-environment-jsdom": "^28.1.0",
|
||||||
"ts-node": "^10.4.0"
|
"ts-node": "^10.8.0",
|
||||||
|
"webpack": "^5.72.1",
|
||||||
|
"webpack-dev-server": "^4.9.0"
|
||||||
},
|
},
|
||||||
"moduleDirectories": [
|
"moduleDirectories": [
|
||||||
"node_modules",
|
"node_modules",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { ErrorBoundary } from 'components/ErrorBoundary';
|
|||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const api = useConnectedApiService();
|
const api = useConnectedApiService();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="app">
|
<div className="app">
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
|
|||||||
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
|
|||||||
data = {}
|
data = {}
|
||||||
}) {
|
}) {
|
||||||
try {
|
try {
|
||||||
const reply = await fetch(baseURL + path, {
|
const payload: RequestInit = {
|
||||||
method,
|
method,
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json"
|
"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>;
|
let response: APIResponse<any>;
|
||||||
if (reply.status === 200) {
|
if (reply.status === 200) {
|
||||||
response = {
|
response = {
|
||||||
|
|||||||
@@ -5,13 +5,18 @@ import { useAPIService } from './core';
|
|||||||
import { useMockAPI } from "./mock";
|
import { useMockAPI } from "./mock";
|
||||||
|
|
||||||
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
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(
|
export const useConnectedApiService = () => useAPIService(
|
||||||
makeAutomationAPI(makeRemoteAPI(
|
makeAutomationAPI(remoteAutoAPI)
|
||||||
process.env.NODE_ENV === 'development' ?
|
|
||||||
"http://localhost:8000/automations" :
|
|
||||||
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
||||||
makeAutomationAPI(useMockAPI(initialAutos))
|
makeAutomationAPI(useMockAPI(initialAutos))
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export interface ListParams {
|
|||||||
}
|
}
|
||||||
export type APIRequest<D> = {
|
export type APIRequest<D> = {
|
||||||
path: string;
|
path: string;
|
||||||
method?: "POST" | "DELETE",
|
method?: "POST" | "DELETE" | "GET",
|
||||||
data?: D;
|
data?: D;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import "./AutoInfoBox.css";
|
|||||||
import { AutomationMetadata } from "types/automations";
|
import { AutomationMetadata } from "types/automations";
|
||||||
import { InputList } from "components/Inputs/InputList";
|
import { InputList } from "components/Inputs/InputList";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { FC, useRef, useState } from 'react';
|
import { FC, ReactNode, useRef, useState } from 'react';
|
||||||
import { AddIcon, TrashIcon } from "components/Icons";
|
import { AddIcon, TrashIcon } from "components/Icons";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
import InputAutoText from "components/Inputs/InputAutoText";
|
import InputAutoText from "components/Inputs/InputAutoText";
|
||||||
@@ -14,6 +14,7 @@ interface Props {
|
|||||||
tags: Array<[string, string]>;
|
tags: Array<[string, string]>;
|
||||||
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
||||||
tagDB: TagDB;
|
tagDB: TagDB;
|
||||||
|
children?: ReactNode;
|
||||||
}
|
}
|
||||||
export const AutoInfoBox: FC<Props> = ({
|
export const AutoInfoBox: FC<Props> = ({
|
||||||
metadata,
|
metadata,
|
||||||
@@ -102,7 +103,7 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
<div className="automation-editor--info-box--tags">
|
<div className="automation-editor--info-box--tags">
|
||||||
<h1>Tags</h1>
|
<h1>Tags</h1>
|
||||||
<div className="automation-editor--info-box--tag-list">
|
<div className="automation-editor--info-box--tag-list">
|
||||||
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
{tags.map(([tagName, tagValue], tagIndex) => <div key={tagIndex} className="automation-editor--info-box--tag">
|
||||||
<InputAutoText
|
<InputAutoText
|
||||||
value={tagName}
|
value={tagName}
|
||||||
label="Name"
|
label="Name"
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
.automation-editor {
|
.automation-editor {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
position: relative;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@@ -74,4 +75,26 @@
|
|||||||
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
z-index: 2;
|
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%;
|
||||||
}
|
}
|
||||||
@@ -21,7 +21,7 @@ const Template: ComponentStory<typeof AutomationEditor> = args => {
|
|||||||
return <Page>
|
return <Page>
|
||||||
<AutomationEditor
|
<AutomationEditor
|
||||||
{...args}
|
{...args}
|
||||||
tagDB={makeTagDB([state as any])}
|
tagDB={makeTagDB(state ? [state] : [])}
|
||||||
automation={state}
|
automation={state}
|
||||||
onUpdate={s => {
|
onUpdate={s => {
|
||||||
window.setTimeout(() => setState(s), 3000)
|
window.setTimeout(() => setState(s), 3000)
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
|||||||
import { MiniFailure } from 'types/validators/helper';
|
import { MiniFailure } from 'types/validators/helper';
|
||||||
import InputYaml from "components/Inputs/InputYaml";
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
import { TagDB } from "components/AutomationList/TagDB";
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
import Skeleton from "@mui/material/Skeleton";
|
||||||
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
automation?: AutomationData;
|
automation?: AutomationData;
|
||||||
@@ -41,7 +43,9 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
// render
|
// render
|
||||||
if (state.status === 'loading') {
|
if (state.status === 'loading') {
|
||||||
return <div className="automation-editor 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>
|
</div>
|
||||||
}
|
}
|
||||||
if (state.status === 'invalid') {
|
if (state.status === 'invalid') {
|
||||||
@@ -53,6 +57,7 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
return <div className="automation-editor">
|
return <div className="automation-editor">
|
||||||
|
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
|
||||||
<AutoInfoBox
|
<AutoInfoBox
|
||||||
className={closeInfo ? "hide" : "show"}
|
className={closeInfo ? "hide" : "show"}
|
||||||
metadata={state.data.metadata}
|
metadata={state.data.metadata}
|
||||||
@@ -64,7 +69,8 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
className="automation-editor--info-box--icon"
|
className="automation-editor--info-box--icon"
|
||||||
onClick={() => setCloseInfo(!closeInfo)}
|
onClick={() => setCloseInfo(!closeInfo)}
|
||||||
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
||||||
>{ArrowIcon}</ButtonIcon>
|
Icon={ArrowIcon}
|
||||||
|
/>
|
||||||
</AutoInfoBox>
|
</AutoInfoBox>
|
||||||
|
|
||||||
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
<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 EditorData = ReturnType<typeof genEditorData>;
|
||||||
export type EditorState = {
|
export type EditorState = {
|
||||||
status: 'unchanged' | 'changed',
|
status: 'unchanged' | 'changed' | 'saving',
|
||||||
data: EditorData
|
data: EditorData
|
||||||
} | {
|
} | {
|
||||||
status: 'loading'
|
status: 'loading'
|
||||||
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
|
|||||||
}), {})
|
}), {})
|
||||||
};
|
};
|
||||||
update({
|
update({
|
||||||
status: "loading",
|
status: "saving",
|
||||||
|
data,
|
||||||
})
|
})
|
||||||
onSave(cleanData);
|
onSave(cleanData);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -140,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,
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import "./AutomationListBox.css";
|
import "./AutomationListBox.css";
|
||||||
import { FC, useState } from 'react';
|
import { FC, useState } from 'react';
|
||||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
|
|||||||
@@ -45,3 +45,20 @@ FewAutos.args = {
|
|||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const Loading: ComponentStory<any> = args => {
|
||||||
|
const api = useMockApiService(args.initialAutomations);
|
||||||
|
return <Page>
|
||||||
|
<ConnectedAutomationList
|
||||||
|
{...args}
|
||||||
|
api={{
|
||||||
|
...api,
|
||||||
|
state: {
|
||||||
|
"automations": {
|
||||||
|
"ready": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
}
|
||||||
@@ -18,6 +18,25 @@
|
|||||||
flex: 1;
|
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 */
|
/* list children: on hide */
|
||||||
.automation-list--list.hide>.automation-list-box {
|
.automation-list--list.hide>.automation-list-box {
|
||||||
width: 0;
|
width: 0;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import "./index.mobile.css";
|
import "./index.mobile.css";
|
||||||
import { AutomationEditor } from "components/AutomationEditor";
|
import { AutomationEditor } from "components/AutomationEditor";
|
||||||
import { FC, useState } from "react";
|
import { FC, ReactNode, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { defaultAutomation } from 'utils/defaults';
|
import { defaultAutomation } from 'utils/defaults';
|
||||||
import { ArrowIcon } from "components/Icons";
|
import { ArrowIcon } from "components/Icons";
|
||||||
@@ -11,6 +11,8 @@ import { AutomationListBox } from "./AutomationListBox";
|
|||||||
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
||||||
import useWindowSize from "utils/useWindowSize";
|
import useWindowSize from "utils/useWindowSize";
|
||||||
import { makeTagDB } from "./TagDB";
|
import { makeTagDB } from "./TagDB";
|
||||||
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
|
import CircularProgress from "@mui/material/CircularProgress";
|
||||||
|
|
||||||
|
|
||||||
interface AutomationListParams {
|
interface AutomationListParams {
|
||||||
@@ -19,6 +21,7 @@ interface AutomationListParams {
|
|||||||
onAdd: (auto: AutomationData) => void;
|
onAdd: (auto: AutomationData) => void;
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
dims: DAGAutomationFlowDims;
|
dims: DAGAutomationFlowDims;
|
||||||
|
children?: ReactNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const AutomationList: FC<AutomationListParams> = ({
|
export const AutomationList: FC<AutomationListParams> = ({
|
||||||
@@ -57,9 +60,8 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
<ButtonIcon
|
<ButtonIcon
|
||||||
onClick={() => setHideList(!hideList)}
|
onClick={() => setHideList(!hideList)}
|
||||||
className="automation-list--list-hide"
|
className="automation-list--list-hide"
|
||||||
>
|
Icon={ArrowIcon}
|
||||||
{ArrowIcon}
|
/>
|
||||||
</ButtonIcon>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list--viewer">
|
<div className="automation-list--viewer">
|
||||||
{currentAuto ? <AutomationEditor
|
{currentAuto ? <AutomationEditor
|
||||||
@@ -88,7 +90,12 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
|||||||
dims
|
dims
|
||||||
}) => {
|
}) => {
|
||||||
if (!automations.ready) {
|
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) {
|
if (!automations.ok) {
|
||||||
return <span>Error {automations.error}</span>
|
return <span>Error {automations.error}</span>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import InputYaml from "components/Inputs/InputYaml";
|
|||||||
import { getEditor } from "./editorRender";
|
import { getEditor } from "./editorRender";
|
||||||
import { useStyles } from "./style";
|
import { useStyles } from "./style";
|
||||||
import { getViewer } from "./viewRender";
|
import { getViewer } from "./viewRender";
|
||||||
|
import useWindowSize from "utils/useWindowSize";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -31,6 +32,7 @@ export const ConditionNode: FC<{
|
|||||||
// state
|
// state
|
||||||
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
||||||
const [yamlMode, setYamlMode] = useState(false);
|
const [yamlMode, setYamlMode] = useState(false);
|
||||||
|
const { isMobile } = useWindowSize();
|
||||||
// alias
|
// alias
|
||||||
const effectiveDM = internalDisplayMode || yamlMode;
|
const effectiveDM = internalDisplayMode || yamlMode;
|
||||||
// effect
|
// effect
|
||||||
@@ -76,54 +78,56 @@ export const ConditionNode: FC<{
|
|||||||
} else if (condition.condition === 'or') {
|
} else if (condition.condition === 'or') {
|
||||||
hasChildren = true
|
hasChildren = true
|
||||||
}
|
}
|
||||||
const { classes } = useStyles({ hasChildren });
|
const { classes } = useStyles({ hasChildren, isMobile });
|
||||||
|
|
||||||
// components
|
// components
|
||||||
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
|
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
|
||||||
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
||||||
|
|
||||||
return <div className={classes.root}>
|
return <div className={classes.root}>
|
||||||
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
<>
|
||||||
<div className={classes.title}>
|
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
||||||
<InputList
|
<div className={classes.title}>
|
||||||
label=""
|
<InputList
|
||||||
className={classes.titleText}
|
label=""
|
||||||
current={condition.condition}
|
className={classes.titleText}
|
||||||
options={[
|
current={condition.condition}
|
||||||
'or', 'not', 'and',
|
options={[
|
||||||
'template',
|
'or', 'not', 'and',
|
||||||
'numeric_state',
|
'template',
|
||||||
'state',
|
'numeric_state',
|
||||||
'time',
|
'state',
|
||||||
'trigger',
|
'time',
|
||||||
'zone',
|
'trigger',
|
||||||
]}
|
'zone',
|
||||||
onChange={(n: any) => onUpdate({
|
]}
|
||||||
...getConditionDefaultValues(n),
|
onChange={(n: any) => onUpdate({
|
||||||
...condition,
|
...getConditionDefaultValues(n),
|
||||||
condition: n,
|
...condition,
|
||||||
} as any)}
|
condition: n,
|
||||||
/>
|
} as any)}
|
||||||
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
/>
|
||||||
{yamlMode ? 'visual' : 'yaml'}
|
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
||||||
</button>}
|
{yamlMode ? 'visual' : 'yaml'}
|
||||||
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
</button>}
|
||||||
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
||||||
</button>}
|
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
||||||
</div>
|
</button>}
|
||||||
<div className={classes.children}>
|
|
||||||
{yamlMode && <InputYaml
|
|
||||||
label=""
|
|
||||||
value={condition}
|
|
||||||
onChange={update => onUpdate(update as any)}
|
|
||||||
/>}
|
|
||||||
<div className={classes.conditionWrap}>
|
|
||||||
{!yamlMode && childrenConditions}
|
|
||||||
</div>
|
</div>
|
||||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
<div className={classes.children}>
|
||||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
{yamlMode && <InputYaml
|
||||||
</div>}
|
label=""
|
||||||
</div>
|
value={condition}
|
||||||
{children({ classes })}
|
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>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@ import { FC } from "react";
|
|||||||
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
|
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
|
||||||
import InputNumber from "components/Inputs/InputNumber";
|
import InputNumber from "components/Inputs/InputNumber";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { InputEntity } from "components/Inputs/InputTextBubble";
|
import { InputEntity } from "components/Inputs/InputEntities";
|
||||||
import { ConditionNode } from "./ConditionNode";
|
import { ConditionNode } from "./ConditionNode";
|
||||||
import { genUpdateMethods } from "./nestedUpdater";
|
import { genUpdateMethods } from "./nestedUpdater";
|
||||||
import InputTime from "components/Inputs/InputTime";
|
import InputTime from "components/Inputs/InputTime";
|
||||||
@@ -60,6 +60,7 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
|||||||
return <>
|
return <>
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.entity_id}
|
value={condition.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
entity_id
|
entity_id
|
||||||
@@ -120,6 +121,7 @@ export const StateEditor: Editor<StateCondition> = ({
|
|||||||
return <>
|
return <>
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.entity_id}
|
value={condition.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
entity_id
|
entity_id
|
||||||
@@ -196,6 +198,7 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
|
|||||||
})} />
|
})} />
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.entity_id}
|
value={condition.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
entity_id
|
entity_id
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ import { Styles } from "jss";
|
|||||||
import { createAppUseStyles } from "styles/theme";
|
import { createAppUseStyles } from "styles/theme";
|
||||||
|
|
||||||
export const useStyles = createAppUseStyles<{
|
export const useStyles = createAppUseStyles<{
|
||||||
hasChildren: boolean
|
hasChildren: boolean,
|
||||||
|
isMobile: boolean,
|
||||||
}>(theme => {
|
}>(theme => {
|
||||||
const deleteBtn: Styles = {
|
const deleteBtn: Styles = {
|
||||||
borderRadius: '10px',
|
borderRadius: '10px',
|
||||||
@@ -20,12 +21,12 @@ export const useStyles = createAppUseStyles<{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
root: ({ hasChildren }) => ({
|
root: ({ hasChildren, isMobile }) => ({
|
||||||
background: theme.primary,
|
background: theme.primary,
|
||||||
padding: 0,
|
padding: 0,
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: hasChildren ? 'column' : 'row',
|
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
|
||||||
}),
|
}),
|
||||||
title: ({ hasChildren }) => ({
|
title: ({ hasChildren }) => ({
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { Component, ErrorInfo } from "react";
|
import { Component, ErrorInfo, ReactNode } from "react";
|
||||||
|
|
||||||
type State = {
|
type State = {
|
||||||
hasError: false;
|
hasError: false;
|
||||||
@@ -8,7 +8,9 @@ type State = {
|
|||||||
error: any,
|
error: any,
|
||||||
errorInfo?: ErrorInfo,
|
errorInfo?: ErrorInfo,
|
||||||
}
|
}
|
||||||
export class ErrorBoundary extends Component<{}, State> {
|
export class ErrorBoundary extends Component<{
|
||||||
|
children: ReactNode
|
||||||
|
}, State> {
|
||||||
|
|
||||||
state: State = {
|
state: State = {
|
||||||
hasError: false
|
hasError: false
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { createAppUseStyles } from 'styles/theme';
|
|||||||
export interface ButtonIconStyleProps {
|
export interface ButtonIconStyleProps {
|
||||||
}
|
}
|
||||||
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
|
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
|
||||||
children: FC<IconBaseProps>;
|
Icon: FC<IconBaseProps>;
|
||||||
}
|
}
|
||||||
const useButtonIconStyles = createAppUseStyles(theme => ({
|
const useButtonIconStyles = createAppUseStyles(theme => ({
|
||||||
buttonIcon: {
|
buttonIcon: {
|
||||||
@@ -22,9 +22,9 @@ const useButtonIconStyles = createAppUseStyles(theme => ({
|
|||||||
|
|
||||||
|
|
||||||
export const ButtonIcon: FC<ButtonIconProps> = ({
|
export const ButtonIcon: FC<ButtonIconProps> = ({
|
||||||
children: Child,
|
Icon,
|
||||||
className,
|
className,
|
||||||
...props
|
...props
|
||||||
}) => <Child
|
}) => <Icon
|
||||||
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
|
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
|
||||||
/>
|
/>
|
||||||
@@ -32,7 +32,7 @@ IconList.args = {
|
|||||||
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
|
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
|
||||||
|
|
||||||
return <Page>
|
return <Page>
|
||||||
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon>
|
<ButtonIcon {...args} Icon={ArrowIcon} />
|
||||||
</Page>
|
</Page>
|
||||||
}
|
}
|
||||||
ButtonIconExample.args = {
|
ButtonIconExample.args = {
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -49,26 +49,4 @@ export const InputList: FC<Props<any>> = ({
|
|||||||
</Select>
|
</Select>
|
||||||
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText>
|
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
// return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}>
|
|
||||||
// <select
|
|
||||||
// title={invalidCurrent ? "Invalid Selection" : ""}
|
|
||||||
// className={classes.input}
|
|
||||||
// {...selattr} value={current}
|
|
||||||
// onChange={e => {
|
|
||||||
// e.preventDefault();
|
|
||||||
// if (e.currentTarget.id === 'invalid') {
|
|
||||||
// onChange(options[0])
|
|
||||||
// } else {
|
|
||||||
// onChange(e.currentTarget.value as any);
|
|
||||||
// }
|
|
||||||
// }}
|
|
||||||
// >
|
|
||||||
// {options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
|
|
||||||
// {invalidCurrent ? <option
|
|
||||||
// id={'invalid'}
|
|
||||||
// value={current}
|
|
||||||
// style={{ display: 'none' }}
|
|
||||||
// >!{current}!</option> : <></>}
|
|
||||||
// </select>
|
|
||||||
// </InputWrapper>
|
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|||||||
import { Page } from "components/Page";
|
import { Page } from "components/Page";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
|
|
||||||
import InputTextBubble, { InputEntity } from "./InputTextBubble";
|
import InputTextBubble from "./InputTextBubble";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'Inputs/InputTextBubble',
|
title: 'Inputs/InputTextBubble',
|
||||||
@@ -34,16 +34,6 @@ export const JustText: ComponentStory<typeof InputTextBubble> = args => {
|
|||||||
</Page>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export const EntityId: ComponentStory<typeof InputTextBubble> = args => {
|
|
||||||
|
|
||||||
const [value, setValue] = useState<string | string[]>(['sensor.bathroom'])
|
|
||||||
return <Page>
|
|
||||||
<InputEntity value={value} onChange={setValue} />
|
|
||||||
</Page>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const ManyOptions: ComponentStory<typeof InputTextBubble> = args => {
|
export const ManyOptions: ComponentStory<typeof InputTextBubble> = args => {
|
||||||
|
|
||||||
const [value, setValue] = useState<string | string[]>('hello')
|
const [value, setValue] = useState<string | string[]>('hello')
|
||||||
|
|||||||
@@ -1,32 +1,39 @@
|
|||||||
import Chip from "@mui/material/Chip";
|
import Chip from "@mui/material/Chip";
|
||||||
import TextField from "@mui/material/TextField";
|
import TextField from "@mui/material/TextField";
|
||||||
import Autocomplete from "@mui/material/Autocomplete";
|
import Autocomplete from "@mui/material/Autocomplete";
|
||||||
import { FC } from "react";
|
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
label: string;
|
label: string;
|
||||||
value: string | string[];
|
value?: string | string[];
|
||||||
options?: string[];
|
options?: string[];
|
||||||
onChange: (v: string[]) => void;
|
onChange: (v: string[]) => void;
|
||||||
|
maxAllowed?: number;
|
||||||
}
|
}
|
||||||
export default function InputTextBubble({
|
export default function InputTextBubble({
|
||||||
value = "",
|
value = "",
|
||||||
label,
|
label,
|
||||||
options = [],
|
options = [],
|
||||||
onChange,
|
onChange,
|
||||||
|
maxAllowed,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
|
|
||||||
const selected = Array.isArray(value) ? value : [value];
|
const selected = Array.isArray(value) ? value : value ? [value] : [];
|
||||||
|
|
||||||
return <Autocomplete
|
return <Autocomplete
|
||||||
multiple
|
multiple
|
||||||
freeSolo
|
freeSolo
|
||||||
value={selected}
|
value={selected}
|
||||||
options={options}
|
options={options}
|
||||||
onChange={(_e, v) => onChange(
|
onChange={(_e, v) => {
|
||||||
v === null ? [] :
|
let cleanValue = v === null ? [] :
|
||||||
Array.isArray(v) ? v : [v]
|
Array.isArray(v) ? v : [v]
|
||||||
)}
|
|
||||||
|
if (maxAllowed) {
|
||||||
|
cleanValue = cleanValue.slice(0, maxAllowed);
|
||||||
|
}
|
||||||
|
|
||||||
|
onChange(cleanValue)
|
||||||
|
}}
|
||||||
renderInput={params => <TextField
|
renderInput={params => <TextField
|
||||||
{...params}
|
{...params}
|
||||||
variant="filled"
|
variant="filled"
|
||||||
@@ -42,15 +49,3 @@ export default function InputTextBubble({
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const InputEntity: FC<{
|
|
||||||
value: string | string[];
|
|
||||||
onChange: (v: string[]) => void;
|
|
||||||
}> = ({
|
|
||||||
value,
|
|
||||||
onChange,
|
|
||||||
}) => <InputTextBubble
|
|
||||||
value={value}
|
|
||||||
onChange={onChange}
|
|
||||||
label="Entity ID"
|
|
||||||
/>
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { FC } from "react";
|
import { FC, ReactNode } from "react";
|
||||||
import { useInputWrapperStyles } from "./styles";
|
import { useInputWrapperStyles } from "./styles";
|
||||||
|
|
||||||
|
|
||||||
@@ -8,6 +8,7 @@ export interface Props {
|
|||||||
noMargin?: boolean;
|
noMargin?: boolean;
|
||||||
className?: string;
|
className?: string;
|
||||||
error?: string;
|
error?: string;
|
||||||
|
children: ReactNode;
|
||||||
}
|
}
|
||||||
const InputWrapper: FC<Props> = ({ error, label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
|
const InputWrapper: FC<Props> = ({ error, label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
|
||||||
const { classes } = useInputWrapperStyles({ labelSize, noMargin, hasError: !!error })
|
const { classes } = useInputWrapperStyles({ labelSize, noMargin, hasError: !!error })
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -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: "/ ";
|
||||||
|
}
|
||||||
@@ -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>
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
import { FC } from "react";
|
import { FC, ReactNode } from "react";
|
||||||
import { createAppUseStyles } from "styles/theme";
|
import { createAppUseStyles } from "styles/theme";
|
||||||
|
|
||||||
export interface ModalStyleProps {
|
export interface ModalStyleProps {
|
||||||
open: boolean;
|
open: boolean;
|
||||||
}
|
}
|
||||||
export interface Props extends ModalStyleProps {
|
export interface Props extends ModalStyleProps {
|
||||||
|
children: ReactNode;
|
||||||
}
|
}
|
||||||
const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
|
const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
|
||||||
root: ({ open }) => ({
|
root: ({ open }) => ({
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { InputDevice } from "components/Inputs/InputDevice";
|
||||||
|
import { InputEntity } from "components/Inputs/InputEntities";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { DeviceAction } from "types/automations/actions";
|
import { DeviceAction } from "types/automations/actions";
|
||||||
import { OptionManager, updateActionData } from './OptionManager';
|
import { OptionManager, updateActionData } from './OptionManager';
|
||||||
@@ -6,44 +8,28 @@ import { OptionManager, updateActionData } from './OptionManager';
|
|||||||
export const ActionDeviceState: OptionManager<DeviceAction> = {
|
export const ActionDeviceState: OptionManager<DeviceAction> = {
|
||||||
defaultState: () => ({
|
defaultState: () => ({
|
||||||
alias: "",
|
alias: "",
|
||||||
type: "",
|
device_id: ""
|
||||||
entity_id: "",
|
|
||||||
device_id: "",
|
|
||||||
domain: "",
|
|
||||||
}),
|
}),
|
||||||
isReady: ({
|
isReady: () => true,
|
||||||
alias,
|
renderOptionList: (state, setState, entities) => {
|
||||||
type,
|
|
||||||
entity_id,
|
|
||||||
device_id,
|
|
||||||
domain,
|
|
||||||
}) => (
|
|
||||||
alias !== '' &&
|
|
||||||
type !== "" &&
|
|
||||||
entity_id !== "" &&
|
|
||||||
device_id !== "" &&
|
|
||||||
domain !== ""
|
|
||||||
),
|
|
||||||
renderOptionList: (state, setState) => {
|
|
||||||
const update = updateActionData(state, setState);
|
const update = updateActionData(state, setState);
|
||||||
return <>
|
return <>
|
||||||
<InputText
|
<InputDevice
|
||||||
textBoxFor="device_id"
|
value={state.device_id ?? ""}
|
||||||
label="Device"
|
onChange={device_id => update({ device_id: device_id ?? "" })}
|
||||||
value={state.device_id}
|
|
||||||
onChange={device_id => update({ device_id })}
|
|
||||||
/>
|
/>
|
||||||
<InputText
|
<InputText
|
||||||
textBoxFor="type"
|
textBoxFor="type"
|
||||||
label="Action"
|
label="Action"
|
||||||
value={state.type}
|
value={state.type ?? ""}
|
||||||
onChange={type => update({ type })}
|
onChange={type => update({ type })}
|
||||||
/>
|
/>
|
||||||
<InputText
|
<InputEntity
|
||||||
textBoxFor="entity_id"
|
|
||||||
label="Entity ID"
|
|
||||||
value={state.entity_id ?? ""}
|
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] : ""
|
||||||
|
})}
|
||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
|
import { HAEntitiesState } from 'haService';
|
||||||
import { AutomationAction } from 'types/automations/actions';
|
import { AutomationAction } from 'types/automations/actions';
|
||||||
import { AutomationCondition } from 'types/automations/conditions';
|
import { AutomationCondition } from 'types/automations/conditions';
|
||||||
export interface OptionManager<T> {
|
export interface OptionManager<T> {
|
||||||
defaultState(): T;
|
defaultState(): T;
|
||||||
isReady(s: T): boolean;
|
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 { OptionManager } from './OptionManager';
|
||||||
import { AutomationTriggerDevice } from 'types/automations/triggers';
|
import { AutomationTriggerDevice } from 'types/automations/triggers';
|
||||||
import InputText from 'components/Inputs/InputText';
|
import InputText from 'components/Inputs/InputText';
|
||||||
import { InputEntity } from 'components/Inputs/InputTextBubble';
|
import { InputEntity } from 'components/Inputs/InputEntities';
|
||||||
|
import InputTextBubble from 'components/Inputs/InputTextBubble';
|
||||||
|
import { InputDevice } from 'components/Inputs/InputDevice';
|
||||||
|
|
||||||
|
|
||||||
export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
||||||
defaultState: () => ({
|
defaultState: () => ({
|
||||||
"platform": 'device',
|
"platform": 'device',
|
||||||
"domain": "",
|
|
||||||
"type": "",
|
|
||||||
"subtype": "",
|
|
||||||
"device_id": "",
|
|
||||||
"entity_id": "",
|
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
renderOptionList: (state, setState, { getDomainList }) => {
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
|
||||||
return <>
|
return <>
|
||||||
<InputText label="Domain" value={state.domain ?? ""} onChange={domain => setState({
|
<InputTextBubble label="Domain" options={getDomainList()} value={state.domain} onChange={domain => setState({
|
||||||
...state,
|
...state,
|
||||||
domain
|
domain: domain ? domain[0] : "",
|
||||||
})} />
|
})} />
|
||||||
<InputText label="Type" value={state.type ?? ""} onChange={type => setState({
|
<InputText label="Type" value={state.type ?? ""} onChange={type => setState({
|
||||||
...state,
|
...state,
|
||||||
@@ -30,11 +25,11 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
|
|||||||
...state,
|
...state,
|
||||||
subtype
|
subtype
|
||||||
})} />
|
})} />
|
||||||
<InputText label="Device" value={state.device_id ?? ""} onChange={device_id => setState({
|
<InputDevice value={state.device_id ?? ""} onChange={device_id => setState({
|
||||||
...state,
|
...state,
|
||||||
device_id
|
device_id: device_id ?? "",
|
||||||
})} />
|
})} />
|
||||||
<InputEntity 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,
|
...state,
|
||||||
entity_id
|
entity_id
|
||||||
})} />
|
})} />
|
||||||
|
|||||||
@@ -8,9 +8,7 @@ export const TriggerHAState: OptionManager<AutomationTriggerHA> = {
|
|||||||
"platform": "homeassistant",
|
"platform": "homeassistant",
|
||||||
"event": "start",
|
"event": "start",
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputList
|
<InputList
|
||||||
|
|||||||
@@ -10,9 +10,7 @@ export const TriggerMQTTState: OptionManager<AutomationTriggerMQTT> = {
|
|||||||
"topic": "",
|
"topic": "",
|
||||||
"value_template": ""
|
"value_template": ""
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputText
|
<InputText
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { OptionManager } from './OptionManager';
|
import { OptionManager } from './OptionManager';
|
||||||
import { AutomationTriggerNumericState } from 'types/automations/triggers';
|
import { AutomationTriggerNumericState } from 'types/automations/triggers';
|
||||||
import InputText from 'components/Inputs/InputText';
|
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 InputNumber from 'components/Inputs/InputNumber';
|
||||||
import InputTime from 'components/Inputs/InputTime';
|
import InputTime from 'components/Inputs/InputTime';
|
||||||
import InputYaml from 'components/Inputs/InputYaml';
|
import InputYaml from 'components/Inputs/InputYaml';
|
||||||
@@ -12,13 +12,12 @@ export const TriggerNumericState: OptionManager<AutomationTriggerNumericState> =
|
|||||||
"platform": 'numeric_state',
|
"platform": 'numeric_state',
|
||||||
"entity_id": "",
|
"entity_id": "",
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={state.entity_id}
|
value={state.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => setState({
|
onChange={entity_id => setState({
|
||||||
...state,
|
...state,
|
||||||
entity_id
|
entity_id
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { OptionManager } from './OptionManager';
|
import { OptionManager } from './OptionManager';
|
||||||
import { AutomationTriggerState } from 'types/automations/triggers';
|
import { AutomationTriggerState } from 'types/automations/triggers';
|
||||||
import InputText from 'components/Inputs/InputText';
|
import InputText from 'components/Inputs/InputText';
|
||||||
import { InputEntity } from 'components/Inputs/InputTextBubble';
|
import { InputEntity } from 'components/Inputs/InputEntities';
|
||||||
import InputTime from 'components/Inputs/InputTime';
|
import InputTime from 'components/Inputs/InputTime';
|
||||||
|
|
||||||
|
|
||||||
@@ -10,13 +10,12 @@ export const TriggerState: OptionManager<AutomationTriggerState> = {
|
|||||||
"platform": 'state',
|
"platform": 'state',
|
||||||
"entity_id": "",
|
"entity_id": "",
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={state.entity_id}
|
value={state.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => setState({
|
onChange={entity_id => setState({
|
||||||
...state,
|
...state,
|
||||||
entity_id
|
entity_id
|
||||||
|
|||||||
@@ -9,9 +9,7 @@ export const TriggerTemplate: OptionManager<AutomationTriggerTemplate> = {
|
|||||||
"platform": 'template',
|
"platform": 'template',
|
||||||
"value_template": "",
|
"value_template": "",
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputText
|
<InputText
|
||||||
|
|||||||
@@ -9,9 +9,7 @@ export const TriggerTime: OptionManager<AutomationTriggerTime> = {
|
|||||||
"platform": 'time',
|
"platform": 'time',
|
||||||
"at": "",
|
"at": "",
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputTime
|
<InputTime
|
||||||
|
|||||||
@@ -7,9 +7,7 @@ export const TriggerTimePattern: OptionManager<AutomationTriggerTimePattern> = {
|
|||||||
defaultState: () => ({
|
defaultState: () => ({
|
||||||
"platform": 'time_pattern',
|
"platform": 'time_pattern',
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputText label="Hours" value={state.hours ?? ""} onChange={hours => setState({
|
<InputText label="Hours" value={state.hours ?? ""} onChange={hours => setState({
|
||||||
|
|||||||
@@ -8,9 +8,7 @@ export const TriggerWebhook: OptionManager<AutomationTriggerWebhook> = {
|
|||||||
"platform": 'webhook',
|
"platform": 'webhook',
|
||||||
"webhook_id": "",
|
"webhook_id": "",
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputText label="Webhook ID" value={state.webhook_id ?? ""} onChange={webhook_id => setState({
|
<InputText label="Webhook ID" value={state.webhook_id ?? ""} onChange={webhook_id => setState({
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import { OptionManager } from './OptionManager';
|
import { OptionManager } from './OptionManager';
|
||||||
import { AutomationTriggerZone } from 'types/automations/triggers';
|
import { AutomationTriggerZone } from 'types/automations/triggers';
|
||||||
import InputText from 'components/Inputs/InputText';
|
|
||||||
import { InputList } from 'components/Inputs/InputList';
|
import { InputList } from 'components/Inputs/InputList';
|
||||||
import { InputEntity } from 'components/Inputs/InputTextBubble';
|
import { InputEntity } from 'components/Inputs/InputEntities';
|
||||||
|
|
||||||
|
|
||||||
export const TriggerZone: OptionManager<AutomationTriggerZone> = {
|
export const TriggerZone: OptionManager<AutomationTriggerZone> = {
|
||||||
@@ -12,14 +11,12 @@ export const TriggerZone: OptionManager<AutomationTriggerZone> = {
|
|||||||
"event": "enter",
|
"event": "enter",
|
||||||
"entity_id": "",
|
"entity_id": "",
|
||||||
}),
|
}),
|
||||||
isReady: ({ }) => {
|
isReady: () => true,
|
||||||
return true
|
|
||||||
},
|
|
||||||
renderOptionList: (state, setState) => {
|
renderOptionList: (state, setState) => {
|
||||||
return <>
|
return <>
|
||||||
<InputText label="Zone" value={state.zone ?? ""} onChange={zone => setState({
|
<InputEntity label="Zone" restrictToDomain={['zone']} value={state.zone} onChange={zone => setState({
|
||||||
...state,
|
...state,
|
||||||
zone
|
zone: zone ?? ""
|
||||||
})} />
|
})} />
|
||||||
<InputList
|
<InputList
|
||||||
label="Event"
|
label="Event"
|
||||||
@@ -30,6 +27,8 @@ export const TriggerZone: OptionManager<AutomationTriggerZone> = {
|
|||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<InputEntity
|
<InputEntity
|
||||||
|
multiple
|
||||||
|
restrictToDomain={["device_tracker", "person"]}
|
||||||
value={state.entity_id}
|
value={state.entity_id}
|
||||||
onChange={entity_id => setState({
|
onChange={entity_id => setState({
|
||||||
...state,
|
...state,
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { getNodeType, getNodeSubType, getSubTypeList, validateNode } from 'utils
|
|||||||
import InputYaml from 'components/Inputs/InputYaml';
|
import InputYaml from 'components/Inputs/InputYaml';
|
||||||
import InputText from 'components/Inputs/InputText';
|
import InputText from 'components/Inputs/InputText';
|
||||||
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
||||||
|
import { useHAEntities } from 'haService';
|
||||||
|
|
||||||
type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>]
|
type UseState = <S>(s: S) => [S, Dispatch<SetStateAction<S>>]
|
||||||
|
|
||||||
@@ -15,6 +16,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
|
|||||||
isModified: false,
|
isModified: false,
|
||||||
...computeInvalidYaml(originalNode)
|
...computeInvalidYaml(originalNode)
|
||||||
});
|
});
|
||||||
|
const entities = useHAEntities();
|
||||||
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
|
const { node: currentNode, isModified, yamlMode, invalidManualYaml } = allState;
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setAllState({ ...allState, node: originalNode, isModified: false, })
|
setAllState({ ...allState, node: originalNode, isModified: false, })
|
||||||
@@ -93,7 +95,7 @@ export const useEditorNodeState = (originalNode: AutomationNode, isErrored: bool
|
|||||||
}
|
}
|
||||||
return <>
|
return <>
|
||||||
{aliasEditor}
|
{aliasEditor}
|
||||||
{optionManager.renderOptionList(currentNode, setState)}
|
{optionManager.renderOptionList(currentNode, setState, entities)}
|
||||||
</>;
|
</>;
|
||||||
},
|
},
|
||||||
isReady() {
|
isReady() {
|
||||||
|
|||||||
@@ -65,6 +65,14 @@ UnSupported.args = {
|
|||||||
} as any,
|
} as any,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const DeviceTriggerExample = Action.bind({})
|
||||||
|
DeviceTriggerExample.args = {
|
||||||
|
...DeviceTriggerExample.args,
|
||||||
|
node: {
|
||||||
|
"platform": 'device',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
export const InAModal: ComponentStory<typeof NodeEditor> = props => {
|
export const InAModal: ComponentStory<typeof NodeEditor> = props => {
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
|
|
||||||
import { FC } from 'react';
|
import { FC, ReactNode } from 'react';
|
||||||
import { AutomationNode, AutomationNodeMapping } from 'types/automations/index';
|
import { AutomationNode, AutomationNodeMapping } from 'types/automations/index';
|
||||||
import { useEditorNodeState } from "./OptionManager";
|
import { useEditorNodeState } from "./OptionManager";
|
||||||
import { InputList } from "components/Inputs/InputList";
|
import { InputList } from "components/Inputs/InputList";
|
||||||
@@ -15,6 +15,7 @@ export interface NodeEditorProps {
|
|||||||
onFlags?: (isReady: boolean, isModified: boolean) => void;
|
onFlags?: (isReady: boolean, isModified: boolean) => void;
|
||||||
saveBtnCreateText?: boolean;
|
saveBtnCreateText?: boolean;
|
||||||
isErrored?: boolean;
|
isErrored?: boolean;
|
||||||
|
children?: ReactNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const NodeEditor: FC<NodeEditorProps> = ({
|
export const NodeEditor: FC<NodeEditorProps> = ({
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { FC } from 'react';
|
import { createRef, FC, ReactNode, useEffect, useRef } from 'react';
|
||||||
import { createTheme, ThemeProvider } from '@mui/material/styles';
|
import { createTheme, ThemeProvider, useTheme } from '@mui/material/styles';
|
||||||
import { VersionBox } from "components/VersionBox";
|
import { VersionBox } from "components/VersionBox";
|
||||||
|
import { SnackbarKey, SnackbarProvider, useSnackbar } from 'notistack';
|
||||||
|
import { Button } from "@mui/material";
|
||||||
|
import { useHAConnection } from 'haService/connection';
|
||||||
|
|
||||||
const theme = createTheme({
|
const theme = createTheme({
|
||||||
palette: {
|
palette: {
|
||||||
@@ -9,15 +12,69 @@ const theme = createTheme({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const InternalPage: FC<{
|
||||||
|
children: ReactNode
|
||||||
|
}> = ({ children }) => {
|
||||||
|
const conn = useHAConnection();
|
||||||
|
const theme = useTheme();
|
||||||
|
const snackbar = useSnackbar();
|
||||||
|
const snackbarKeyHAConKey = useRef<SnackbarKey | null>(null);
|
||||||
|
|
||||||
export const Page: FC = ({ children }) => {
|
useEffect(() => {
|
||||||
|
if (conn.status === 'error') {
|
||||||
|
if (snackbarKeyHAConKey.current) {
|
||||||
|
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
|
||||||
|
}
|
||||||
|
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Failed to connect to homeassistant due to "${JSON.stringify(conn.error)}"`, {
|
||||||
|
"variant": "error",
|
||||||
|
"persist": true,
|
||||||
|
})
|
||||||
|
} else if (conn.status === 'loading') {
|
||||||
|
if (snackbarKeyHAConKey.current) {
|
||||||
|
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
|
||||||
|
}
|
||||||
|
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Connecting to websocket...`, {
|
||||||
|
"variant": "info",
|
||||||
|
})
|
||||||
|
} else if (conn.status === "loaded") {
|
||||||
|
if (snackbarKeyHAConKey.current) {
|
||||||
|
snackbar.closeSnackbar(snackbarKeyHAConKey.current)
|
||||||
|
}
|
||||||
|
snackbarKeyHAConKey.current = snackbar.enqueueSnackbar(`Connected to HA!`, {
|
||||||
|
"variant": "success",
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, [conn, snackbar])
|
||||||
|
|
||||||
|
return <main className="page" style={{
|
||||||
|
color: theme.palette.text.primary,
|
||||||
|
background: theme.palette.background.default,
|
||||||
|
}}>
|
||||||
|
<VersionBox />
|
||||||
|
{children}
|
||||||
|
</main>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Page: FC<{
|
||||||
|
children: ReactNode
|
||||||
|
}> = ({ children }) => {
|
||||||
|
const notistackRef = createRef<any>();
|
||||||
|
const onClickDismiss = (key: SnackbarKey) => () => {
|
||||||
|
notistackRef.current.closeSnackbar(key);
|
||||||
|
}
|
||||||
return <ThemeProvider theme={theme}>
|
return <ThemeProvider theme={theme}>
|
||||||
<main className="page" style={{
|
<SnackbarProvider
|
||||||
color: theme.palette.text.primary,
|
anchorOrigin={{
|
||||||
background: theme.palette.background.default,
|
"vertical": "bottom",
|
||||||
}}>
|
"horizontal": "center"
|
||||||
<VersionBox />
|
}}
|
||||||
{children}
|
ref={notistackRef}
|
||||||
</main>
|
action={key => <Button onClick={onClickDismiss(key)}>Dismiss</Button>}
|
||||||
|
dense preventDuplicate
|
||||||
|
>
|
||||||
|
<InternalPage>
|
||||||
|
{children}
|
||||||
|
</InternalPage>
|
||||||
|
</SnackbarProvider>
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
import { Connection, getCollection } from "home-assistant-js-websocket";
|
||||||
|
import { DeviceRegistryItem, HassDevices } from './types';
|
||||||
|
|
||||||
|
|
||||||
|
export const fetchDeviceRegistry = (conn: Connection): Promise<Record<string, DeviceRegistryItem>> =>
|
||||||
|
conn.sendMessagePromise<HassDevices>({
|
||||||
|
"type": "config/device_registry/list"
|
||||||
|
}).then(
|
||||||
|
data =>
|
||||||
|
data.filter(
|
||||||
|
({ disabled_by }) => !disabled_by
|
||||||
|
).reduce<Record<string, DeviceRegistryItem>>((all, n) => {
|
||||||
|
all[n.id] = n
|
||||||
|
return all
|
||||||
|
}, {}
|
||||||
|
))
|
||||||
|
export const deviceRegistryColl = (conn: Connection) => getCollection<Record<string, DeviceRegistryItem>>(
|
||||||
|
conn,
|
||||||
|
"_$drc",
|
||||||
|
fetchDeviceRegistry
|
||||||
|
)
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
import { Connection, getCollection } from "home-assistant-js-websocket";
|
||||||
|
import { HassEntitiesRegistry } from './types';
|
||||||
|
|
||||||
|
|
||||||
|
export const fetchEntityRegistry = (conn: Connection) => conn.sendMessagePromise<HassEntitiesRegistry>({
|
||||||
|
"type": "config/entity_registry/list"
|
||||||
|
}).then(data => data.filter(({ disabled_by }) => !disabled_by))
|
||||||
|
export const entityRegistryColl = (conn: Connection) => getCollection<HassEntitiesRegistry>(conn, "_$erc", fetchEntityRegistry)
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import React, { FC } from "react";
|
||||||
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useHAConnection } from './connection';
|
||||||
|
|
||||||
|
const Test: FC = () => {
|
||||||
|
const conn = useHAConnection();
|
||||||
|
|
||||||
|
return <code>
|
||||||
|
{JSON.stringify(conn, null, 4)}
|
||||||
|
</code>
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Services/HA Service',
|
||||||
|
component: Test,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {
|
||||||
|
}
|
||||||
|
} as ComponentMeta<typeof Test>
|
||||||
|
|
||||||
|
export const Base: ComponentStory<typeof Test> = props => {
|
||||||
|
|
||||||
|
return <Page>
|
||||||
|
<Test {...props} />
|
||||||
|
</Page>
|
||||||
|
};
|
||||||
@@ -0,0 +1,143 @@
|
|||||||
|
import { useState, useEffect, useRef } from 'react';
|
||||||
|
import {
|
||||||
|
ERR_HASS_HOST_REQUIRED,
|
||||||
|
createLongLivedTokenAuth,
|
||||||
|
Connection,
|
||||||
|
ERR_CANNOT_CONNECT,
|
||||||
|
ERR_CONNECTION_LOST,
|
||||||
|
ERR_INVALID_AUTH,
|
||||||
|
ERR_INVALID_HTTPS_TO_HTTP,
|
||||||
|
createConnection as _createConnection,
|
||||||
|
} from "home-assistant-js-websocket";
|
||||||
|
import { remoteDetailsAPI } from 'apiService';
|
||||||
|
|
||||||
|
export type HAConnection = {
|
||||||
|
status: 'loading'
|
||||||
|
} | {
|
||||||
|
status: 'loaded',
|
||||||
|
connection: Connection,
|
||||||
|
} | {
|
||||||
|
status: 'error',
|
||||||
|
error: any,
|
||||||
|
};
|
||||||
|
let haConnection: HAConnection = {
|
||||||
|
status: 'loading',
|
||||||
|
};
|
||||||
|
|
||||||
|
const translateErrorCodes = (errorCode: number) => {
|
||||||
|
if (errorCode === ERR_HASS_HOST_REQUIRED) {
|
||||||
|
return "Missing HASS host"
|
||||||
|
}
|
||||||
|
if (errorCode === ERR_CANNOT_CONNECT) {
|
||||||
|
return "Failed to connect"
|
||||||
|
}
|
||||||
|
if (errorCode === ERR_CONNECTION_LOST) {
|
||||||
|
return "Connection Lost"
|
||||||
|
}
|
||||||
|
if (errorCode === ERR_INVALID_AUTH) {
|
||||||
|
return "Invalid Host"
|
||||||
|
}
|
||||||
|
if (errorCode === ERR_INVALID_HTTPS_TO_HTTP) {
|
||||||
|
return "Invalid https to http"
|
||||||
|
}
|
||||||
|
return errorCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
type ReturnedToken = {
|
||||||
|
hassURL: string;
|
||||||
|
longToken: string
|
||||||
|
} | {
|
||||||
|
hassURL: string;
|
||||||
|
hassioToken: string
|
||||||
|
} | {
|
||||||
|
error: any;
|
||||||
|
}
|
||||||
|
const getToken = async (): Promise<ReturnedToken> => {
|
||||||
|
const data = await remoteDetailsAPI.makeCall({
|
||||||
|
"path": "/",
|
||||||
|
"method": "GET",
|
||||||
|
});
|
||||||
|
if (!data.ok) {
|
||||||
|
return {
|
||||||
|
error: {
|
||||||
|
message: "Failed to get token from api.",
|
||||||
|
originalError: data.error,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const hassURL = data.data.hass_url;
|
||||||
|
const hassioToken = data.data.hassio_token;
|
||||||
|
if (!hassioToken) {
|
||||||
|
return {
|
||||||
|
error: {
|
||||||
|
message: [
|
||||||
|
"Missing HASSIO Token, Please make sure the token is correctly passing to the container!",
|
||||||
|
"Make sure the token `HASSIO_TOKEN` and `HASS_URL` are set properly."
|
||||||
|
].join('\n'),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { hassioToken, hassURL }
|
||||||
|
}
|
||||||
|
|
||||||
|
const createConnection = async () => {
|
||||||
|
const tokens = await getToken();
|
||||||
|
try {
|
||||||
|
if ('hassioToken' in tokens) {
|
||||||
|
return _createConnection({
|
||||||
|
auth: createLongLivedTokenAuth(tokens.hassURL, tokens.hassioToken),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
// eslint-disable-next-line
|
||||||
|
throw {
|
||||||
|
originalError: JSON.stringify(error),
|
||||||
|
message: translateErrorCodes(error as any),
|
||||||
|
tokens,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw tokens
|
||||||
|
}
|
||||||
|
|
||||||
|
async function startHAConnection() {
|
||||||
|
let connection: Connection;
|
||||||
|
try {
|
||||||
|
connection = await createConnection();
|
||||||
|
} catch (error) {
|
||||||
|
haConnection = {
|
||||||
|
status: 'error',
|
||||||
|
error: {
|
||||||
|
originalError: JSON.stringify(error),
|
||||||
|
message: translateErrorCodes(error as any),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw error
|
||||||
|
}
|
||||||
|
haConnection = {
|
||||||
|
status: 'loaded',
|
||||||
|
connection,
|
||||||
|
}
|
||||||
|
return haConnection;
|
||||||
|
}
|
||||||
|
|
||||||
|
startHAConnection().then(console.log).catch(console.error);
|
||||||
|
export const useHAConnection = (): HAConnection => {
|
||||||
|
const [conn, setConn] = useState<HAConnection>(haConnection);
|
||||||
|
const timeID = useRef<number | undefined>(undefined);
|
||||||
|
useEffect(() => {
|
||||||
|
if (conn.status !== haConnection.status) {
|
||||||
|
setConn(haConnection);
|
||||||
|
}
|
||||||
|
const waiter = () => {
|
||||||
|
if (conn.status !== haConnection.status) {
|
||||||
|
setConn(haConnection);
|
||||||
|
}
|
||||||
|
timeID.current = window.setTimeout(() => {
|
||||||
|
waiter()
|
||||||
|
}, conn.status === 'loading' ? 500 : 5000)
|
||||||
|
}
|
||||||
|
waiter()
|
||||||
|
return () => window.clearTimeout(timeID.current)
|
||||||
|
}, [conn, setConn])
|
||||||
|
return conn;
|
||||||
|
};
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
import React, { FC } from "react";
|
||||||
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useHADeviceRegistry } from "haService";
|
||||||
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
|
|
||||||
|
const Test: FC<{ onRender: () => void }> = ({ onRender }) => {
|
||||||
|
const conn = useHADeviceRegistry();
|
||||||
|
onRender && onRender()
|
||||||
|
if (conn.ready) {
|
||||||
|
return <div>
|
||||||
|
{Object.keys(conn.collection.state).length} items
|
||||||
|
<ul style={{
|
||||||
|
maxHeight: '100vh',
|
||||||
|
overflow: 'auto'
|
||||||
|
}}>
|
||||||
|
{Object.keys(conn.collection.state).map(k => <li key={k}>
|
||||||
|
<b>{k}</b>
|
||||||
|
{/* <u>{conn.collection.state[k].length > 1 ? conn.collection.state[k].length : ''}</u> */}
|
||||||
|
<InputYaml value={conn.collection.state[k]} onChange={() => { }} label={k} />
|
||||||
|
</li>)}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
return <code>
|
||||||
|
Loading...
|
||||||
|
</code>
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Services/Device Registry',
|
||||||
|
component: Test,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {}
|
||||||
|
} as ComponentMeta<typeof Test>
|
||||||
|
|
||||||
|
export const Base: ComponentStory<typeof Test> = props => {
|
||||||
|
|
||||||
|
return <Page>
|
||||||
|
<Test {...props} />
|
||||||
|
</Page>
|
||||||
|
};
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import React, { FC } from "react";
|
||||||
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useHAEntities } from "haService";
|
||||||
|
|
||||||
|
const Test: FC<{ onRender: () => void }> = ({ onRender }) => {
|
||||||
|
const conn = useHAEntities();
|
||||||
|
onRender && onRender()
|
||||||
|
return <code>
|
||||||
|
{JSON.stringify(conn, null, 4)}
|
||||||
|
</code>
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Services/HA Entities',
|
||||||
|
component: Test,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {}
|
||||||
|
} as ComponentMeta<typeof Test>
|
||||||
|
|
||||||
|
export const Base: ComponentStory<typeof Test> = props => {
|
||||||
|
|
||||||
|
return <Page>
|
||||||
|
<Test {...props} />
|
||||||
|
</Page>
|
||||||
|
};
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
import React, { FC } from "react";
|
||||||
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useHAEntityRegistry } from "haService";
|
||||||
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
|
|
||||||
|
const Test: FC<{ onRender: () => void }> = ({ onRender }) => {
|
||||||
|
const conn = useHAEntityRegistry();
|
||||||
|
onRender && onRender()
|
||||||
|
if (conn.ready) {
|
||||||
|
return <div>
|
||||||
|
{conn.collection.state.length}
|
||||||
|
<ul style={{
|
||||||
|
maxHeight: '100vh',
|
||||||
|
overflow: 'auto'
|
||||||
|
}}>
|
||||||
|
{conn.collection.state.map((row, i) => <li key={i}>
|
||||||
|
{/* {Object.keys(row).map(k => <>
|
||||||
|
<span key={k}>
|
||||||
|
<b>{k}</b>: {JSON.stringify(row[k] as any)}
|
||||||
|
</span><br key={`${k}-br`} />
|
||||||
|
</>)} */}
|
||||||
|
{/* <InputYaml label={String(i)} value={row} onChange={() => { }} /> */}
|
||||||
|
</li>)}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
return <code>
|
||||||
|
Loading...
|
||||||
|
</code>
|
||||||
|
}
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Services/Entity Registry',
|
||||||
|
component: Test,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {}
|
||||||
|
} as ComponentMeta<typeof Test>
|
||||||
|
|
||||||
|
export const Base: ComponentStory<typeof Test> = props => {
|
||||||
|
|
||||||
|
return <Page>
|
||||||
|
<Test {...props} />
|
||||||
|
</Page>
|
||||||
|
};
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
import { entitiesColl, servicesColl } from "home-assistant-js-websocket"
|
||||||
|
import { deviceRegistryColl } from "./DeviceRegistry";
|
||||||
|
import { entityRegistryColl } from "./EntityRegistry";
|
||||||
|
import { DeviceRegistryItem } from "./types";
|
||||||
|
import { useHassCollection } from "./useHassCollection"
|
||||||
|
|
||||||
|
export type Option<T = {}> = string | ({
|
||||||
|
id: string,
|
||||||
|
label: string,
|
||||||
|
} & T)
|
||||||
|
export type EntityOption = Option<{ domain: string; }>
|
||||||
|
export type HAEntitiesState = ReturnType<typeof useHAEntities>;
|
||||||
|
export const useHAEntities = () => {
|
||||||
|
const entities = useHassCollection(entitiesColl, state => ({
|
||||||
|
domains: Array.from(new Set(Object.keys(state).map(x => x.split('.')[0])).keys()).sort(),
|
||||||
|
}));
|
||||||
|
const methods = {
|
||||||
|
getDomainList(): string[] {
|
||||||
|
return entities.additional?.domains ?? []
|
||||||
|
},
|
||||||
|
validateOptions(options: string[], restrictedDomains?: string[]): null | string[] {
|
||||||
|
if (restrictedDomains) {
|
||||||
|
const domains = restrictedDomains.map(x => x.toLowerCase())
|
||||||
|
const domainsStr = domains.length > 1 ?
|
||||||
|
`one of "${domains.join(', ')}"` :
|
||||||
|
`"${domains[0]}"`
|
||||||
|
return options.reduce<string[]>((all = [], key) => {
|
||||||
|
if (!domains.includes(key.toLowerCase().split('.')[0])) {
|
||||||
|
return [
|
||||||
|
...all,
|
||||||
|
`${methods.getLabel(key)} is not ${domainsStr}`
|
||||||
|
]
|
||||||
|
}
|
||||||
|
return all
|
||||||
|
}, [])
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
},
|
||||||
|
getOptions(restrictToDomain?: string[]): EntityOption[] {
|
||||||
|
if (!entities.ready) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
let keys = Object.keys(entities.collection.state);
|
||||||
|
if (restrictToDomain) {
|
||||||
|
const domains = restrictToDomain.map(x => x.toLowerCase())
|
||||||
|
keys = keys.filter(key => domains.includes(key.toLowerCase().split('.')[0]))
|
||||||
|
}
|
||||||
|
return keys.map(key => ({
|
||||||
|
id: key,
|
||||||
|
label: entities.collection.state[key].attributes.friendly_name ?? key,
|
||||||
|
domain: key.split('.')[0] ?? "n/a",
|
||||||
|
}))
|
||||||
|
},
|
||||||
|
getLabel: (opt: EntityOption): string => {
|
||||||
|
if (typeof opt === 'string') {
|
||||||
|
if (entities.ready) {
|
||||||
|
return entities.collection.state[opt]?.attributes.friendly_name ?? opt;
|
||||||
|
}
|
||||||
|
return opt
|
||||||
|
}
|
||||||
|
return opt.label ?? opt.id
|
||||||
|
},
|
||||||
|
getID: (opt: EntityOption): string => {
|
||||||
|
if (typeof opt === 'string') {
|
||||||
|
return opt
|
||||||
|
}
|
||||||
|
return opt.id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
...entities,
|
||||||
|
...methods
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const useHAServices = () => {
|
||||||
|
const services = useHassCollection(servicesColl);
|
||||||
|
|
||||||
|
return services
|
||||||
|
}
|
||||||
|
|
||||||
|
export type DeviceRegistryOption = Option<{ manufacturer: string }>;
|
||||||
|
export const useHADeviceRegistry = () => {
|
||||||
|
const dr = useHassCollection(deviceRegistryColl)
|
||||||
|
const getLabelForItem = (item: DeviceRegistryItem) => item ? item.name_by_user ??
|
||||||
|
item.name ??
|
||||||
|
item.id :
|
||||||
|
"";
|
||||||
|
const methods = {
|
||||||
|
getOptions(): DeviceRegistryOption[] {
|
||||||
|
if (!dr.ready) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
const keys = Object.keys(dr.collection.state);
|
||||||
|
return keys.map(key => ({
|
||||||
|
id: key,
|
||||||
|
label: getLabelForItem(dr.collection.state[key]) ?? key,
|
||||||
|
manufacturer: dr.collection.state[key].manufacturer ?? "",
|
||||||
|
}))
|
||||||
|
},
|
||||||
|
getLabel: (opt: DeviceRegistryOption): string => {
|
||||||
|
if (typeof opt === 'string') {
|
||||||
|
if (dr.ready) {
|
||||||
|
return getLabelForItem(dr.collection.state[opt]) ?? opt
|
||||||
|
}
|
||||||
|
return opt
|
||||||
|
}
|
||||||
|
return opt.label ?? opt.id
|
||||||
|
},
|
||||||
|
getID: (opt: DeviceRegistryOption): string => {
|
||||||
|
if (typeof opt === 'string') {
|
||||||
|
return opt
|
||||||
|
}
|
||||||
|
return opt.id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return { ...dr, ...methods }
|
||||||
|
}
|
||||||
|
export const useHAEntityRegistry = () => {
|
||||||
|
const dr = useHassCollection(entityRegistryColl)
|
||||||
|
|
||||||
|
return dr
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
export type EntityRegisteryItem = {
|
||||||
|
area_id: string | null;
|
||||||
|
config_entry_id: string | null;
|
||||||
|
device_id: string | null;
|
||||||
|
disabled_by:
|
||||||
|
| "integration"
|
||||||
|
| "user"
|
||||||
|
| "config_entry"
|
||||||
|
| string
|
||||||
|
| null
|
||||||
|
;
|
||||||
|
entity_category:
|
||||||
|
| "diagnostic"
|
||||||
|
| "config"
|
||||||
|
| string
|
||||||
|
| null
|
||||||
|
;
|
||||||
|
hidden_by:
|
||||||
|
| "integration"
|
||||||
|
| "user"
|
||||||
|
| string
|
||||||
|
| null
|
||||||
|
;
|
||||||
|
icon: string | null;
|
||||||
|
name: string | null;
|
||||||
|
platform: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type DeviceRegistryItem = {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
name_by_user: string | null;
|
||||||
|
manufacturer: string | null;
|
||||||
|
entry_type: 'service' | string | null;
|
||||||
|
disabled_by: EntityRegisteryItem['disabled_by'];
|
||||||
|
area_id: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type HassDevices = Array<DeviceRegistryItem>;
|
||||||
|
export type HassEntitiesRegistry = Array<EntityRegisteryItem>;
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
import { Collection, Connection } from "home-assistant-js-websocket";
|
||||||
|
import { useState, useEffect } from 'react';
|
||||||
|
import { useHAConnection } from "./connection";
|
||||||
|
|
||||||
|
type _HACollectionState<T> = {
|
||||||
|
ready: false,
|
||||||
|
collection?: Collection<T>,
|
||||||
|
} | {
|
||||||
|
ready: true,
|
||||||
|
collection: Collection<T>,
|
||||||
|
}
|
||||||
|
export type HACollectionState<T, D = {}> = _HACollectionState<T> & {
|
||||||
|
additional: Partial<D>
|
||||||
|
}
|
||||||
|
export const useHassCollection = <T, D extends {} = {}>(
|
||||||
|
getHACollection: (c: Connection) => Collection<T>,
|
||||||
|
updateAdditionalProps?: (n: T | {}) => D,
|
||||||
|
): HACollectionState<T, D> => {
|
||||||
|
const [state, setState] = useState<_HACollectionState<T>>({
|
||||||
|
ready: false
|
||||||
|
});
|
||||||
|
const conn = useHAConnection();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (conn.status === 'loaded' && !state.ready) {
|
||||||
|
const collection = getHACollection(conn.connection);
|
||||||
|
setState({
|
||||||
|
ready: false,
|
||||||
|
collection,
|
||||||
|
})
|
||||||
|
const unsub = collection.subscribe(d => {
|
||||||
|
if (d && !state.ready) {
|
||||||
|
setState({
|
||||||
|
ready: true,
|
||||||
|
collection,
|
||||||
|
})
|
||||||
|
unsub();
|
||||||
|
} else if (!d && state.ready) {
|
||||||
|
setState({
|
||||||
|
ready: true,
|
||||||
|
collection,
|
||||||
|
})
|
||||||
|
unsub();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return unsub
|
||||||
|
}
|
||||||
|
}, [conn, getHACollection, state.ready]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
...state,
|
||||||
|
get additional(): Partial<D> {
|
||||||
|
if (state.ready && updateAdditionalProps) {
|
||||||
|
return updateAdditionalProps(state.collection.state)
|
||||||
|
}
|
||||||
|
return {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,3 +15,11 @@ ReactDOM.render(
|
|||||||
// to log results (for example: reportWebVitals(console.log))
|
// to log results (for example: reportWebVitals(console.log))
|
||||||
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
|
||||||
reportWebVitals();
|
reportWebVitals();
|
||||||
|
|
||||||
|
|
||||||
|
// import { createRoot } from 'react-dom/client';
|
||||||
|
// const container = document.getElementById('root');
|
||||||
|
// const root = createRoot(container!);
|
||||||
|
// root.render(<React.StrictMode>
|
||||||
|
// <App />
|
||||||
|
// </React.StrictMode>);
|
||||||
@@ -4,3 +4,4 @@ import * as v from "types/validators/common";
|
|||||||
export type AutomationTime = st.Infer<typeof v.AutomationTime>
|
export type AutomationTime = st.Infer<typeof v.AutomationTime>
|
||||||
export type AutomationTimeObject = st.Infer<typeof v.AutomationTimeObject>
|
export type AutomationTimeObject = st.Infer<typeof v.AutomationTimeObject>
|
||||||
export type AutomationTimeString = st.Infer<typeof v.AutomationTimeString>
|
export type AutomationTimeString = st.Infer<typeof v.AutomationTimeString>
|
||||||
|
export type EntityId = st.Infer<typeof v.EntityId>;
|
||||||
@@ -46,10 +46,10 @@ export const FireEventAction = st.intersection([
|
|||||||
export const DeviceAction = st.intersection([
|
export const DeviceAction = st.intersection([
|
||||||
AutomationActionNodeBase,
|
AutomationActionNodeBase,
|
||||||
st.type({
|
st.type({
|
||||||
type: st.string(),
|
type: st.optional(st.string()),
|
||||||
device_id: st.string(),
|
device_id: st.optional(st.string()),
|
||||||
entity_id: st.optional(st.string()),
|
entity_id: st.optional(st.string()),
|
||||||
domain: st.string(),
|
domain: st.optional(st.string()),
|
||||||
})
|
})
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { AutomationTimeString, AutomationTime, EntityId } from './common'
|
|||||||
|
|
||||||
const AutomationTriggerBase = {
|
const AutomationTriggerBase = {
|
||||||
id: st.optional(st.string()),
|
id: st.optional(st.string()),
|
||||||
|
enabled: st.optional(st.boolean()),
|
||||||
}
|
}
|
||||||
|
|
||||||
export const AutomationTriggerEvent = st.type({
|
export const AutomationTriggerEvent = st.type({
|
||||||
@@ -95,9 +96,9 @@ export const AutomationTriggerDevice = st.type({
|
|||||||
...AutomationTriggerBase,
|
...AutomationTriggerBase,
|
||||||
platform: st.literal('device'),
|
platform: st.literal('device'),
|
||||||
entity_id: st.optional(EntityId),
|
entity_id: st.optional(EntityId),
|
||||||
device_id: st.string(),
|
device_id: st.optional(st.string()),
|
||||||
domain: st.string(),
|
domain: st.optional(st.string()),
|
||||||
type: st.string(),
|
type: st.optional(st.string()),
|
||||||
subtype: st.optional(st.string()),
|
subtype: st.optional(st.string()),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
|
|
||||||
import { convertTimeToString, getDescriptionFromAutomationNode } from "./formatting";
|
import { convertTimeToString, getDescriptionFromAutomationNode, prettyName } from "./formatting";
|
||||||
|
|
||||||
test('converting time to a string', () => {
|
test('converting time to a string', () => {
|
||||||
expect(convertTimeToString({ hours: 1 })).toEqual('01:00:00:00')
|
expect(convertTimeToString({ hours: 1 })).toEqual('01:00:00:00')
|
||||||
@@ -146,3 +146,10 @@ test('get State condition description', () => {
|
|||||||
state: "on"
|
state: "on"
|
||||||
})).toEqual("switch.kitchen_light is 'on'")
|
})).toEqual("switch.kitchen_light is 'on'")
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
test('pretty naming', () => {
|
||||||
|
expect(prettyName('sensor')).toEqual("Sensor")
|
||||||
|
expect(prettyName('sensor.phone')).toEqual("Sensor Phone")
|
||||||
|
expect(prettyName('device_tracker')).toEqual("Device Tracker")
|
||||||
|
})
|
||||||
@@ -104,7 +104,7 @@ export const getDescriptionFromAutomationNode = <N extends AutomationNodeTypes>(
|
|||||||
return `Trigger ${node.event}`
|
return `Trigger ${node.event}`
|
||||||
}
|
}
|
||||||
if ('device_id' in node) {
|
if ('device_id' in node) {
|
||||||
return `${node.type} on ${node.device_id}`
|
return `${node.type ?? ""} on ${node.device_id ?? ""}`
|
||||||
}
|
}
|
||||||
if ('choose' in node) {
|
if ('choose' in node) {
|
||||||
return "Choose"
|
return "Choose"
|
||||||
@@ -121,3 +121,8 @@ export const prettyEntityId = (entityId: string | string[]) => {
|
|||||||
return "..."
|
return "..."
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const prettyName = (n: string) => {
|
||||||
|
const clean = n.replaceAll(/[.-_]/g, ' ');
|
||||||
|
return clean.split(' ').map(x => x.slice(0, 1).toUpperCase() + x.slice(1)).join(' ')
|
||||||
|
}
|
||||||
+3374
-3669
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user