Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b342088b96 | ||
|
|
c0c0d3181c | ||
|
|
cf013cc342 | ||
|
|
23b869d43e | ||
|
|
e333e80ea3 | ||
|
|
996e23038f | ||
|
|
0be03b1536 | ||
|
|
dc726ff184 | ||
|
|
7e5885a34d | ||
|
|
38396c4d98 | ||
|
|
ea832884f1 | ||
|
|
ea14cd4239 | ||
|
|
4e19bdf4c4 | ||
|
|
75c5870e00 | ||
|
|
4b75ac9199 | ||
|
|
fd3780f5bc | ||
|
|
035ac0c898 | ||
|
|
b331e4c5a0 | ||
|
|
b9fb49fd32 | ||
|
|
a33a18c102 | ||
|
|
defa0ce787 | ||
|
|
b17e4c75b3 | ||
|
|
ef5e66a8f1 | ||
|
|
edc65da14b | ||
|
|
1ee34b234d | ||
|
|
cf178e23d0 | ||
|
|
7caac74d2d | ||
|
|
8b9d400a4d | ||
|
|
c830f35ee4 | ||
|
|
7ac92fb98e | ||
|
|
88ad07aabc | ||
|
|
80e98d4a28 | ||
|
|
1a2a78b1e8 | ||
|
|
5c99308fa6 | ||
|
|
0e63bb5b25 | ||
|
|
b0dd9dfddc | ||
|
|
33eae5e027 | ||
|
|
6372ec77f7 | ||
|
|
c9e6bb78da | ||
|
|
a7ec4da5cd | ||
|
|
0d29642703 | ||
|
|
80121c9ee8 | ||
|
|
1c5bff7c47 | ||
|
|
2af528db36 | ||
|
|
9dc4c9c59f | ||
|
|
e2c669dcf2 | ||
|
|
d33df7f532 | ||
|
|
48cb1207b2 | ||
|
|
36cfcd625b | ||
|
|
56d5ca3d08 | ||
|
|
06eb6e27b7 | ||
|
|
b1a86f3bf0 | ||
|
|
a626a89ed3 | ||
|
|
3526fbd9ee | ||
|
|
4cfc429980 | ||
|
|
bfc95db6f6 | ||
|
|
8d804add13 | ||
|
|
2db116ad9b | ||
|
|
6981eddb49 | ||
|
|
c118ccc99b | ||
|
|
429dfd5b50 | ||
|
|
49fea3fabd | ||
|
|
38b0aecffa | ||
|
|
b76dc672f3 | ||
|
|
6821bb8714 | ||
|
|
c256400518 | ||
|
|
634f3e9219 | ||
|
|
a56c7ff964 | ||
|
|
b29596fe78 | ||
|
|
1620d04624 | ||
|
|
1ed1e63330 | ||
|
|
7ae50e634a | ||
|
|
56d68d9065 | ||
|
|
468a022582 | ||
|
|
5dcd17ad17 | ||
|
|
b1df6aebe2 | ||
|
|
b98d4a8812 | ||
|
|
7a278c856a |
No files matched your search
@@ -37,6 +37,11 @@ jobs:
|
|||||||
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
- name: Cancel Previous Runs
|
||||||
|
uses: styfle/cancel-workflow-action@0.9.1
|
||||||
|
with:
|
||||||
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,78 @@
|
|||||||
|
name: Deploy
|
||||||
|
env:
|
||||||
|
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||||
|
on:
|
||||||
|
# release:
|
||||||
|
# types: [published]
|
||||||
|
workflow_dispatch:
|
||||||
|
push:
|
||||||
|
paths:
|
||||||
|
- 'config.yaml'
|
||||||
|
jobs:
|
||||||
|
|
||||||
|
metadata:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Metadata
|
||||||
|
outputs:
|
||||||
|
version: ${{ steps.version.outputs.VERSION }}
|
||||||
|
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
|
||||||
|
steps:
|
||||||
|
- name: Check out repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
- name: Get Version
|
||||||
|
id: version
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
|
||||||
|
- name: Get Changelog
|
||||||
|
id: changlelog
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
|
||||||
|
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Build & Publish ${{ matrix.arch }}
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Check out repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Login to DockerHub
|
||||||
|
uses: docker/login-action@v2.0.0
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
|
uses: home-assistant/builder@2022.03.1
|
||||||
|
with:
|
||||||
|
args: |
|
||||||
|
--${{ matrix.arch }} \
|
||||||
|
--target .
|
||||||
|
|
||||||
|
publish:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
- build
|
||||||
|
name: Publish Github Release
|
||||||
|
steps:
|
||||||
|
- name: Publish Release ${{ needs.metadata.outputs.version }}
|
||||||
|
uses: actions/github-script@v6
|
||||||
|
env:
|
||||||
|
VERSION: ${{ needs.metadata.outputs.version }}
|
||||||
|
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
github.rest.repos.createRelease({
|
||||||
|
owner: context.repo.owner,
|
||||||
|
repo: context.repo.repo,
|
||||||
|
tag_name: process.env.VERSION,
|
||||||
|
body: process.env.CHANGELOG,
|
||||||
|
});
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
name: Test
|
||||||
|
env:
|
||||||
|
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
push:
|
||||||
|
branch: [main]
|
||||||
|
pull_request:
|
||||||
|
branches: [main]
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Build Test for ${{ matrix.arch }}
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Cancel Previous Runs
|
||||||
|
uses: styfle/cancel-workflow-action@0.9.1
|
||||||
|
with:
|
||||||
|
all_but_latest: true
|
||||||
|
access_token: ${{ github.token }}
|
||||||
|
|
||||||
|
- name: Check out repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Login to DockerHub
|
||||||
|
uses: docker/login-action@v2.0.0
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
|
||||||
|
- name: ${{ matrix.arch }}
|
||||||
|
uses: home-assistant/builder@2022.03.1
|
||||||
|
with:
|
||||||
|
args: |
|
||||||
|
--test \
|
||||||
|
--${{ matrix.arch }} \
|
||||||
|
--target .
|
||||||
|
python:
|
||||||
|
name: "Python Tests"
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
action: [lint, coverage, security-checks]
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- name: Set up Python
|
||||||
|
uses: actions/setup-python@v3
|
||||||
|
with:
|
||||||
|
python-version: 3.9
|
||||||
|
- name: Install Dependencies
|
||||||
|
run: cd api && make setup
|
||||||
|
- name: Echo dependencies
|
||||||
|
run: cd api && ./venv/bin/pip freeze
|
||||||
|
- name: Running ${{ matrix.action }}
|
||||||
|
run: cd api && make ${{ matrix.action }}
|
||||||
|
|
||||||
|
nodejs:
|
||||||
|
name: "NodeJs Tests"
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v3
|
||||||
|
- uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: 16
|
||||||
|
cache: 'yarn'
|
||||||
|
cache-dependency-path: webapp/yarn.lock
|
||||||
|
- name: Install Dependencies
|
||||||
|
run: cd webapp && yarn install
|
||||||
|
- name: Run Tests
|
||||||
|
run: cd webapp && yarn test:ci
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
.vscode/*.log
|
||||||
+3
-21
@@ -1,22 +1,4 @@
|
|||||||
# Changelog
|
# Changelog -- v0.1.5
|
||||||
|
|
||||||
## [0.0.12] - Tags
|
- Fixed up arrow styles due to typos
|
||||||
|
- Added selection color
|
||||||
- Added tag management system for automations
|
|
||||||
|
|
||||||
## [0.0.11] - Zoom
|
|
||||||
|
|
||||||
- Added lazy saving
|
|
||||||
|
|
||||||
## [0.0.10] - Zoom
|
|
||||||
|
|
||||||
- Introducing Zoom!
|
|
||||||
|
|
||||||
## [0.0.9] - First Working Version
|
|
||||||
|
|
||||||
- Instalable verion via github
|
|
||||||
- Initial POC done
|
|
||||||
|
|
||||||
|
|
||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
||||||
@@ -1,7 +1,13 @@
|
|||||||
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
|
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
|
||||||
|
|
||||||
local_run:
|
build:
|
||||||
$(DC) build
|
$(DC) build
|
||||||
|
|
||||||
|
push:
|
||||||
|
$(DC) push
|
||||||
|
|
||||||
|
local_run:
|
||||||
|
$(MAKE) build
|
||||||
$(DC) up -d
|
$(DC) up -d
|
||||||
sleep 1
|
sleep 1
|
||||||
$(DC) ps
|
$(DC) ps
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
# Shortumation
|
# Shortumation
|
||||||
|
|
||||||
|
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|

|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||||
|
|
||||||
@@ -19,3 +24,16 @@ A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI
|
|||||||
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
||||||
|
|
||||||
|
|
||||||
|
## FAQ
|
||||||
|
|
||||||
|
**How is this different from Node-Red?**
|
||||||
|
|
||||||
|
> Node-Red is both an execution engine and an automation editor, which means that in order for you automations to run you have to have an additional component running and executing the automations. Shortumations simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
||||||
|
|
||||||
|
**Which HA Installation does this support?**
|
||||||
|
|
||||||
|
> Currently this is only tested on HA OS. However, you should be able to get it working supervised installations as well (as they support addons). If you want to make it work for Container or Core, you will need to do some additional leg-work and I welcome a PR to get this working (it should be just a matter of mounting the `/config` path to the container running the images in this repo).
|
||||||
|
|
||||||
|
**Which version of HA does this require?**
|
||||||
|
|
||||||
|
> Since I am working on this project on my own, I can only test it against my own HA installations at home, and I tend to keep things as up to date as possible. The lowest version of HA this was tested on is `core-2022.5.4`
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
|
||||||
|
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
|
||||||
|
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
|
||||||
|
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
|
||||||
|
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
|
||||||
|
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
|
||||||
|
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
|
||||||
|
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
|
||||||
|
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
|
||||||
|
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
||||||
|
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
||||||
|
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
||||||
|
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
|
||||||
|
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
|
||||||
|
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
|
||||||
|
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
|
||||||
|
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
|
||||||
+1
-1
@@ -10,7 +10,7 @@ setup:
|
|||||||
$(PIP) install .[dev]
|
$(PIP) install .[dev]
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
$(VENV_BIN)/vulture --exclude src
|
$(VENV_BIN)/vulture src .vulture_whitelist
|
||||||
$(MAKE) lint-project
|
$(MAKE) lint-project
|
||||||
$(MAKE) lint-tests
|
$(MAKE) lint-tests
|
||||||
|
|
||||||
|
|||||||
@@ -29,3 +29,15 @@ exclude = '''
|
|||||||
|
|
||||||
[tool.coverage.run]
|
[tool.coverage.run]
|
||||||
omit = ["./venv/*", "tests/*"]
|
omit = ["./venv/*", "tests/*"]
|
||||||
|
|
||||||
|
[[tool.mypy.overrides]]
|
||||||
|
module = "decouple.*"
|
||||||
|
ignore_missing_imports = true
|
||||||
|
|
||||||
|
[[tool.mypy.overrides]]
|
||||||
|
module = "ruamel.*"
|
||||||
|
ignore_missing_imports = true
|
||||||
|
|
||||||
|
[[tool.mypy.overrides]]
|
||||||
|
module = "tests.*"
|
||||||
|
ignore_missing_imports = true
|
||||||
+1
-1
@@ -14,7 +14,7 @@ setuptools.setup(
|
|||||||
"dev": [
|
"dev": [
|
||||||
"mypy==0.910",
|
"mypy==0.910",
|
||||||
"mypy-extensions==0.4.3",
|
"mypy-extensions==0.4.3",
|
||||||
"black==21.7b0",
|
"black==22.3.0",
|
||||||
"bandit==1.7.0",
|
"bandit==1.7.0",
|
||||||
"isort==5.9.3",
|
"isort==5.9.3",
|
||||||
"coverage==5.5",
|
"coverage==5.5",
|
||||||
|
|||||||
+5
-4
@@ -1,10 +1,11 @@
|
|||||||
from sys import prefix
|
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
from fastapi.staticfiles import StaticFiles
|
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.env import ROOT_FOLDER, ORIGIN
|
from src.env import ORIGIN, ROOT_FOLDER
|
||||||
from .routes import ping, automations, details
|
|
||||||
|
from .routes import automations, details, ping
|
||||||
|
|
||||||
|
|
||||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
from fastapi import APIRouter, HTTPException
|
from fastapi import APIRouter, HTTPException
|
||||||
from src.automations.manager import AutomationManager
|
|
||||||
from src.api.types import (
|
from src.api.types import (
|
||||||
DeleteAutoRequest,
|
DeleteAutoRequest,
|
||||||
ListData,
|
ListData,
|
||||||
@@ -7,6 +7,7 @@ from src.api.types import (
|
|||||||
UpdateAutoRequest,
|
UpdateAutoRequest,
|
||||||
)
|
)
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
|
from src.automations.manager import AutomationManager
|
||||||
from src.automations.types import AutomationData
|
from src.automations.types import AutomationData
|
||||||
|
|
||||||
|
|
||||||
@@ -24,11 +25,11 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
|
|||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
@router.post("")
|
@router.post("/item")
|
||||||
def upsert_auto(body: UpdateAutoRequest):
|
def upsert_auto(body: UpdateAutoRequest):
|
||||||
automations.update(body.index, body.data)
|
automations.update(body.index, body.data)
|
||||||
|
|
||||||
@router.delete("")
|
@router.delete("/item")
|
||||||
def delete_auto(body: DeleteAutoRequest):
|
def delete_auto(body: DeleteAutoRequest):
|
||||||
try:
|
try:
|
||||||
automations.delete(body.index)
|
automations.delete(body.index)
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
from fastapi import APIRouter
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from src.hass_config import HassConfig
|
from fastapi import APIRouter
|
||||||
from src.env import BUILD_VERSION
|
|
||||||
|
|
||||||
|
from src.env import BUILD_VERSION
|
||||||
|
from src.hass_config import HassConfig
|
||||||
|
|
||||||
|
|
||||||
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||||
@@ -18,4 +18,4 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
|||||||
"autos": hass_config.get_automation_path(),
|
"autos": hass_config.get_automation_path(),
|
||||||
}
|
}
|
||||||
|
|
||||||
return router
|
return router
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
from fastapi import APIRouter
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
from fastapi import APIRouter
|
||||||
|
|
||||||
from src.env import BUILD_VERSION
|
from src.env import BUILD_VERSION
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
from typing import Generic, List, TypeVar
|
from typing import Generic, List, TypeVar
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
from pydantic.generics import GenericModel
|
from pydantic.generics import GenericModel
|
||||||
|
|
||||||
from src.automations.types import ExtenededAutomationData
|
from src.automations.types import ExtenededAutomationData
|
||||||
|
|
||||||
DataT = TypeVar("DataT")
|
DataT = TypeVar("DataT")
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
|
from src.api.app import make_app
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.hass_config import find_hass_config
|
from src.hass_config import find_hass_config
|
||||||
from src.api.app import make_app
|
|
||||||
|
|
||||||
hass_config = find_hass_config()
|
hass_config = find_hass_config()
|
||||||
app = make_app(AutomationManager(hass_config))
|
app = make_app(AutomationManager(hass_config))
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
from itertools import chain
|
from typing import Iterator, Union
|
||||||
from typing import Iterable, Iterator
|
|
||||||
from pydantic.error_wrappers import ValidationError
|
from pydantic.error_wrappers import ValidationError
|
||||||
from src.automations.tags import TagManager
|
|
||||||
from src.json_serializer import normalize_obj
|
from src.json_serializer import normalize_obj
|
||||||
from .types import AutomationData, AutomationMetdata, ExtenededAutomationData
|
|
||||||
from .parsers import _parse_actions
|
|
||||||
from .errors import InvalidAutomationFile
|
from .errors import InvalidAutomationFile
|
||||||
|
from .types import AutomationMetdata, ExtenededAutomationData
|
||||||
|
|
||||||
|
|
||||||
# Single loader
|
# Single loader
|
||||||
def load_automation(
|
def load_automation(
|
||||||
@@ -25,16 +26,26 @@ def load_automation(
|
|||||||
try:
|
try:
|
||||||
yield ExtenededAutomationData(
|
yield ExtenededAutomationData(
|
||||||
metadata=AutomationMetdata.parse_obj(auto_raw),
|
metadata=AutomationMetdata.parse_obj(auto_raw),
|
||||||
sequence=list(
|
condition=load_conditions(auto_raw.get("condition", [])),
|
||||||
_parse_actions(
|
sequence=load_conditions(auto_raw.get("action", [])),
|
||||||
chain(
|
trigger=normalize_obj(auto_raw.get("trigger", [])),
|
||||||
auto_raw.get("condition", []),
|
|
||||||
auto_raw.get("action", []),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
),
|
|
||||||
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])],
|
|
||||||
tags=tags,
|
tags=tags,
|
||||||
)
|
)
|
||||||
except ValidationError as err:
|
except ValidationError as err:
|
||||||
raise InvalidAutomationFile from err
|
raise InvalidAutomationFile from err
|
||||||
|
|
||||||
|
|
||||||
|
def load_conditions(conditions: Union[dict, list, str]):
|
||||||
|
if isinstance(conditions, list):
|
||||||
|
return list(map(ensure_condition_dictionary, conditions))
|
||||||
|
else:
|
||||||
|
return [ensure_condition_dictionary(conditions)]
|
||||||
|
|
||||||
|
|
||||||
|
def ensure_condition_dictionary(c: Union[str, dict]):
|
||||||
|
c = normalize_obj(c)
|
||||||
|
if isinstance(c, str):
|
||||||
|
return {"condition": "template", "value_template": c}
|
||||||
|
elif isinstance(c, dict):
|
||||||
|
return c
|
||||||
|
raise InvalidAutomationFile(f"Invalid type for condition object {c}")
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
from typing import Iterator, List, Optional
|
from typing import Iterator, List, Optional
|
||||||
|
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|
||||||
from .loader import load_automation
|
from .loader import load_automation
|
||||||
|
|
||||||
|
|
||||||
@@ -45,7 +47,7 @@ class AutomationManager:
|
|||||||
tags[index] = automation.tags
|
tags[index] = automation.tags
|
||||||
self.hass_config.save_automations(automations)
|
self.hass_config.save_automations(automations)
|
||||||
self.hass_config.save_tags(tags)
|
self.hass_config.save_tags(tags)
|
||||||
|
|
||||||
def delete(self, index: int):
|
def delete(self, index: int):
|
||||||
automations: List[dict] = []
|
automations: List[dict] = []
|
||||||
deleted = False
|
deleted = False
|
||||||
|
|||||||
@@ -1,88 +0,0 @@
|
|||||||
from typing import Iterable, Union
|
|
||||||
from src.json_serializer import json_dumps, normalize_obj
|
|
||||||
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
|
|
||||||
from .types import AutomationActionNode, AutomationConditionNode
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_actions(
|
|
||||||
raw_actions: Iterable[Union[dict, str]]
|
|
||||||
) -> Iterable[Union[AutomationActionNode, AutomationConditionNode]]:
|
|
||||||
for raw_c in raw_actions:
|
|
||||||
action_type = "unknown"
|
|
||||||
if isinstance(raw_c, str):
|
|
||||||
yield from _parse_conditions([raw_c])
|
|
||||||
continue
|
|
||||||
elif isinstance(raw_c, dict):
|
|
||||||
if raw_c.get("condition"):
|
|
||||||
yield from _parse_conditions([raw_c])
|
|
||||||
continue
|
|
||||||
elif raw_c.get("service"):
|
|
||||||
action_type = "service"
|
|
||||||
action_data = normalize_obj(raw_c)
|
|
||||||
elif raw_c.get("repeat"):
|
|
||||||
action_type = "repeat"
|
|
||||||
repeat_data = raw_c.pop("repeat")
|
|
||||||
action_data = {
|
|
||||||
**raw_c,
|
|
||||||
"repeat": {
|
|
||||||
"count": repeat_data.get("count", 0),
|
|
||||||
"sequence": list(_parse_actions(repeat_data.get("sequence", []))),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
elif raw_c.get("wait_template"):
|
|
||||||
action_type = "wait"
|
|
||||||
action_data = normalize_obj(raw_c)
|
|
||||||
elif raw_c.get("event"):
|
|
||||||
action_type = "event"
|
|
||||||
action_data = normalize_obj(raw_c)
|
|
||||||
elif raw_c.get("type") and raw_c.get("device_id"):
|
|
||||||
action_type = "device"
|
|
||||||
action_data = normalize_obj(raw_c)
|
|
||||||
elif raw_c.get("choose"):
|
|
||||||
action_type = "choose"
|
|
||||||
choose_data = raw_c.pop("choose")
|
|
||||||
default_data = raw_c.pop("default", [])
|
|
||||||
action_data = {
|
|
||||||
**raw_c,
|
|
||||||
"choose": [
|
|
||||||
{
|
|
||||||
"conditions": list(_parse_conditions(option.get("conditions", []))),
|
|
||||||
"sequence": list(_parse_actions(option.get("sequence", []))),
|
|
||||||
}
|
|
||||||
for option in choose_data
|
|
||||||
],
|
|
||||||
"default": list(_parse_actions(default_data)),
|
|
||||||
}
|
|
||||||
else:
|
|
||||||
action_data = normalize_obj(raw_c)
|
|
||||||
yield AutomationActionNode(
|
|
||||||
action=action_type,
|
|
||||||
action_data=action_data,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_conditions(
|
|
||||||
raw_conditions: Iterable[Union[dict, str]]
|
|
||||||
) -> Iterable[AutomationConditionNode]:
|
|
||||||
for raw_c in raw_conditions:
|
|
||||||
if isinstance(raw_c, str):
|
|
||||||
yield AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={"value_template": raw_c},
|
|
||||||
)
|
|
||||||
elif isinstance(raw_c, SecretValue):
|
|
||||||
yield AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
|
|
||||||
)
|
|
||||||
elif isinstance(raw_c, dict):
|
|
||||||
condition = raw_c.pop("condition")
|
|
||||||
yield AutomationConditionNode(
|
|
||||||
condition=condition,
|
|
||||||
condition_data=normalize_obj(raw_c),
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
yield AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data=json_dumps(raw_c),
|
|
||||||
)
|
|
||||||
@@ -1,15 +1,14 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Dict
|
from typing import Dict
|
||||||
|
|
||||||
from src.yaml_serializer import dump_yaml, load_yaml
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
|
|
||||||
|
|
||||||
class TagManager(Dict[int, Dict[str, str]]):
|
class TagManager(Dict[int, Dict[str, str]]):
|
||||||
def save(self, path: Path):
|
def save(self, path: Path):
|
||||||
path.write_text(dump_yaml(dict(self)))
|
path.write_text(dump_yaml(dict(self)))
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def load(cls, path: Path):
|
def load(cls, path: Path):
|
||||||
with path.open('r') as fp:
|
with path.open("r") as fp:
|
||||||
return cls(load_yaml(fp))
|
return cls(load_yaml(fp))
|
||||||
@@ -1,27 +1,7 @@
|
|||||||
from typing import Dict, List, Literal, Optional, Union
|
from typing import Dict, List, Literal, Optional, Union
|
||||||
from pydantic.fields import Field
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
from pydantic.fields import Field
|
||||||
|
|
||||||
class AutomationConditionNode(BaseModel):
|
|
||||||
condition: str
|
|
||||||
condition_data: dict
|
|
||||||
node_type: Literal["condition"] = Field(alias="$smType", default="condition")
|
|
||||||
|
|
||||||
def to_primitive(self):
|
|
||||||
return {
|
|
||||||
**self.condition_data,
|
|
||||||
"condition": self.condition,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class AutomationActionNode(BaseModel):
|
|
||||||
action: str
|
|
||||||
action_data: dict
|
|
||||||
node_type: Literal["action"] = Field(alias="$smType", default="action")
|
|
||||||
|
|
||||||
def to_primitive(self):
|
|
||||||
return self.action_data
|
|
||||||
|
|
||||||
|
|
||||||
class AutomationMetdata(BaseModel):
|
class AutomationMetdata(BaseModel):
|
||||||
@@ -35,15 +15,17 @@ class AutomationMetdata(BaseModel):
|
|||||||
class AutomationData(BaseModel):
|
class AutomationData(BaseModel):
|
||||||
metadata: AutomationMetdata
|
metadata: AutomationMetdata
|
||||||
trigger: List[dict] = []
|
trigger: List[dict] = []
|
||||||
sequence: List[Union[AutomationConditionNode, AutomationActionNode]] = []
|
condition: List[dict] = []
|
||||||
|
sequence: List[dict] = []
|
||||||
|
|
||||||
def to_primitive(self):
|
def to_primitive(self):
|
||||||
return {
|
return {
|
||||||
**self.metadata.dict(),
|
**self.metadata.dict(exclude_unset=True, exclude_none=True),
|
||||||
"trigger": self.trigger,
|
"trigger": self.trigger,
|
||||||
"condition": [],
|
"condition": self.condition,
|
||||||
"action": [action.to_primitive() for action in self.sequence],
|
"action": self.sequence,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class ExtenededAutomationData(AutomationData):
|
class ExtenededAutomationData(AutomationData):
|
||||||
tags: Dict[str, str] = Field(default_factory=dict)
|
tags: Dict[str, str] = Field(default_factory=dict)
|
||||||
+2
-3
@@ -1,9 +1,8 @@
|
|||||||
from email.policy import default
|
|
||||||
from decouple import config, Csv
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
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")
|
||||||
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
||||||
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
from typing import cast
|
|
||||||
from decouple import config
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
from decouple import config
|
||||||
|
|
||||||
from .loader import HassConfig
|
from .loader import HassConfig
|
||||||
|
|
||||||
|
|
||||||
@@ -11,10 +12,13 @@ def find_hass_config() -> HassConfig:
|
|||||||
print("using USE_EXAMPLE_REPO")
|
print("using USE_EXAMPLE_REPO")
|
||||||
from tests.utils import create_copy_of_example_config
|
from tests.utils import create_copy_of_example_config
|
||||||
|
|
||||||
return HassConfig(create_copy_of_example_config())
|
path = create_copy_of_example_config()
|
||||||
|
print("|-> ", path)
|
||||||
|
return HassConfig(path)
|
||||||
|
|
||||||
if "HASSIO_TOKEN" in os.environ:
|
config_dir = Path("/config")
|
||||||
return HassConfig(Path("/config"))
|
if config_dir.is_dir():
|
||||||
|
return HassConfig(config_dir)
|
||||||
|
|
||||||
"""Put together the default configuration directory based on the OS."""
|
"""Put together the default configuration directory based on the OS."""
|
||||||
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
|
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
from src.automations.tags import TagManager
|
|
||||||
|
|
||||||
from src.yaml_serializer import load_yaml, dump_yaml
|
from src.automations.tags import TagManager
|
||||||
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
from src.yaml_serializer.types import IncludedYaml
|
from src.yaml_serializer.types import IncludedYaml
|
||||||
|
|
||||||
from .errors import MissingFile
|
from .errors import MissingFile
|
||||||
|
|
||||||
|
|
||||||
@@ -25,7 +26,7 @@ class HassConfig:
|
|||||||
except FileNotFoundError as err:
|
except FileNotFoundError as err:
|
||||||
raise MissingFile("automations.yaml") from err
|
raise MissingFile("automations.yaml") from err
|
||||||
return self.configurations["automation"]
|
return self.configurations["automation"]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def automation_tags(self) -> TagManager:
|
def automation_tags(self) -> TagManager:
|
||||||
tag_path = self.get_automation_tags_path()
|
tag_path = self.get_automation_tags_path()
|
||||||
@@ -35,7 +36,6 @@ class HassConfig:
|
|||||||
else:
|
else:
|
||||||
return TagManager.load(tag_path)
|
return TagManager.load(tag_path)
|
||||||
|
|
||||||
|
|
||||||
def get_automation_tags_path(self) -> Path:
|
def get_automation_tags_path(self) -> Path:
|
||||||
return self.root_path / ".shortumations" / "tags.yaml"
|
return self.root_path / ".shortumations" / "tags.yaml"
|
||||||
|
|
||||||
@@ -66,4 +66,4 @@ class HassConfig:
|
|||||||
)
|
)
|
||||||
|
|
||||||
def save_tags(self, tags: TagManager):
|
def save_tags(self, tags: TagManager):
|
||||||
tags.save(self.get_automation_tags_path())
|
tags.save(self.get_automation_tags_path())
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import json
|
import json
|
||||||
from typing import Any
|
from typing import Any, List
|
||||||
|
|
||||||
|
|
||||||
def json_dumps(obj: Any) -> str:
|
def json_dumps(obj: Any) -> str:
|
||||||
@@ -34,6 +34,7 @@ def normalize_obj(obj: Any) -> Any:
|
|||||||
or isinstance(obj, int)
|
or isinstance(obj, int)
|
||||||
or isinstance(obj, float)
|
or isinstance(obj, float)
|
||||||
or isinstance(obj, bool)
|
or isinstance(obj, bool)
|
||||||
|
or obj is None
|
||||||
):
|
):
|
||||||
return obj
|
return obj
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import io
|
import io
|
||||||
from typing import Any, Union, TextIO
|
from typing import Any, TextIO, Union
|
||||||
|
|
||||||
from src.yaml_serializer.base_yaml import yaml
|
from src.yaml_serializer.base_yaml import yaml
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
from ruamel.yaml import YAML
|
from ruamel.yaml import YAML
|
||||||
from src.yaml_serializer.types import IncludedYaml, IncludedYamlDir, SecretValue
|
|
||||||
|
from src.yaml_serializer.types import (
|
||||||
|
IncludedYaml,
|
||||||
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
|
)
|
||||||
|
|
||||||
yaml = YAML()
|
yaml = YAML()
|
||||||
yaml.register_class(IncludedYaml)
|
yaml.register_class(IncludedYaml)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from typing import NamedTuple
|
from typing import NamedTuple
|
||||||
|
|
||||||
from ruamel.yaml.nodes import Node
|
from ruamel.yaml.nodes import Node
|
||||||
from ruamel.yaml.representer import BaseRepresenter
|
from ruamel.yaml.representer import BaseRepresenter
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
- id: '1652069225859'
|
||||||
|
alias: 'Climate - Pref temperature '
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: state
|
||||||
|
entity_id: input_number.preferred_temperature
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: climate.set_temperature
|
||||||
|
data:
|
||||||
|
temperature:
|
||||||
|
'[object Object]':
|
||||||
|
target:
|
||||||
|
entity_id: climate.main_floor
|
||||||
|
mode: single
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
# empty configuration file
|
||||||
|
cloud:
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
0:
|
||||||
|
Type: HA
|
||||||
|
1:
|
||||||
|
Type: HA
|
||||||
|
2:
|
||||||
|
Type: Button
|
||||||
|
Room: Living
|
||||||
|
3:
|
||||||
|
Type: Button
|
||||||
|
Room: Kitchen
|
||||||
|
4:
|
||||||
|
Type: Button
|
||||||
|
Room: Kitchen
|
||||||
|
5:
|
||||||
|
Type: Button
|
||||||
|
Room: Kitchen
|
||||||
|
6:
|
||||||
|
Type: Button
|
||||||
|
Room: Kitchen
|
||||||
|
7:
|
||||||
|
Type: Button
|
||||||
|
Room: Living
|
||||||
|
8:
|
||||||
|
Type: Button
|
||||||
|
Room: Baby
|
||||||
|
9:
|
||||||
|
Type: Button
|
||||||
|
Room: Baby
|
||||||
|
10:
|
||||||
|
Type: Button
|
||||||
|
Room: Baby
|
||||||
|
11:
|
||||||
|
Type: Routine
|
||||||
|
Room: Baby
|
||||||
|
12:
|
||||||
|
Type: Routine
|
||||||
|
Room: Baby
|
||||||
|
13:
|
||||||
|
Type: Window
|
||||||
|
Room: Office
|
||||||
|
14:
|
||||||
|
Type: Door
|
||||||
|
Room: Balcony
|
||||||
|
15:
|
||||||
|
Type: Routine
|
||||||
|
16:
|
||||||
|
Type: Button
|
||||||
|
Room: Baby
|
||||||
|
17:
|
||||||
|
Type: Routine
|
||||||
|
18:
|
||||||
|
Type: Routine
|
||||||
|
19:
|
||||||
|
Type: Door
|
||||||
|
Room: Bedroom
|
||||||
|
20:
|
||||||
|
Type: Ensure Power
|
||||||
|
21:
|
||||||
|
Type: Ensure Power
|
||||||
|
22:
|
||||||
|
Type: Motion
|
||||||
|
Room: Office
|
||||||
|
23:
|
||||||
|
Type: Routine
|
||||||
|
Room: Baby
|
||||||
|
24:
|
||||||
|
Type: Climate
|
||||||
|
Climate: Heat
|
||||||
|
25:
|
||||||
|
Type: Climate
|
||||||
|
Climate: Time
|
||||||
|
26:
|
||||||
|
Type: Routine
|
||||||
|
27:
|
||||||
|
Type: Button
|
||||||
|
Room: Bedroom
|
||||||
|
BadOne: yes
|
||||||
@@ -1,8 +1,15 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
|
from ruamel.yaml import YAML
|
||||||
|
|
||||||
from src.api.app import make_app
|
from src.api.app import make_app
|
||||||
from src.automations.types import AutomationData, AutomationMetdata, ExtenededAutomationData
|
from src.automations.types import (
|
||||||
from tests.utils import get_example_automation_loader
|
AutomationData,
|
||||||
|
AutomationMetdata,
|
||||||
|
ExtenededAutomationData,
|
||||||
|
)
|
||||||
|
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
|
||||||
|
|
||||||
|
|
||||||
class BaseTestCase(TestCase):
|
class BaseTestCase(TestCase):
|
||||||
@@ -16,6 +23,9 @@ class BaseTestCase(TestCase):
|
|||||||
|
|
||||||
|
|
||||||
class automation_list_tests(BaseTestCase):
|
class automation_list_tests(BaseTestCase):
|
||||||
|
|
||||||
|
test_params = {"total": 28, "subtest2_found_items": 3, "subtest1_found_items": 10}
|
||||||
|
|
||||||
def test_get_list_of_everything(self):
|
def test_get_list_of_everything(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
"/automations/list",
|
"/automations/list",
|
||||||
@@ -33,8 +43,8 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 50,
|
"limit": 50,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], 28)
|
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||||
self.assertEqual(len(d["data"]), 28)
|
self.assertEqual(len(d["data"]), self.test_params["total"])
|
||||||
|
|
||||||
def test_subset1(self):
|
def test_subset1(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
@@ -53,8 +63,8 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 10,
|
"limit": 10,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], 28)
|
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||||
self.assertEqual(len(d["data"]), 10)
|
self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"])
|
||||||
|
|
||||||
def test_subset2(self):
|
def test_subset2(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
@@ -73,8 +83,24 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 10,
|
"limit": 10,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], 28)
|
self.assertEqual(d["totalItems"], self.test_params["total"])
|
||||||
self.assertEqual(len(d["data"]), 3)
|
self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
|
||||||
|
|
||||||
|
|
||||||
|
class automation2_lists_tests(automation_list_tests):
|
||||||
|
test_params = {
|
||||||
|
"total": 1,
|
||||||
|
"subtest2_found_items": 0,
|
||||||
|
"subtest1_found_items": 1,
|
||||||
|
}
|
||||||
|
|
||||||
|
def setUp(self) -> None:
|
||||||
|
(
|
||||||
|
self.config_folder,
|
||||||
|
self.hass_config,
|
||||||
|
self.automation_loader,
|
||||||
|
) = get_example_automation_loader(HA_CONFIG2_EXAMPLE)
|
||||||
|
self.client = TestClient(make_app(self.automation_loader))
|
||||||
|
|
||||||
|
|
||||||
class automation_update_tests(BaseTestCase):
|
class automation_update_tests(BaseTestCase):
|
||||||
@@ -108,7 +134,191 @@ class automation_update_tests(BaseTestCase):
|
|||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||||
new_auto = resp.json()["data"][0]
|
new_auto = resp.json()["data"][0]
|
||||||
self.assertNotEqual(original_auto, new_auto)
|
self.assertNotEqual(original_auto, new_auto)
|
||||||
self.assertEqual(ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto)
|
self.assertEqual(
|
||||||
|
ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_consistent_standard_1(self):
|
||||||
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15})
|
||||||
|
original_auto = resp.json()["data"][0]
|
||||||
|
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||||
|
resp = self.client.post(
|
||||||
|
"/automations",
|
||||||
|
json={
|
||||||
|
"index": 15,
|
||||||
|
"data": original_auto,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertEqual(resp.status_code, 200)
|
||||||
|
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||||
|
disk_data = dict(YAML().load(fp)[15])
|
||||||
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
|
condition = disk_data.pop("condition")
|
||||||
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
|
self.assertDictEqual(
|
||||||
|
disk_data,
|
||||||
|
{"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"},
|
||||||
|
)
|
||||||
|
self.assertListEqual(
|
||||||
|
trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}]
|
||||||
|
)
|
||||||
|
self.assertListEqual(
|
||||||
|
condition,
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "time",
|
||||||
|
"after": "input_datetime.vita_night_pump_time",
|
||||||
|
"before": "00:00:00",
|
||||||
|
},
|
||||||
|
{"condition": "time", "after": "00:00:00", "before": "06:00:00"},
|
||||||
|
],
|
||||||
|
"condition": "and",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
)
|
||||||
|
self.assertListEqual(
|
||||||
|
action,
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"service": "light.turn_on",
|
||||||
|
"target": {"entity_id": "light.bulb_staircase", "area_id": "living_room"},
|
||||||
|
"data": {"brightness_pct": 40, "transition": 15},
|
||||||
|
}
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_consistent_standard_2(self):
|
||||||
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 27})
|
||||||
|
original_auto = resp.json()["data"][0]
|
||||||
|
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||||
|
resp = self.client.post(
|
||||||
|
"/automations",
|
||||||
|
json={
|
||||||
|
"index": 27,
|
||||||
|
"data": original_auto,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
self.assertEqual(resp.status_code, 200)
|
||||||
|
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||||
|
disk_data = dict(YAML().load(fp)[27])
|
||||||
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
|
condition = disk_data.pop("condition")
|
||||||
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
|
self.assertDictEqual(
|
||||||
|
disk_data,
|
||||||
|
{"id": "1649947692702", "alias": "I CHANGED!", "description": "", "mode": "single"},
|
||||||
|
)
|
||||||
|
self.assertListEqual(
|
||||||
|
trigger,
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
|
"domain": "zha",
|
||||||
|
"platform": "device",
|
||||||
|
"type": "remote_button_short_press",
|
||||||
|
"subtype": "turn_on",
|
||||||
|
"id": "turn_on",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
|
"domain": "zha",
|
||||||
|
"platform": "device",
|
||||||
|
"type": "remote_button_short_press",
|
||||||
|
"subtype": "turn_off",
|
||||||
|
"id": "turn_off",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
|
"domain": "zha",
|
||||||
|
"platform": "device",
|
||||||
|
"type": "remote_button_short_press",
|
||||||
|
"subtype": "dim_up",
|
||||||
|
"id": "dim_up",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
|
"domain": "zha",
|
||||||
|
"platform": "device",
|
||||||
|
"type": "remote_button_short_press",
|
||||||
|
"subtype": "dim_down",
|
||||||
|
"id": "dim_down",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
|
"domain": "zha",
|
||||||
|
"platform": "device",
|
||||||
|
"type": "remote_button_double_press",
|
||||||
|
"subtype": "turn_on",
|
||||||
|
"id": "up_dbclk",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
)
|
||||||
|
self.assertListEqual(condition, [])
|
||||||
|
self.assertListEqual(
|
||||||
|
action,
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"choose": [
|
||||||
|
{
|
||||||
|
"conditions": [{"condition": "trigger", "id": "turn_off"}],
|
||||||
|
"sequence": [
|
||||||
|
{
|
||||||
|
"type": "turn_off",
|
||||||
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
|
"entity_id": "light.bulb_ari_lamp",
|
||||||
|
"domain": "light",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"conditions": [{"condition": "trigger", "id": "turn_on"}],
|
||||||
|
"sequence": [
|
||||||
|
{
|
||||||
|
"service": "light.turn_on",
|
||||||
|
"data": {"color_temp": 153, "brightness_pct": 100},
|
||||||
|
"target": {"device_id": "das2qdasdasdasadaasd"},
|
||||||
|
}
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"conditions": [{"condition": "trigger", "id": "dim_up"}],
|
||||||
|
"sequence": [
|
||||||
|
{
|
||||||
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
|
"domain": "light",
|
||||||
|
"entity_id": "light.bulb_ari_lamp",
|
||||||
|
"type": "brightness_increase",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"conditions": [{"condition": "trigger", "id": "dim_down"}],
|
||||||
|
"sequence": [
|
||||||
|
{
|
||||||
|
"device_id": "das2qdasdasdasadaasd",
|
||||||
|
"domain": "light",
|
||||||
|
"entity_id": "light.bulb_ari_lamp",
|
||||||
|
"type": "brightness_decrease",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"conditions": [{"condition": "trigger", "id": "up_dbclk"}],
|
||||||
|
"sequence": [
|
||||||
|
{
|
||||||
|
"service": "light.turn_on",
|
||||||
|
"data": {"color_temp": 500, "brightness_pct": 100},
|
||||||
|
"target": {"device_id": "das2qdasdasdasadaasd"},
|
||||||
|
}
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
"default": [],
|
||||||
|
}
|
||||||
|
],
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class automation_delete_tests(BaseTestCase):
|
class automation_delete_tests(BaseTestCase):
|
||||||
|
|||||||
@@ -1,15 +1,8 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from src.automations.types import (
|
|
||||||
AutomationActionNode,
|
|
||||||
AutomationConditionNode,
|
|
||||||
AutomationMetdata,
|
|
||||||
ExtenededAutomationData,
|
|
||||||
)
|
|
||||||
from src.automations.loader import load_automation
|
from src.automations.loader import load_automation
|
||||||
from src.yaml_serializer.types import (
|
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||||
SecretValue,
|
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
NOT_IMPLEMENTED_SV_MSG,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class loader_tests(TestCase):
|
class loader_tests(TestCase):
|
||||||
@@ -33,7 +26,7 @@ class loader_tests(TestCase):
|
|||||||
],
|
],
|
||||||
"mode": "single",
|
"mode": "single",
|
||||||
},
|
},
|
||||||
{}
|
{},
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
@@ -46,22 +39,21 @@ class loader_tests(TestCase):
|
|||||||
mode="single",
|
mode="single",
|
||||||
),
|
),
|
||||||
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
|
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
|
||||||
sequence=[
|
condition=[
|
||||||
AutomationConditionNode(
|
{
|
||||||
condition="template",
|
"condition": "template",
|
||||||
condition_data={"value_template": "states(time.time) >= '10:00:00'"},
|
"value_template": "states(time.time) >= '10:00:00'",
|
||||||
),
|
}
|
||||||
AutomationActionNode(
|
|
||||||
action="device",
|
|
||||||
action_data={
|
|
||||||
"device_id": NOT_IMPLEMENTED_SV_MSG,
|
|
||||||
"domain": "mobile_app",
|
|
||||||
"type": "notify",
|
|
||||||
"title": "Hassio Status",
|
|
||||||
"message": "Hassio Is turning off...",
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
tags={}
|
sequence=[
|
||||||
|
{
|
||||||
|
"device_id": NOT_IMPLEMENTED_SV_MSG,
|
||||||
|
"domain": "mobile_app",
|
||||||
|
"type": "notify",
|
||||||
|
"title": "Hassio Status",
|
||||||
|
"message": "Hassio Is turning off...",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
tags={},
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||||
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||||
from tests.utils import (
|
from tests.utils import (
|
||||||
|
|||||||
@@ -1,222 +0,0 @@
|
|||||||
from unittest import TestCase
|
|
||||||
from src.automations.types import (
|
|
||||||
AutomationActionNode,
|
|
||||||
AutomationConditionNode,
|
|
||||||
)
|
|
||||||
from src.automations.parsers import (
|
|
||||||
_parse_conditions,
|
|
||||||
_parse_actions,
|
|
||||||
)
|
|
||||||
from src.yaml_serializer.types import (
|
|
||||||
SecretValue,
|
|
||||||
NOT_IMPLEMENTED_SV_MSG,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class parser_tests(TestCase):
|
|
||||||
def test_various_condition_types(self):
|
|
||||||
raw_conditions = [
|
|
||||||
{"condition": "template", "value_template": "silly logic here"},
|
|
||||||
"silly logic here",
|
|
||||||
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
|
|
||||||
{"condition": "what is this?", "wuba": "dub"},
|
|
||||||
SecretValue("supersecretcondition", "rm -rf ./*"),
|
|
||||||
]
|
|
||||||
expected_process = [
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={"value_template": "silly logic here"},
|
|
||||||
),
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={"value_template": "silly logic here"},
|
|
||||||
),
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="time",
|
|
||||||
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
|
|
||||||
),
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="what is this?",
|
|
||||||
condition_data={"wuba": "dub"},
|
|
||||||
),
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={"value_template": NOT_IMPLEMENTED_SV_MSG},
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
||||||
for expected, parsed in zip(expected_process, _parse_conditions(raw_conditions)):
|
|
||||||
self.assertEqual(parsed, expected)
|
|
||||||
|
|
||||||
def test_various_action_types(self):
|
|
||||||
raw_conditions = [
|
|
||||||
{"condition": "template", "value_template": "silly logic here"},
|
|
||||||
"silly logic here",
|
|
||||||
{"condition": "time", "after": "10:00:00", "weekday": ["mon", "tue"]},
|
|
||||||
{
|
|
||||||
"service": "light.turn_on",
|
|
||||||
"target": ["light.kitchen"],
|
|
||||||
"data": {"brightness": 10},
|
|
||||||
},
|
|
||||||
{"something": "is wrong"},
|
|
||||||
{
|
|
||||||
"alias": "Doing amazing things!",
|
|
||||||
"repeat": {
|
|
||||||
"count": 1000,
|
|
||||||
"sequence": [
|
|
||||||
"conditionA",
|
|
||||||
{
|
|
||||||
"wait_template": "states('light.kitchen') == 'off",
|
|
||||||
"timeout": 10,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "toggle",
|
|
||||||
"domain": "light",
|
|
||||||
"device_id": "1231412",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{"event": "custom-event", "event_data": "wow"},
|
|
||||||
{
|
|
||||||
"type": "toggle",
|
|
||||||
"domain": "light",
|
|
||||||
"device_id": "1231412",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"alias": "Doing amazing things!",
|
|
||||||
"choose": [
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}",
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
"conditionA",
|
|
||||||
{
|
|
||||||
"wait_template": "states('light.kitchen') == 'off",
|
|
||||||
"timeout": 10,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "toggle",
|
|
||||||
"domain": "light",
|
|
||||||
"device_id": "1231412",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"default": [{"event": "nope", "event_data": {}}],
|
|
||||||
},
|
|
||||||
]
|
|
||||||
expected_process = [
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={"value_template": "silly logic here"},
|
|
||||||
),
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={"value_template": "silly logic here"},
|
|
||||||
),
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="time",
|
|
||||||
condition_data={"after": "10:00:00", "weekday": ["mon", "tue"]},
|
|
||||||
),
|
|
||||||
AutomationActionNode(
|
|
||||||
action="service",
|
|
||||||
action_data={
|
|
||||||
"service": "light.turn_on",
|
|
||||||
"target": ["light.kitchen"],
|
|
||||||
"data": {"brightness": 10},
|
|
||||||
},
|
|
||||||
),
|
|
||||||
AutomationActionNode(action="unknown", action_data={"something": "is wrong"}),
|
|
||||||
AutomationActionNode(
|
|
||||||
action="repeat",
|
|
||||||
action_data={
|
|
||||||
"alias": "Doing amazing things!",
|
|
||||||
"repeat": {
|
|
||||||
"count": 1000,
|
|
||||||
"sequence": [
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={"value_template": "conditionA"},
|
|
||||||
),
|
|
||||||
AutomationActionNode(
|
|
||||||
action="wait",
|
|
||||||
action_data={
|
|
||||||
"wait_template": "states('light.kitchen') == 'off",
|
|
||||||
"timeout": 10,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
AutomationActionNode(
|
|
||||||
action="device",
|
|
||||||
action_data={
|
|
||||||
"type": "toggle",
|
|
||||||
"domain": "light",
|
|
||||||
"device_id": "1231412",
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
),
|
|
||||||
AutomationActionNode(
|
|
||||||
action="event",
|
|
||||||
action_data={"event": "custom-event", "event_data": "wow"},
|
|
||||||
),
|
|
||||||
AutomationActionNode(
|
|
||||||
action="device",
|
|
||||||
action_data={
|
|
||||||
"type": "toggle",
|
|
||||||
"domain": "light",
|
|
||||||
"device_id": "1231412",
|
|
||||||
},
|
|
||||||
),
|
|
||||||
AutomationActionNode(
|
|
||||||
action="choose",
|
|
||||||
action_data={
|
|
||||||
"alias": "Doing amazing things!",
|
|
||||||
"choose": [
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={
|
|
||||||
"value_template": r"{{ states('switch.plug_out_bug_lamp') == 'unavailable'}}"
|
|
||||||
},
|
|
||||||
)
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
AutomationConditionNode(
|
|
||||||
condition="template",
|
|
||||||
condition_data={"value_template": "conditionA"},
|
|
||||||
),
|
|
||||||
AutomationActionNode(
|
|
||||||
action="wait",
|
|
||||||
action_data={
|
|
||||||
"wait_template": "states('light.kitchen') == 'off",
|
|
||||||
"timeout": 10,
|
|
||||||
},
|
|
||||||
),
|
|
||||||
AutomationActionNode(
|
|
||||||
action="device",
|
|
||||||
action_data={
|
|
||||||
"type": "toggle",
|
|
||||||
"domain": "light",
|
|
||||||
"device_id": "1231412",
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"default": [
|
|
||||||
AutomationActionNode(
|
|
||||||
action="event",
|
|
||||||
action_data={"event": "nope", "event_data": {}},
|
|
||||||
)
|
|
||||||
],
|
|
||||||
},
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
||||||
for expected, parsed in zip(expected_process, _parse_actions(raw_conditions)):
|
|
||||||
self.assertEqual(parsed, expected)
|
|
||||||
@@ -1,18 +1,17 @@
|
|||||||
|
|
||||||
|
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from tempfile import mktemp
|
from tempfile import mktemp
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.automations.tags import TagManager
|
from src.automations.tags import TagManager
|
||||||
|
|
||||||
class tag_tests(TestCase):
|
|
||||||
|
|
||||||
|
class tag_tests(TestCase):
|
||||||
def test_load_and_save(self):
|
def test_load_and_save(self):
|
||||||
tmp_file = Path(mktemp()).with_suffix('.yml')
|
tmp_file = Path(mktemp()).with_suffix(".yml")
|
||||||
tags = TagManager()
|
tags = TagManager()
|
||||||
tags[0] = {'Room': "Kitchen", "Type": 'Lights'}
|
tags[0] = {"Room": "Kitchen", "Type": "Lights"}
|
||||||
tags[1] = {}
|
tags[1] = {}
|
||||||
|
|
||||||
tags.save(tmp_file)
|
tags.save(tmp_file)
|
||||||
loaded_tags = TagManager.load(tmp_file)
|
loaded_tags = TagManager.load(tmp_file)
|
||||||
assert loaded_tags.keys() == tags.keys()
|
assert loaded_tags.keys() == tags.keys()
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from src.automations.types import AutomationData, AutomationMetdata
|
from src.automations.types import AutomationData, AutomationMetdata
|
||||||
from src.hass_config.errors import MissingFile
|
from src.hass_config.errors import MissingFile
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
import json
|
import json
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from ruamel.yaml.scalarstring import ScalarString
|
|
||||||
from ruamel.yaml.scalarint import ScalarInt
|
|
||||||
from ruamel.yaml.scalarbool import ScalarBoolean
|
from ruamel.yaml.scalarbool import ScalarBoolean
|
||||||
from ruamel.yaml.scalarfloat import ScalarFloat
|
from ruamel.yaml.scalarfloat import ScalarFloat
|
||||||
from src.yaml_serializer.types import SecretValue, NOT_IMPLEMENTED_SV_MSG
|
from ruamel.yaml.scalarint import ScalarInt
|
||||||
|
from ruamel.yaml.scalarstring import ScalarString
|
||||||
|
|
||||||
from src.json_serializer import json_dumps
|
from src.json_serializer import json_dumps
|
||||||
|
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
|
|
||||||
|
|
||||||
class json_serializer_tests(TestCase):
|
class json_serializer_tests(TestCase):
|
||||||
|
|||||||
@@ -1,14 +1,13 @@
|
|||||||
import io
|
import io
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from src.yaml_serializer import (
|
|
||||||
dump_yaml,
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
load_yaml,
|
|
||||||
)
|
|
||||||
from src.yaml_serializer.types import (
|
from src.yaml_serializer.types import (
|
||||||
IncludedYaml,
|
IncludedYaml,
|
||||||
SecretValue,
|
|
||||||
IncludedYamlDir,
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
)
|
)
|
||||||
|
from tests.utils import SAMPLES_FOLDER
|
||||||
|
|
||||||
|
|
||||||
class dumping_yamls_tests(TestCase):
|
class dumping_yamls_tests(TestCase):
|
||||||
|
|||||||
+9
-6
@@ -1,32 +1,35 @@
|
|||||||
|
from pathlib import Path
|
||||||
from shutil import copytree
|
from shutil import copytree
|
||||||
from tempfile import mkdtemp
|
from tempfile import mkdtemp
|
||||||
from pathlib import Path
|
|
||||||
from typing import List, Literal, Optional, Tuple
|
from typing import List, Literal, Optional, Tuple
|
||||||
|
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.automations.types import AutomationData
|
from src.automations.types import AutomationData
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
|
|
||||||
from src.yaml_serializer import dump_yaml
|
from src.yaml_serializer import dump_yaml
|
||||||
from src.yaml_serializer.types import IncludedYaml
|
from src.yaml_serializer.types import IncludedYaml
|
||||||
|
|
||||||
THIS_FOLDER = Path(__file__).parent
|
THIS_FOLDER = Path(__file__).parent
|
||||||
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
||||||
|
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
|
||||||
|
|
||||||
|
|
||||||
def get_example_automation_loader() -> Tuple[Path, HassConfig, AutomationManager]:
|
def get_example_automation_loader(
|
||||||
|
config_to_copy: Path = HA_CONFIG_EXAMPLE,
|
||||||
|
) -> Tuple[Path, HassConfig, AutomationManager]:
|
||||||
"""Creates an example automation loader from the samples folder
|
"""Creates an example automation loader from the samples folder
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Tuple[Path, HassConfig, AutomationManager]
|
Tuple[Path, HassConfig, AutomationManager]
|
||||||
"""
|
"""
|
||||||
root_folder = create_copy_of_example_config()
|
root_folder = create_copy_of_example_config(config_to_copy)
|
||||||
hass_config = HassConfig(root_folder)
|
hass_config = HassConfig(root_folder)
|
||||||
automation_loader = AutomationManager(hass_config)
|
automation_loader = AutomationManager(hass_config)
|
||||||
return root_folder, hass_config, automation_loader
|
return root_folder, hass_config, automation_loader
|
||||||
|
|
||||||
|
|
||||||
def create_copy_of_example_config() -> Path:
|
def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> Path:
|
||||||
"""Creates a copy of the example config folder
|
"""Creates a copy of the example config folder
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
@@ -34,7 +37,7 @@ def create_copy_of_example_config() -> Path:
|
|||||||
"""
|
"""
|
||||||
root_folder = Path(mkdtemp())
|
root_folder = Path(mkdtemp())
|
||||||
root_folder.rmdir()
|
root_folder.rmdir()
|
||||||
copytree(HA_CONFIG_EXAMPLE, root_folder)
|
copytree(config_to_copy, root_folder)
|
||||||
return root_folder
|
return root_folder
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+5
-3
@@ -1,16 +1,18 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: 0.0.12
|
version: 0.1.5
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
|
image: 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:
|
||||||
- armhf
|
|
||||||
- armv7
|
|
||||||
- aarch64
|
- aarch64
|
||||||
- amd64
|
- amd64
|
||||||
|
- armhf
|
||||||
|
- armv7
|
||||||
- i386
|
- i386
|
||||||
startup: application
|
startup: application
|
||||||
boot: auto
|
boot: auto
|
||||||
|
init: false
|
||||||
ingress: true
|
ingress: true
|
||||||
ingress_port: 8000
|
ingress_port: 8000
|
||||||
ingress_entry: "web/"
|
ingress_entry: "web/"
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
addon:
|
addon:
|
||||||
image: "asosnovsky/shortumation:${ARCH:-amd64}-${BUILD_TAG:-latest}"
|
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
|
||||||
build:
|
build:
|
||||||
context: "./"
|
context: "./"
|
||||||
dockerfile: "./Dockerfile"
|
dockerfile: "./Dockerfile"
|
||||||
|
|||||||
@@ -10,3 +10,4 @@
|
|||||||
Type: Vent
|
Type: Vent
|
||||||
Room: Bathroom
|
Room: Bathroom
|
||||||
Floor: First
|
Floor: First
|
||||||
|
5: {}
|
||||||
@@ -40,13 +40,17 @@
|
|||||||
- id: shortu-2
|
- id: shortu-2
|
||||||
alias: Neat trick
|
alias: Neat trick
|
||||||
description: ''
|
description: ''
|
||||||
trigger_variables:
|
|
||||||
mode: queued
|
mode: queued
|
||||||
trigger: []
|
trigger: []
|
||||||
condition: []
|
condition: []
|
||||||
action:
|
action:
|
||||||
- alias: Choose
|
- alias: Choose
|
||||||
default: []
|
default:
|
||||||
|
- condition: and
|
||||||
|
alias: ''
|
||||||
|
conditions:
|
||||||
|
- condition: or
|
||||||
|
conditions: []
|
||||||
choose: []
|
choose: []
|
||||||
- service: lights.turn_on
|
- service: lights.turn_on
|
||||||
target:
|
target:
|
||||||
|
|||||||
+2
-1
@@ -8,10 +8,10 @@
|
|||||||
"@types/node": "^12.0.0",
|
"@types/node": "^12.0.0",
|
||||||
"@types/react": "^17.0.0",
|
"@types/react": "^17.0.0",
|
||||||
"@types/react-dom": "^17.0.0",
|
"@types/react-dom": "^17.0.0",
|
||||||
"chroma-js": "^2.1.2",
|
|
||||||
"jss": "^10.8.2",
|
"jss": "^10.8.2",
|
||||||
"react": "^17.0.2",
|
"react": "^17.0.2",
|
||||||
"react-dom": "^17.0.2",
|
"react-dom": "^17.0.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": "4.0.3",
|
||||||
@@ -23,6 +23,7 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
"build": "react-scripts build",
|
"build": "react-scripts build",
|
||||||
|
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
|
||||||
"test": "react-scripts test",
|
"test": "react-scripts test",
|
||||||
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
||||||
"eject": "react-scripts eject",
|
"eject": "react-scripts eject",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { API } from "./base";
|
import { API } from "./base";
|
||||||
import { ListData, ListParams } from "./types";
|
import { ListData, ListParams } from "./types";
|
||||||
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
|
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||||
|
|
||||||
|
|
||||||
export const makeAutomationAPI = (api: API) => ({
|
export const makeAutomationAPI = (api: API) => ({
|
||||||
@@ -14,19 +14,19 @@ export const makeAutomationAPI = (api: API) => ({
|
|||||||
});
|
});
|
||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
async update({index, auto}: {index: number, auto: AutomationData}) {
|
async update({ index, auto }: { index: number, auto: AutomationData }) {
|
||||||
return await api.makeCall({
|
return await api.makeCall({
|
||||||
path: AUTOMTAION_ROOT,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
data: auto
|
data: auto
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
async remove({index}: {index: number}) {
|
async remove({ index }: { index: number }) {
|
||||||
return await api.makeCall({
|
return await api.makeCall({
|
||||||
method: "DELETE",
|
method: "DELETE",
|
||||||
path: AUTOMTAION_ROOT,
|
path: AUTOMTAION_ITEM,
|
||||||
data: {
|
data: {
|
||||||
index,
|
index,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useRef } from 'react';
|
import { useRef } from 'react';
|
||||||
import { AutomationData } from 'types/automations';
|
import { AutomationData } from 'types/automations';
|
||||||
import { API } from './base';
|
import { API } from './base';
|
||||||
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
|
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||||
|
|
||||||
|
|
||||||
export const useMockAPI = (
|
export const useMockAPI = (
|
||||||
@@ -26,7 +26,7 @@ export const useMockAPI = (
|
|||||||
}))
|
}))
|
||||||
} as any
|
} as any
|
||||||
}
|
}
|
||||||
if (path === AUTOMTAION_ROOT) {
|
if (path === AUTOMTAION_ITEM) {
|
||||||
if (method === 'POST') {
|
if (method === 'POST') {
|
||||||
const { index, data: auto } = data as any;
|
const { index, data: auto } = data as any;
|
||||||
if (index >= automationsRef.current.length) {
|
if (index >= automationsRef.current.length) {
|
||||||
@@ -37,7 +37,7 @@ export const useMockAPI = (
|
|||||||
auto,
|
auto,
|
||||||
...automationsRef.current.slice(index + 1)
|
...automationsRef.current.slice(index + 1)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
data: {}
|
data: {}
|
||||||
|
|||||||
@@ -2,3 +2,4 @@
|
|||||||
|
|
||||||
export const AUTOMTAION_ROOT = '/' as const;
|
export const AUTOMTAION_ROOT = '/' as const;
|
||||||
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
||||||
|
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.show {
|
.automation-editor--info-box.show {
|
||||||
min-width: 25em;
|
min-width: 20em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.hide {
|
.automation-editor--info-box.hide {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import "./AutoInfoBox.css";
|
import "./AutoInfoBox.css";
|
||||||
import { AutomationData, 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 InputTextArea from "components/Inputs/InputTextArea";
|
import InputTextArea from "components/Inputs/InputTextArea";
|
||||||
import { FC, useRef, useState } from 'react';
|
import { FC, useRef, useState } from 'react';
|
||||||
@@ -41,6 +41,7 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
if (newName.length <= 0) {
|
if (newName.length <= 0) {
|
||||||
return "Name must be at least 1 character long"
|
return "Name must be at least 1 character long"
|
||||||
}
|
}
|
||||||
|
// eslint-disable-next-line
|
||||||
for (const [name, _] of tags) {
|
for (const [name, _] of tags) {
|
||||||
if (name.trim() === newName.trim()) {
|
if (name.trim() === newName.trim()) {
|
||||||
return `The tag '${name}' already exists`
|
return `The tag '${name}' already exists`
|
||||||
|
|||||||
@@ -1,10 +1,69 @@
|
|||||||
.automation-editor--info-icon {
|
.automation-editor {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper {
|
||||||
|
flex: 1;
|
||||||
|
padding: 0 0.5em 0 0.5em;
|
||||||
|
max-height: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper--toolbar {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: flex-end;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
||||||
|
height: 0;
|
||||||
|
opacity: 0;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
||||||
|
border-color: var(--change);
|
||||||
|
color: var(--change)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper--toolbar--save-btn {
|
||||||
|
display: flex;
|
||||||
|
gap: 0.5em;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0.25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--flow {
|
||||||
|
border-color: var(--change);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--flow-wrapper--flow {
|
||||||
|
flex: 1;
|
||||||
|
border: 1px solid var(--secondary-accent);
|
||||||
|
margin: 0 0 0.5em 0;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box {
|
||||||
|
position: relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--icon {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 1.5em;
|
right: 0em;
|
||||||
bottom: 0.5em;
|
bottom: 0.5em;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.hide>.automation-editor--info-icon {
|
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
|
z-index: 2;
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
import { AutomationEditor } from './index';
|
import { AutomationEditor } from './index';
|
||||||
import { NODE_HEIGHT, NODE_WIDTH, DISTANCE_FACTOR, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE } from '../DAGSvgs/constants';
|
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
|
import * as dgconst from 'components/DAGSvgs/constants';
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -10,14 +10,7 @@ export default {
|
|||||||
component: AutomationEditor,
|
component: AutomationEditor,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
args: {
|
args: {
|
||||||
dims: {
|
dims: dgconst.DEFAULT_DIMS
|
||||||
nodeHeight: NODE_HEIGHT,
|
|
||||||
nodeWidth: NODE_WIDTH,
|
|
||||||
addHeight: ADD_HEIGHT,
|
|
||||||
addWidth: ADD_WIDTH,
|
|
||||||
circleSize: CIRCLE_SIZE,
|
|
||||||
distanceFactor: DISTANCE_FACTOR,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} as ComponentMeta<typeof AutomationEditor>
|
} as ComponentMeta<typeof AutomationEditor>
|
||||||
|
|
||||||
@@ -34,10 +27,14 @@ const Template: ComponentStory<typeof AutomationEditor> = args => {
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const Loading = Template.bind({});
|
||||||
|
|
||||||
|
|
||||||
export const Simple = Template.bind({})
|
export const Simple = Template.bind({})
|
||||||
Simple.args = {
|
Simple.args = {
|
||||||
...Simple.args,
|
...Simple.args,
|
||||||
automation: {
|
automation: {
|
||||||
|
condition: [],
|
||||||
tags: {
|
tags: {
|
||||||
"Room": "Bathroom",
|
"Room": "Bathroom",
|
||||||
"For": "Toliet",
|
"For": "Toliet",
|
||||||
@@ -55,53 +52,38 @@ Simple.args = {
|
|||||||
},
|
},
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
"$smType": undefined,
|
|
||||||
"platform": "numeric_state",
|
"platform": "numeric_state",
|
||||||
"entity_id": "test",
|
"entity_id": "test",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"$smType": undefined,
|
|
||||||
"platform": "homeassistant",
|
"platform": "homeassistant",
|
||||||
"event": "start",
|
"event": "start",
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
sequence: [
|
sequence: [
|
||||||
{
|
{
|
||||||
$smType: "condition",
|
|
||||||
condition: 'and',
|
condition: 'and',
|
||||||
condition_data: {
|
conditions: [
|
||||||
conditions: [
|
{
|
||||||
{
|
condition: 'numeric_state',
|
||||||
$smType: 'condition',
|
entity_id: 'sensor.temperature_kitchen',
|
||||||
condition: 'numeric_state',
|
below: '15',
|
||||||
condition_data: {
|
},
|
||||||
entity_id: 'sensor.temperature_kitchen',
|
{
|
||||||
below: '15',
|
condition: 'template',
|
||||||
}
|
value_template: 'states(switch.kitchen_light) == "on"'
|
||||||
},
|
}
|
||||||
{
|
]
|
||||||
$smType: "condition",
|
|
||||||
condition: 'template',
|
|
||||||
condition_data: {
|
|
||||||
value_template: 'states(switch.kitchen_light) == "on"'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
$smType: "action",
|
alias: "Start Music In Kitchen",
|
||||||
action: "service",
|
service: 'media_player.play_media',
|
||||||
action_data: {
|
target: {
|
||||||
alias: "Start Music In Kitchen",
|
entity_id: "media_player.kitchen_dot"
|
||||||
service: 'media_player.play_media',
|
},
|
||||||
target: {
|
data: {
|
||||||
entity_id: "media_player.kitchen_dot"
|
media_content_id: "Good Morning",
|
||||||
},
|
media_content_type: "SPOTIFY",
|
||||||
data: {
|
|
||||||
media_content_id: "Good Morning",
|
|
||||||
media_content_type: "SPOTIFY",
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -113,6 +95,7 @@ export const EmptyStart = Template.bind({})
|
|||||||
EmptyStart.args = {
|
EmptyStart.args = {
|
||||||
...EmptyStart.args,
|
...EmptyStart.args,
|
||||||
automation: {
|
automation: {
|
||||||
|
condition: [],
|
||||||
tags: {},
|
tags: {},
|
||||||
metadata: {
|
metadata: {
|
||||||
id: "random",
|
id: "random",
|
||||||
|
|||||||
@@ -1,28 +1,17 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { DAGBoardElmDims } from "components/DAGSvgs/DAGBoard";
|
import { ArrowIcon, CheckMarkIcon } from "components/Icons";
|
||||||
import { ArrowIcon, CheckMarkIcon, ZoomIcon } from "components/Icons";
|
import { FC, useState } from "react";
|
||||||
import { SequenceNodes } from "components/SequenceNodes";
|
import { AutomationData } from "types/automations";
|
||||||
import { FC, useEffect, useState } from "react";
|
|
||||||
import { AutomationData, AutomationSequenceNode } from "types/automations";
|
|
||||||
import useWindowSize from "utils/useWindowSize";
|
|
||||||
import { AutoInfoBox } from "./AutoInfoBox";
|
import { AutoInfoBox } from "./AutoInfoBox";
|
||||||
import { useEditorStyles } from "./styles";
|
|
||||||
import { computeTriggerPos, computeExtraField } from './positions';
|
|
||||||
import { chain } from "utils/iter";
|
|
||||||
import { AutomationTrigger } from 'types/automations/triggers';
|
|
||||||
import { Modal } from "components/Modal";
|
|
||||||
import { NodeEditor } from "components/NodeEditor";
|
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
import { useAutomatioEditorState } from "./state";
|
import { useAutomatioEditorState } from "./state";
|
||||||
|
import { DAGAutomationFlow } from "components/DAGFlow";
|
||||||
|
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
||||||
|
|
||||||
interface TriggerEditorModalState {
|
|
||||||
trigger: AutomationTrigger;
|
|
||||||
onSave: (node: AutomationTrigger) => void;
|
|
||||||
}
|
|
||||||
interface Props {
|
interface Props {
|
||||||
automation: AutomationData;
|
automation?: AutomationData;
|
||||||
dims: DAGBoardElmDims;
|
dims: DAGAutomationFlowDims;
|
||||||
onUpdate: (auto: AutomationData) => void;
|
onUpdate: (auto: AutomationData) => void;
|
||||||
}
|
}
|
||||||
export const AutomationEditor: FC<Props> = ({
|
export const AutomationEditor: FC<Props> = ({
|
||||||
@@ -36,38 +25,19 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
updateSequence,
|
updateSequence,
|
||||||
updateTrigger,
|
updateTrigger,
|
||||||
updateMetadata,
|
updateMetadata,
|
||||||
|
updateCondition,
|
||||||
save,
|
save,
|
||||||
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||||
|
|
||||||
const [zoomLevel, setZoomLevel] = useState(40);
|
|
||||||
const { ratioWbh } = useWindowSize();
|
|
||||||
const [closeInfo, setCloseInfo] = useState(false);
|
const [closeInfo, setCloseInfo] = useState(false);
|
||||||
const [modalState, setModalState] = useState<null | TriggerEditorModalState>(null);
|
|
||||||
const { classes } = useEditorStyles({
|
|
||||||
closeInfo,
|
|
||||||
horizontalMode: ratioWbh < 0.75,
|
|
||||||
autoChanged: state.status,
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// render
|
// render
|
||||||
if (state.status === 'loading') {
|
if (state.status === 'loading') {
|
||||||
return <div className={classes.root}>
|
return <div className="automation-editor loading">
|
||||||
Loading...
|
Loading...
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
return <div className={classes.root}>
|
return <div className="automation-editor">
|
||||||
<Modal open={!!modalState}>
|
|
||||||
{!!modalState && <NodeEditor
|
|
||||||
node={modalState.trigger}
|
|
||||||
onClose={() => setModalState(null)}
|
|
||||||
onSave={(n) => {
|
|
||||||
modalState.onSave(n as any);
|
|
||||||
setModalState(null);
|
|
||||||
}}
|
|
||||||
allowedTypes={['trigger']}
|
|
||||||
/>}
|
|
||||||
</Modal>
|
|
||||||
<AutoInfoBox
|
<AutoInfoBox
|
||||||
className={closeInfo ? "hide" : "show"}
|
className={closeInfo ? "hide" : "show"}
|
||||||
metadata={state.data.metadata}
|
metadata={state.data.metadata}
|
||||||
@@ -75,64 +45,31 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
onUpdate={updateMetadata}
|
onUpdate={updateMetadata}
|
||||||
>
|
>
|
||||||
<ButtonIcon
|
<ButtonIcon
|
||||||
className={`${classes.infoIcon} automation-editor--info-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>
|
>{ArrowIcon}</ButtonIcon>
|
||||||
</AutoInfoBox>
|
</AutoInfoBox>
|
||||||
|
|
||||||
<div className={classes.wrapper}>
|
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
||||||
<div className={classes.toolbar}>
|
<div className="automation-editor--flow-wrapper--toolbar">
|
||||||
<div style={{ display: 'flex' }}>
|
|
||||||
<ZoomIcon className={classes.zoomImg} size={1} color="white" />
|
|
||||||
<input
|
|
||||||
type="number"
|
|
||||||
min={1} max={100} step={1}
|
|
||||||
className={classes.zoom}
|
|
||||||
value={zoomLevel}
|
|
||||||
onChange={z => setZoomLevel(z.target.valueAsNumber ?? 40)}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<Button
|
<Button
|
||||||
className={classes.saveBtn}
|
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
||||||
onClick={save}
|
onClick={save}
|
||||||
disabled={state.status !== 'changed'}
|
disabled={state.status !== 'changed'}
|
||||||
>
|
>
|
||||||
Save <CheckMarkIcon color="#bf4" />
|
Save <CheckMarkIcon color="#bf4" />
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<SequenceNodes
|
<DAGAutomationFlow
|
||||||
zoomLevel={zoomLevel * 200 / 100 + 50}
|
className="automation-editor--flow-wrapper--flow"
|
||||||
startPoint={[2, 0.5]}
|
|
||||||
dims={dims}
|
|
||||||
sequence={state.data.sequence}
|
sequence={state.data.sequence}
|
||||||
onChange={updateSequence}
|
trigger={state.data.trigger}
|
||||||
additionalElements={() => chain([
|
condition={state.data.condition}
|
||||||
computeExtraField([1, 0.5], [2, 0.5]),
|
onSequenceUpdate={updateSequence}
|
||||||
computeTriggerPos(
|
onTriggerUpdate={updateTrigger}
|
||||||
[0.5, 0.5],
|
onConditionUpdate={updateCondition}
|
||||||
state.data.trigger,
|
dims={dims}
|
||||||
[1.5, 0.5],
|
|
||||||
updateTrigger,
|
|
||||||
() => {
|
|
||||||
setModalState({
|
|
||||||
trigger: {
|
|
||||||
$smType: "trigger",
|
|
||||||
platform: "device",
|
|
||||||
device_id: "",
|
|
||||||
domain: "",
|
|
||||||
type: "",
|
|
||||||
subtype: ""
|
|
||||||
},
|
|
||||||
onSave: (t) => updateTrigger([...state.data.trigger, t])
|
|
||||||
});
|
|
||||||
},
|
|
||||||
(trigger, onSave) => setModalState({
|
|
||||||
trigger,
|
|
||||||
onSave,
|
|
||||||
})
|
|
||||||
),
|
|
||||||
])}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,78 +0,0 @@
|
|||||||
import { DAGElement } from "components/DAGSvgs/DAGBoard";
|
|
||||||
import { Point } from "types/graphs";
|
|
||||||
import { AutomationTrigger } from 'types/automations/triggers';
|
|
||||||
import { avgPoints } from "utils/graph";
|
|
||||||
|
|
||||||
|
|
||||||
export function* computeTriggerPos(
|
|
||||||
startPoint: Point,
|
|
||||||
triggers: AutomationTrigger[],
|
|
||||||
toPath: Point,
|
|
||||||
onUpdate: (ts: AutomationTrigger[]) => void,
|
|
||||||
onAdd: () => void,
|
|
||||||
onEdit: (nt: AutomationTrigger, onSave: (ts: AutomationTrigger) => void) => void,
|
|
||||||
): Generator<DAGElement> {
|
|
||||||
// functions
|
|
||||||
const makeRemoveNode = (i: number) => () => onUpdate([
|
|
||||||
...triggers.slice(0, i),
|
|
||||||
...triggers.slice(i + 1),
|
|
||||||
]);
|
|
||||||
const updateNode = (n: AutomationTrigger, i: number) => onUpdate([
|
|
||||||
...triggers.slice(0, i),
|
|
||||||
n,
|
|
||||||
...triggers.slice(i + 1),
|
|
||||||
])
|
|
||||||
|
|
||||||
// main loop
|
|
||||||
for (let i = 0; i < triggers.length; i++) {
|
|
||||||
const node = triggers[i];
|
|
||||||
const nodeLoc: Point = [startPoint[0], startPoint[1] + i];
|
|
||||||
yield {
|
|
||||||
type: "node",
|
|
||||||
node,
|
|
||||||
loc: nodeLoc,
|
|
||||||
onRemove: makeRemoveNode(i),
|
|
||||||
onOpen: () => onEdit(node, up => updateNode(up, i))
|
|
||||||
}
|
|
||||||
yield {
|
|
||||||
type: "edge",
|
|
||||||
p1: nodeLoc,
|
|
||||||
p2: toPath,
|
|
||||||
direction: "1->2",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// if we had nothing to loop on
|
|
||||||
if (triggers.length === 0) {
|
|
||||||
yield {
|
|
||||||
type: "edge",
|
|
||||||
p1: [startPoint[0] - 0.25, startPoint[1] + triggers.length],
|
|
||||||
p2: toPath,
|
|
||||||
direction: "1->2",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// add circle
|
|
||||||
yield {
|
|
||||||
type: 'circle',
|
|
||||||
icon: 'add',
|
|
||||||
loc: [startPoint[0] + 0.25, startPoint[1] + triggers.length],
|
|
||||||
onAdd
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function* computeExtraField(
|
|
||||||
triggerEndPos: Point,
|
|
||||||
sequenceStartPos: Point,
|
|
||||||
): Generator<DAGElement> {
|
|
||||||
yield {
|
|
||||||
type: 'circle',
|
|
||||||
loc: avgPoints(triggerEndPos, sequenceStartPos),
|
|
||||||
icon: 'color',
|
|
||||||
color: 'blue',
|
|
||||||
}
|
|
||||||
yield {
|
|
||||||
type: 'edge',
|
|
||||||
p1: triggerEndPos,
|
|
||||||
p2: sequenceStartPos,
|
|
||||||
direction: '1->2',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -12,13 +12,12 @@ export type EditorState = {
|
|||||||
export type EditorStatus = EditorState['status'];
|
export type EditorStatus = EditorState['status'];
|
||||||
|
|
||||||
export const useAutomatioEditorState = (
|
export const useAutomatioEditorState = (
|
||||||
automation: AutomationData,
|
automation: AutomationData | undefined,
|
||||||
onSave: (a: AutomationData) => void,
|
onSave: (a: AutomationData) => void,
|
||||||
) => {
|
) => {
|
||||||
const [state, update] = useState<EditorState>({
|
const [state, update] = useState<EditorState>({
|
||||||
status: "loading",
|
status: "loading",
|
||||||
});
|
});
|
||||||
|
|
||||||
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
|
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
|
||||||
data: D
|
data: D
|
||||||
) => state.status !== 'loading' && update({
|
) => state.status !== 'loading' && update({
|
||||||
@@ -30,15 +29,18 @@ export const useAutomatioEditorState = (
|
|||||||
})
|
})
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
update({
|
if (automation) {
|
||||||
status: 'unchanged',
|
update({
|
||||||
data: genEditorData(automation),
|
status: 'unchanged',
|
||||||
})
|
data: genEditorData(automation),
|
||||||
|
})
|
||||||
|
}
|
||||||
}, [automation]);
|
}, [automation]);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
updateTrigger: makeUpdate('trigger'),
|
updateTrigger: makeUpdate('trigger'),
|
||||||
updateSequence: makeUpdate('sequence'),
|
updateSequence: makeUpdate('sequence'),
|
||||||
|
updateCondition: makeUpdate('condition'),
|
||||||
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
|
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
|
||||||
if (state.status !== 'loading') {
|
if (state.status !== 'loading') {
|
||||||
update({
|
update({
|
||||||
@@ -78,6 +80,7 @@ const genEditorData = (automation: AutomationData) => {
|
|||||||
metadata,
|
metadata,
|
||||||
trigger,
|
trigger,
|
||||||
sequence,
|
sequence,
|
||||||
|
condition,
|
||||||
} = automation;
|
} = automation;
|
||||||
|
|
||||||
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]);
|
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]);
|
||||||
@@ -86,6 +89,7 @@ const genEditorData = (automation: AutomationData) => {
|
|||||||
metadata,
|
metadata,
|
||||||
trigger,
|
trigger,
|
||||||
sequence,
|
sequence,
|
||||||
|
condition,
|
||||||
tags,
|
tags,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
import { createAppUseStyles } from "styles/theme";
|
|
||||||
|
|
||||||
|
|
||||||
export const useEditorStyles = createAppUseStyles<{
|
|
||||||
closeInfo: boolean;
|
|
||||||
horizontalMode: boolean;
|
|
||||||
autoChanged: string;
|
|
||||||
}>(theme => ({
|
|
||||||
wrapper: {
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'column',
|
|
||||||
alignItems: "flex-end",
|
|
||||||
height: '100%',
|
|
||||||
width: '100%',
|
|
||||||
overflow: 'hidden',
|
|
||||||
},
|
|
||||||
root: ({ horizontalMode }) => ({
|
|
||||||
height: '100%',
|
|
||||||
width: '100%',
|
|
||||||
color: theme.primaryAccent,
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: horizontalMode ? 'column' : 'row',
|
|
||||||
}),
|
|
||||||
dag: {
|
|
||||||
borderWidth: 1,
|
|
||||||
borderStyle: 'solid',
|
|
||||||
borderColor: theme.secondaryAccent,
|
|
||||||
width: '100%',
|
|
||||||
},
|
|
||||||
infoIcon: ({ horizontalMode }) => ({
|
|
||||||
bottom: horizontalMode ? '90%' : 10
|
|
||||||
}),
|
|
||||||
zoom: {
|
|
||||||
backgroundColor: theme.secondary,
|
|
||||||
color: theme.secondaryAccent,
|
|
||||||
textAlign: 'center',
|
|
||||||
maxWidth: "3em",
|
|
||||||
},
|
|
||||||
zoomImg: {
|
|
||||||
|
|
||||||
},
|
|
||||||
toolbar: {
|
|
||||||
width: "100%",
|
|
||||||
display: "flex",
|
|
||||||
flexDirection: "row",
|
|
||||||
justifyContent: 'space-between',
|
|
||||||
alignItems: "center",
|
|
||||||
padding: "0.5em",
|
|
||||||
},
|
|
||||||
saveBtn: ({ autoChanged }) => ({
|
|
||||||
display: "flex",
|
|
||||||
opacity: autoChanged === "changed" ? 1 : 0,
|
|
||||||
height: autoChanged === "changed" ? undefined : 0,
|
|
||||||
fontSize: autoChanged === "changed" ? undefined : 0,
|
|
||||||
gap: '0.5em',
|
|
||||||
maxHeight: '1em',
|
|
||||||
justifyContent: 'center',
|
|
||||||
alignItems: 'center',
|
|
||||||
borderColor: "#bf4 !important",
|
|
||||||
color: "#bf4 !important"
|
|
||||||
}),
|
|
||||||
}))
|
|
||||||
@@ -2,22 +2,15 @@ import "styles/root.css";
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutomationList } from ".";
|
import { AutomationList } from ".";
|
||||||
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants';
|
|
||||||
import { createMockAuto } from "utils/mocks";
|
import { createMockAuto } from "utils/mocks";
|
||||||
|
import * as dgconst from 'components/DAGSvgs/constants';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList',
|
title: 'App/AutomationList',
|
||||||
component: AutomationList,
|
component: AutomationList,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
args: {
|
args: {
|
||||||
dims: {
|
dims: dgconst.DEFAULT_DIMS
|
||||||
nodeHeight: NODE_HEIGHT,
|
|
||||||
nodeWidth: NODE_WIDTH,
|
|
||||||
addHeight: ADD_HEIGHT,
|
|
||||||
addWidth: ADD_WIDTH,
|
|
||||||
circleSize: CIRCLE_SIZE,
|
|
||||||
distanceFactor: DISTANCE_FACTOR,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} as ComponentMeta<typeof AutomationList>;
|
} as ComponentMeta<typeof AutomationList>;
|
||||||
|
|
||||||
|
|||||||
@@ -10,10 +10,12 @@
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
.automation-list-box--body > * {
|
|
||||||
|
.automation-list-box--body>* {
|
||||||
padding-top: 0.5em;
|
padding-top: 0.5em;
|
||||||
padding-bottom: 0.5em;
|
padding-bottom: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group {
|
.automation-list-box--body--group {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
@@ -21,33 +23,37 @@
|
|||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
padding-bottom: 0.5em;
|
padding-bottom: 0.5em;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
border-bottom-style: solid ;
|
border-bottom-style: solid;
|
||||||
border-color: white;
|
border-color: white;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--group > .automation-list-box--body--group {
|
|
||||||
border-left-style: solid ;
|
.automation-list-box--body--group>.automation-list-box--body--group {
|
||||||
|
border-left-style: solid;
|
||||||
border-top-left-radius: 0;
|
border-top-left-radius: 0;
|
||||||
margin-left: 0.75em;
|
margin-left: 0.75em;
|
||||||
padding-left: 0.5em;
|
padding-left: 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group > b {
|
.automation-list-box--body--group>b {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
padding: 0.1em;
|
padding: 0.1em;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--group > b:hover {
|
|
||||||
|
.automation-list-box--body--group>b:hover {
|
||||||
background-color: var(--secondary-accent);
|
background-color: var(--secondary-accent);
|
||||||
color: var(--secondary);
|
color: var(--secondary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item:hover {
|
.automation-list-box--body--item:hover, .automation-list-box--body--item.selected {
|
||||||
background-color: var(--primary-accent);
|
background-color: var(--primary-accent);
|
||||||
color: var(--primary);
|
color: var(--primary);
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item:hover > .automation-list-box--body--item--tags > span {
|
|
||||||
|
.automation-list-box--body--item:hover>.automation-list-box--body--item--tags>span {
|
||||||
border-color: var(--primary);
|
border-color: var(--primary);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item {
|
.automation-list-box--body--item {
|
||||||
padding-left: 1em;
|
padding-left: 1em;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
@@ -57,25 +63,31 @@
|
|||||||
gap: 1em;
|
gap: 1em;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item::before {
|
.automation-list-box--body--item::before {
|
||||||
content: "⊚ ";
|
content: "⊚ ";
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item--title {
|
.automation-list-box--body--item--title {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
padding-left: 0.25em;
|
padding-left: 0.25em;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item--title > b {
|
|
||||||
|
.automation-list-box--body--item--title>b {
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item--title > span, .automation-list-box--body--item--title > b > span {
|
|
||||||
|
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
|
||||||
font-size: 0.75em;
|
font-size: 0.75em;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item > button {
|
|
||||||
|
.automation-list-box--body--item>button {
|
||||||
padding: 0.25em !important;
|
padding: 0.25em !important;
|
||||||
margin: 0.5em !important;
|
margin: 0.5em !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--item--tags {
|
.automation-list-box--body--item--tags {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
display: flex;
|
display: flex;
|
||||||
@@ -87,13 +99,15 @@
|
|||||||
max-height: 100%;
|
max-height: 100%;
|
||||||
gap: 0.25em;
|
gap: 0.25em;
|
||||||
}
|
}
|
||||||
.automation-list-box--body--item--tags > span {
|
|
||||||
|
.automation-list-box--body--item--tags>span {
|
||||||
border-color: var(--primary-accent);
|
border-color: var(--primary-accent);
|
||||||
border-style: solid;
|
border-style: solid;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
border-radius: 0.5em;
|
border-radius: 0.5em;
|
||||||
padding: 0.1em 0.5em;
|
padding: 0.1em 0.5em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--bottom {
|
.automation-list-box--bottom {
|
||||||
margin-top: 0.5em;
|
margin-top: 0.5em;
|
||||||
margin-bottom: 0.5em;
|
margin-bottom: 0.5em;
|
||||||
@@ -102,7 +116,8 @@
|
|||||||
justify-content: space-around;
|
justify-content: space-around;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
.automation-list-box--bottom > button {
|
|
||||||
|
.automation-list-box--bottom>button {
|
||||||
background-color: #070;
|
background-color: #070;
|
||||||
color: var(--primary-accent);
|
color: var(--primary-accent);
|
||||||
padding: 0.5em 2em;
|
padding: 0.5em 2em;
|
||||||
|
|||||||
@@ -13,10 +13,12 @@ export default {
|
|||||||
|
|
||||||
|
|
||||||
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
||||||
const [autos, setAutos] = useState(args.automations)
|
const [selected, setSelected] = useState(args.selected)
|
||||||
console.log({ args })
|
|
||||||
return <div className="page">
|
return <div className="page">
|
||||||
<AutomationListBox {...args} automations={autos} />
|
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
|
||||||
|
setSelected(i)
|
||||||
|
args.onSelectAutomation(i)
|
||||||
|
}} />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { createMockAuto } from 'utils/mocks';
|
|||||||
test('group automations', () => {
|
test('group automations', () => {
|
||||||
const automations: AutomationData[] = [
|
const automations: AutomationData[] = [
|
||||||
{
|
{
|
||||||
|
condition: [],
|
||||||
metadata: {
|
metadata: {
|
||||||
id: '1',
|
id: '1',
|
||||||
alias: '',
|
alias: '',
|
||||||
@@ -19,6 +20,7 @@ test('group automations', () => {
|
|||||||
trigger: [],
|
trigger: [],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
condition: [],
|
||||||
metadata: {
|
metadata: {
|
||||||
id: '2',
|
id: '2',
|
||||||
alias: '',
|
alias: '',
|
||||||
@@ -33,6 +35,7 @@ test('group automations', () => {
|
|||||||
trigger: [],
|
trigger: [],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
condition: [],
|
||||||
metadata: {
|
metadata: {
|
||||||
id: '3',
|
id: '3',
|
||||||
alias: '',
|
alias: '',
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { TrashIcon } from "components/Icons";
|
|||||||
|
|
||||||
export type Props = {
|
export type Props = {
|
||||||
automations: AutomationData[];
|
automations: AutomationData[];
|
||||||
|
selected: number;
|
||||||
onSelectAutomation: (i: number) => void;
|
onSelectAutomation: (i: number) => void;
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
onAdd: () => void;
|
onAdd: () => void;
|
||||||
@@ -16,6 +17,7 @@ export type Props = {
|
|||||||
|
|
||||||
export const AutomationListBox: FC<Props> = ({
|
export const AutomationListBox: FC<Props> = ({
|
||||||
automations,
|
automations,
|
||||||
|
selected,
|
||||||
onSelectAutomation,
|
onSelectAutomation,
|
||||||
onAdd,
|
onAdd,
|
||||||
onRemove,
|
onRemove,
|
||||||
@@ -23,9 +25,9 @@ export const AutomationListBox: FC<Props> = ({
|
|||||||
|
|
||||||
const tags = getTagList(automations);
|
const tags = getTagList(automations);
|
||||||
const [searchText, setSearchText] = useState('');
|
const [searchText, setSearchText] = useState('');
|
||||||
const [selected, setSelected] = useState<number[]>([]);
|
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
||||||
const filteredAutomations = filterAutomations(automations, searchText, selected, tags);
|
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
|
||||||
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selected, tags);
|
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
|
||||||
|
|
||||||
return <div className="automation-list-box">
|
return <div className="automation-list-box">
|
||||||
<div className="automation-list-box--nav">
|
<div className="automation-list-box--nav">
|
||||||
@@ -36,14 +38,14 @@ export const AutomationListBox: FC<Props> = ({
|
|||||||
/>
|
/>
|
||||||
<InputMultiSelect
|
<InputMultiSelect
|
||||||
label="Tags"
|
label="Tags"
|
||||||
selected={selected}
|
selected={selectedTagIdx}
|
||||||
onChange={setSelected}
|
onChange={setSelectedTagIdx}
|
||||||
options={tags}
|
options={tags}
|
||||||
max={3}
|
max={3}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list-box--body">
|
<div className="automation-list-box--body">
|
||||||
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)}
|
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list-box--bottom">
|
<div className="automation-list-box--bottom">
|
||||||
<Button onClick={onAdd}>Add</Button>
|
<Button onClick={onAdd}>Add</Button>
|
||||||
@@ -123,18 +125,19 @@ const convertGroupsToItems = (
|
|||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>,
|
||||||
onSelectAutomation: (i: number) => void,
|
onSelectAutomation: (i: number) => void,
|
||||||
onRemove: (i: number) => void,
|
onRemove: (i: number) => void,
|
||||||
|
selected: number,
|
||||||
) => {
|
) => {
|
||||||
if (Array.isArray(groups)) {
|
if (Array.isArray(groups)) {
|
||||||
return groups.map(i => {
|
return groups.map(i => {
|
||||||
const [auto, autoIndex] = autos[i];
|
const [auto, autoIndex] = autos[i];
|
||||||
return <div
|
return <div
|
||||||
key={i}
|
key={i}
|
||||||
className="automation-list-box--body--item"
|
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
|
||||||
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
|
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
|
||||||
|
onClick={() => onSelectAutomation(autoIndex)}
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
className="automation-list-box--body--item--title"
|
className="automation-list-box--body--item--title"
|
||||||
onClick={() => onSelectAutomation(autoIndex)}
|
|
||||||
>
|
>
|
||||||
<b>{auto.metadata.alias.slice(0, 15)} <span>({auto.metadata.id.slice(0, 5)})</span></b>
|
<b>{auto.metadata.alias.slice(0, 15)} <span>({auto.metadata.id.slice(0, 5)})</span></b>
|
||||||
<span>{auto.metadata.description.slice(0, 25)}</span>
|
<span>{auto.metadata.description.slice(0, 25)}</span>
|
||||||
@@ -158,6 +161,7 @@ const convertGroupsToItems = (
|
|||||||
autos={autos}
|
autos={autos}
|
||||||
onSelectAutomation={onSelectAutomation}
|
onSelectAutomation={onSelectAutomation}
|
||||||
onRemove={onRemove}
|
onRemove={onRemove}
|
||||||
|
selected={selected}
|
||||||
/>
|
/>
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -170,16 +174,18 @@ const AutomationListBoxGroup: FC<{
|
|||||||
autos: Array<[AutomationData, number]>,
|
autos: Array<[AutomationData, number]>,
|
||||||
onSelectAutomation: (i: number) => void,
|
onSelectAutomation: (i: number) => void,
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
|
selected: number,
|
||||||
}> = ({
|
}> = ({
|
||||||
groupName,
|
groupName,
|
||||||
groups,
|
groups,
|
||||||
autos,
|
autos,
|
||||||
onSelectAutomation,
|
onSelectAutomation,
|
||||||
onRemove,
|
onRemove,
|
||||||
|
selected,
|
||||||
}) => {
|
}) => {
|
||||||
const [open, setOpen] = useState(false);
|
const [open, setOpen] = useState(false);
|
||||||
return <div className="automation-list-box--body--group">
|
return <div className="automation-list-box--body--group">
|
||||||
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
|
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
|
||||||
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove)}
|
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -1,22 +1,15 @@
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
import { ConnectedAutomationList } from ".";
|
import { ConnectedAutomationList } from ".";
|
||||||
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants';
|
|
||||||
import { createMockAuto } from "utils/mocks";
|
import { createMockAuto } from "utils/mocks";
|
||||||
import { useMockApiService } from "apiService";
|
import { useMockApiService } from "apiService";
|
||||||
|
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList/Connected',
|
title: 'App/AutomationList/Connected',
|
||||||
component: ConnectedAutomationList,
|
component: ConnectedAutomationList,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
args: {
|
args: {
|
||||||
dims: {
|
dims: DEFAULT_DIMS,
|
||||||
nodeHeight: NODE_HEIGHT,
|
|
||||||
nodeWidth: NODE_WIDTH,
|
|
||||||
addHeight: ADD_HEIGHT,
|
|
||||||
addWidth: ADD_WIDTH,
|
|
||||||
circleSize: CIRCLE_SIZE,
|
|
||||||
distanceFactor: DISTANCE_FACTOR,
|
|
||||||
},
|
|
||||||
initialAutomations: [],
|
initialAutomations: [],
|
||||||
}
|
}
|
||||||
} as ComponentMeta<typeof ConnectedAutomationList>;
|
} as ComponentMeta<typeof ConnectedAutomationList>;
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
/* root elements */
|
/* root elements */
|
||||||
.automation-list--root {
|
.automation-list--root {
|
||||||
width : 100%;
|
width: 100%;
|
||||||
height : 100%;
|
height: 100%;
|
||||||
display : flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
overflow : hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list--list {
|
.automation-list--list {
|
||||||
flex : 1;
|
flex: 1;
|
||||||
min-width: 400px;
|
|
||||||
max-width: 400px;
|
max-width: 400px;
|
||||||
position : relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list--viewer {
|
.automation-list--viewer {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* list children: on hide */
|
/* list children: on hide */
|
||||||
@@ -41,6 +41,6 @@
|
|||||||
|
|
||||||
.automation-list--list-hide {
|
.automation-list--list-hide {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
bottom : 10px;
|
bottom: 0.5em;
|
||||||
right : 5px;
|
right: 0.5em;
|
||||||
}
|
}
|
||||||
@@ -2,12 +2,12 @@ import "./index.css";
|
|||||||
import { AutomationEditor } from "components/AutomationEditor";
|
import { AutomationEditor } from "components/AutomationEditor";
|
||||||
import { FC, useState } from "react";
|
import { FC, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { DAGBoardElmDims } from 'components/DAGSvgs/DAGBoard';
|
import { defaultAutomation } from 'utils/defaults';
|
||||||
import { defaultAutomation } from '../../utils/defaults';
|
|
||||||
import { ArrowIcon } from "components/Icons";
|
import { ArrowIcon } from "components/Icons";
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
import { ApiService } from "apiService/core";
|
import { ApiService } from "apiService/core";
|
||||||
import { AutomationListBox } from "./AutomationListBox";
|
import { AutomationListBox } from "./AutomationListBox";
|
||||||
|
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
||||||
|
|
||||||
|
|
||||||
interface AutomationListParams {
|
interface AutomationListParams {
|
||||||
@@ -15,7 +15,7 @@ interface AutomationListParams {
|
|||||||
onUpdate: (i: number, auto: AutomationData) => void;
|
onUpdate: (i: number, auto: AutomationData) => void;
|
||||||
onAdd: (auto: AutomationData) => void;
|
onAdd: (auto: AutomationData) => void;
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
dims: DAGBoardElmDims;
|
dims: DAGAutomationFlowDims;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const AutomationList: FC<AutomationListParams> = ({
|
export const AutomationList: FC<AutomationListParams> = ({
|
||||||
@@ -42,6 +42,7 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
setCurrent(automations.length)
|
setCurrent(automations.length)
|
||||||
}}
|
}}
|
||||||
onSelectAutomation={setCurrent}
|
onSelectAutomation={setCurrent}
|
||||||
|
selected={current}
|
||||||
onRemove={onRemove}
|
onRemove={onRemove}
|
||||||
/>
|
/>
|
||||||
<ButtonIcon
|
<ButtonIcon
|
||||||
@@ -63,7 +64,7 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
}
|
}
|
||||||
|
|
||||||
interface ConnectedAutomationListParams {
|
interface ConnectedAutomationListParams {
|
||||||
dims: DAGBoardElmDims;
|
dims: DAGAutomationFlowDims;
|
||||||
api: ApiService;
|
api: ApiService;
|
||||||
}
|
}
|
||||||
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
||||||
|
|||||||
@@ -12,48 +12,32 @@ export default {
|
|||||||
|
|
||||||
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
|
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
|
||||||
const [state, setState] = useState<AutomationCondition>({
|
const [state, setState] = useState<AutomationCondition>({
|
||||||
"$smType": "condition",
|
|
||||||
"condition": "or",
|
"condition": "or",
|
||||||
"condition_data": {
|
"conditions": [
|
||||||
"conditions": [
|
{
|
||||||
{
|
"condition": "and",
|
||||||
"$smType": "condition",
|
"conditions": [
|
||||||
"condition": "and",
|
{
|
||||||
"condition_data": {
|
"condition": "numeric_state",
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"$smType": "condition",
|
|
||||||
"condition": "numeric_state",
|
|
||||||
"condition_data": {
|
|
||||||
"entity_id": [
|
|
||||||
"sensor.kitchen_humidity"
|
|
||||||
],
|
|
||||||
"conditions": [],
|
|
||||||
"above": "40"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"$smType": "condition",
|
|
||||||
"condition": "template",
|
|
||||||
"condition_data": {
|
|
||||||
"value_template": "states('switch.kitchen') == 'on'"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"$smType": "condition",
|
|
||||||
"condition": "numeric_state",
|
|
||||||
"condition_data": {
|
|
||||||
"entity_id": [
|
"entity_id": [
|
||||||
"sensor.kitchen_temperature"
|
"sensor.kitchen_humidity"
|
||||||
],
|
],
|
||||||
"above": "51"
|
"above": "40"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"condition": "template",
|
||||||
|
"value_template": "states('switch.kitchen') == 'on'"
|
||||||
}
|
}
|
||||||
}
|
]
|
||||||
]
|
},
|
||||||
}
|
{
|
||||||
|
"condition": "numeric_state",
|
||||||
|
"entity_id": [
|
||||||
|
"sensor.kitchen_temperature"
|
||||||
|
],
|
||||||
|
"above": "51"
|
||||||
|
}
|
||||||
|
]
|
||||||
})
|
})
|
||||||
return (
|
return (
|
||||||
<div className="page">
|
<div className="page">
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { FC, useState, useEffect } from 'react';
|
|||||||
import { getConditionDefaultValues } from "utils/defaults";
|
import { getConditionDefaultValues } from "utils/defaults";
|
||||||
import { AutomationCondition } from "types/automations/conditions";
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
import { CheckMarkIcon, PencilIcon } from "components/Icons";
|
import { CheckMarkIcon, PencilIcon } from "components/Icons";
|
||||||
import InputList from "components/Inputs/InputList";
|
import { InputList } from "components/Inputs/InputList";
|
||||||
import InputYaml from "components/Inputs/InputYaml";
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
import { getEditor } from "./editorRender";
|
import { getEditor } from "./editorRender";
|
||||||
import { useStyles } from "./style";
|
import { useStyles } from "./style";
|
||||||
@@ -51,17 +51,10 @@ export const ConditionNode: FC<{
|
|||||||
) {
|
) {
|
||||||
onUpdate({
|
onUpdate({
|
||||||
...condition,
|
...condition,
|
||||||
$smType: 'condition',
|
conditions: condition.conditions.concat({
|
||||||
condition_data: {
|
condition: 'or',
|
||||||
...condition.condition_data,
|
conditions: []
|
||||||
conditions: condition.condition_data.conditions.concat({
|
})
|
||||||
$smType: 'condition',
|
|
||||||
condition: 'or',
|
|
||||||
condition_data: {
|
|
||||||
conditions: []
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -69,20 +62,10 @@ export const ConditionNode: FC<{
|
|||||||
let childrenConditions: JSX.Element;
|
let childrenConditions: JSX.Element;
|
||||||
if (effectiveDM) {
|
if (effectiveDM) {
|
||||||
const Viewer = getViewer(condition);
|
const Viewer = getViewer(condition);
|
||||||
childrenConditions = <Viewer condition={condition} onChange={data => {
|
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
|
||||||
onUpdate({
|
|
||||||
...data,
|
|
||||||
$smType: 'condition',
|
|
||||||
})
|
|
||||||
}} />
|
|
||||||
} else {
|
} else {
|
||||||
const Editor = getEditor(condition);
|
const Editor = getEditor(condition);
|
||||||
childrenConditions = <Editor condition={condition} onChange={data => {
|
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
|
||||||
onUpdate({
|
|
||||||
...data,
|
|
||||||
$smType: 'condition',
|
|
||||||
})
|
|
||||||
}} />
|
|
||||||
}
|
}
|
||||||
// styles
|
// styles
|
||||||
let hasChildren = false;
|
let hasChildren = false;
|
||||||
@@ -115,13 +98,10 @@ export const ConditionNode: FC<{
|
|||||||
'trigger',
|
'trigger',
|
||||||
'zone',
|
'zone',
|
||||||
]}
|
]}
|
||||||
onChange={n => onUpdate({
|
onChange={(n: any) => onUpdate({
|
||||||
$smType: 'condition',
|
...getConditionDefaultValues(n),
|
||||||
|
...condition,
|
||||||
condition: n,
|
condition: n,
|
||||||
condition_data: {
|
|
||||||
...getConditionDefaultValues(n),
|
|
||||||
...condition.condition_data,
|
|
||||||
}
|
|
||||||
} as any)}
|
} as any)}
|
||||||
/>
|
/>
|
||||||
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
||||||
@@ -134,11 +114,8 @@ export const ConditionNode: FC<{
|
|||||||
<div className={classes.children}>
|
<div className={classes.children}>
|
||||||
{yamlMode && <InputYaml
|
{yamlMode && <InputYaml
|
||||||
label=""
|
label=""
|
||||||
value={condition.condition_data}
|
value={condition}
|
||||||
onChange={update => onUpdate({
|
onChange={update => onUpdate(update as any)}
|
||||||
...condition,
|
|
||||||
condition_data: update as any
|
|
||||||
})}
|
|
||||||
resizable
|
resizable
|
||||||
/>}
|
/>}
|
||||||
{!yamlMode && childrenConditions}
|
{!yamlMode && childrenConditions}
|
||||||
|
|||||||
@@ -46,19 +46,13 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
|
|||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <div>
|
||||||
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
alias
|
||||||
...condition.condition_data,
|
|
||||||
alias
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
<InputTextArea label="Template" value={condition.condition_data.value_template} onChange={value_template => onChange({
|
<InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
value_template
|
||||||
...condition.condition_data,
|
|
||||||
value_template
|
|
||||||
}
|
|
||||||
})} resizable />
|
})} resizable />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -69,58 +63,40 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
|||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <div>
|
||||||
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
alias
|
||||||
...condition.condition_data,
|
|
||||||
alias
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.condition_data.entity_id}
|
value={condition.entity_id}
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
entity_id
|
||||||
...condition.condition_data,
|
|
||||||
entity_id
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({
|
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
attribute
|
||||||
...condition.condition_data,
|
|
||||||
attribute
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
<InputNumber
|
<InputNumber
|
||||||
label="Above"
|
label="Above"
|
||||||
value={condition.condition_data.above ? Number(condition.condition_data.above) : undefined}
|
value={condition.above ? Number(condition.above) : undefined}
|
||||||
onChange={above => onChange({
|
onChange={above => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
above: above ? String(above) : undefined,
|
||||||
...condition.condition_data,
|
|
||||||
above: above ? String(above) : undefined,
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<InputNumber
|
<InputNumber
|
||||||
label="Below"
|
label="Below"
|
||||||
value={condition.condition_data.below ? Number(condition.condition_data.below) : undefined}
|
value={condition.below ? Number(condition.below) : undefined}
|
||||||
onChange={below => onChange({
|
onChange={below => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
below: below ? String(below) : undefined,
|
||||||
...condition.condition_data,
|
|
||||||
below: below ? String(below) : undefined,
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<InputTextArea label="Template" value={condition.condition_data.value_template ?? ""} onChange={value_template => onChange({
|
<InputTextArea label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
value_template
|
||||||
...condition.condition_data,
|
|
||||||
value_template
|
|
||||||
}
|
|
||||||
})} resizable />
|
})} resizable />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -132,7 +108,7 @@ export const LogicViewer: Editor<LogicCondition> = ({
|
|||||||
}) => {
|
}) => {
|
||||||
|
|
||||||
return <>
|
return <>
|
||||||
{condition.condition_data.conditions.map((c, i) => {
|
{condition.conditions.map((c, i) => {
|
||||||
return <ConditionNode
|
return <ConditionNode
|
||||||
key={i}
|
key={i}
|
||||||
condition={c}
|
condition={c}
|
||||||
@@ -151,50 +127,35 @@ export const StateEditor: Editor<StateCondition> = ({
|
|||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <div>
|
||||||
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
alias
|
||||||
...condition.condition_data,
|
|
||||||
alias
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.condition_data.entity_id}
|
value={condition.entity_id}
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
entity_id
|
||||||
...condition.condition_data,
|
|
||||||
entity_id
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({
|
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
attribute
|
||||||
...condition.condition_data,
|
|
||||||
attribute
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
<InputText
|
<InputText
|
||||||
label="State"
|
label="State"
|
||||||
value={String(condition.condition_data.state)}
|
value={String(condition.state)}
|
||||||
onChange={state => onChange({
|
onChange={state => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
state,
|
||||||
...condition.condition_data,
|
|
||||||
state,
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<InputTime
|
<InputTime
|
||||||
label="For"
|
label="For"
|
||||||
value={condition.condition_data.for}
|
value={condition.for}
|
||||||
onChange={_for => onChange({
|
onChange={_for => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
for: _for,
|
||||||
...condition.condition_data,
|
|
||||||
for: _for,
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@@ -205,36 +166,27 @@ export const TimeEditor: Editor<TimeCondition> = ({
|
|||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <div>
|
||||||
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
alias
|
||||||
...condition.condition_data,
|
|
||||||
alias
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
<InputTime
|
<InputTime
|
||||||
label="After"
|
label="After"
|
||||||
value={condition.condition_data.after}
|
value={condition.after}
|
||||||
onChange={after => onChange({
|
onChange={after => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
after,
|
||||||
...condition.condition_data,
|
|
||||||
after,
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<InputTime
|
<InputTime
|
||||||
label="Before"
|
label="Before"
|
||||||
value={condition.condition_data.before}
|
value={condition.before}
|
||||||
onChange={before => onChange({
|
onChange={before => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
before,
|
||||||
...condition.condition_data,
|
|
||||||
before,
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<b>Weekday not support for no, use yaml for now</b> {condition.condition_data.weekday}
|
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,19 +195,13 @@ export const TriggerEditor: Editor<TriggerCondition> = ({
|
|||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <div>
|
||||||
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
alias
|
||||||
...condition.condition_data,
|
|
||||||
alias
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
<InputText label="Trigger ID" value={condition.condition_data.id} onChange={id => onChange({
|
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
id
|
||||||
...condition.condition_data,
|
|
||||||
id
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -265,39 +211,27 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
|
|||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <div>
|
||||||
<InputText label="Alias" value={condition.condition_data.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
alias
|
||||||
...condition.condition_data,
|
|
||||||
alias
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
<InputText label="Zone" value={condition.condition_data.zone} onChange={zone => onChange({
|
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
zone
|
||||||
...condition.condition_data,
|
|
||||||
zone
|
|
||||||
}
|
|
||||||
})} />
|
})} />
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.condition_data.entity_id}
|
value={condition.entity_id}
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
entity_id
|
||||||
...condition.condition_data,
|
|
||||||
entity_id
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<InputText
|
<InputText
|
||||||
label="State"
|
label="State"
|
||||||
value={String(condition.condition_data.state)}
|
value={String(condition.state)}
|
||||||
onChange={state => onChange({
|
onChange={state => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
state,
|
||||||
...condition.condition_data,
|
|
||||||
state,
|
|
||||||
}
|
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -27,11 +27,8 @@ const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }
|
|||||||
export const TemplateViewer = Template.bind({})
|
export const TemplateViewer = Template.bind({})
|
||||||
TemplateViewer.args = {
|
TemplateViewer.args = {
|
||||||
condition: {
|
condition: {
|
||||||
$smType: 'condition',
|
|
||||||
condition: 'template',
|
condition: 'template',
|
||||||
condition_data: {
|
value_template: "states('switch.light_kitchen') == 'on'"
|
||||||
value_template: "states('switch.light_kitchen') == 'on'"
|
|
||||||
}
|
|
||||||
} as AutomationCondition,
|
} as AutomationCondition,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,63 +36,42 @@ TemplateViewer.args = {
|
|||||||
export const NumericStateViewer = Template.bind({})
|
export const NumericStateViewer = Template.bind({})
|
||||||
NumericStateViewer.args = {
|
NumericStateViewer.args = {
|
||||||
condition: {
|
condition: {
|
||||||
$smType: 'condition',
|
|
||||||
condition: "numeric_state",
|
condition: "numeric_state",
|
||||||
condition_data: {
|
entity_id: "sensor.humidity_kitchen",
|
||||||
entity_id: "sensor.humidity_kitchen",
|
above: "10",
|
||||||
above: "10",
|
|
||||||
}
|
|
||||||
} as AutomationCondition,
|
} as AutomationCondition,
|
||||||
}
|
}
|
||||||
|
|
||||||
export const LogicCondition = Template.bind({})
|
export const LogicCondition = Template.bind({})
|
||||||
LogicCondition.args = {
|
LogicCondition.args = {
|
||||||
condition: {
|
condition: {
|
||||||
$smType: 'condition',
|
|
||||||
condition: 'or',
|
condition: 'or',
|
||||||
condition_data: {
|
conditions: [
|
||||||
conditions: [
|
{
|
||||||
{
|
condition: 'numeric_state',
|
||||||
$smType: 'condition',
|
entity_id: 'sensor.humidity_kitchen',
|
||||||
condition: 'numeric_state',
|
above: '60'
|
||||||
condition_data: {
|
},
|
||||||
entity_id: 'sensor.humidity_kitchen',
|
{
|
||||||
|
condition: 'numeric_state',
|
||||||
|
entity_id: 'sensor.humidity_living_room',
|
||||||
|
above: '60'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: 'and',
|
||||||
|
conditions: [
|
||||||
|
{
|
||||||
|
condition: 'numeric_state',
|
||||||
|
entity_id: 'sensor.humidity_bedroom',
|
||||||
|
above: '60'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: 'numeric_state',
|
||||||
|
entity_id: 'sensor.humidity_bathroom',
|
||||||
above: '60'
|
above: '60'
|
||||||
}
|
}
|
||||||
},
|
]
|
||||||
{
|
},
|
||||||
$smType: 'condition',
|
]
|
||||||
condition: 'numeric_state',
|
|
||||||
condition_data: {
|
|
||||||
entity_id: 'sensor.humidity_living_room',
|
|
||||||
above: '60'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$smType: 'condition',
|
|
||||||
condition: 'and',
|
|
||||||
condition_data: {
|
|
||||||
conditions: [
|
|
||||||
{
|
|
||||||
$smType: 'condition',
|
|
||||||
condition: 'numeric_state',
|
|
||||||
condition_data: {
|
|
||||||
entity_id: 'sensor.humidity_bedroom',
|
|
||||||
above: '60'
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
$smType: 'condition',
|
|
||||||
condition: 'numeric_state',
|
|
||||||
condition_data: {
|
|
||||||
entity_id: 'sensor.humidity_bathroom',
|
|
||||||
above: '60'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
]
|
|
||||||
}
|
|
||||||
} as AutomationCondition,
|
} as AutomationCondition,
|
||||||
}
|
}
|
||||||
@@ -2,30 +2,24 @@ import { AutomationCondition, LogicCondition } from "types/automations/condition
|
|||||||
|
|
||||||
|
|
||||||
export const genUpdateMethods = (
|
export const genUpdateMethods = (
|
||||||
condition: LogicCondition,
|
condition: LogicCondition,
|
||||||
onChange: (c: LogicCondition) => void
|
onChange: (c: LogicCondition) => void
|
||||||
) => (i: number) => ({
|
) => (i: number) => ({
|
||||||
onUpdate: (update: AutomationCondition) => onChange({
|
onUpdate: (update: AutomationCondition) => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
conditions: [
|
||||||
...condition.condition_data,
|
...condition.conditions.slice(0, i),
|
||||||
conditions: [
|
update,
|
||||||
...condition.condition_data.conditions.slice(0, i),
|
...condition.conditions.slice(i + 1)
|
||||||
update,
|
]
|
||||||
...condition.condition_data.conditions.slice(i+1)
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}),
|
}),
|
||||||
onDelete: (which: 'root' | number) => {
|
onDelete: (which: 'root' | number) => {
|
||||||
if (which === 'root') {
|
if (which === 'root') {
|
||||||
onChange({
|
onChange({
|
||||||
...condition,
|
...condition,
|
||||||
condition_data: {
|
conditions: condition.conditions.slice(0, i).concat(
|
||||||
...condition.condition_data,
|
condition.conditions.slice(i + 1)
|
||||||
conditions: condition.condition_data.conditions.slice(0, i).concat(
|
)
|
||||||
condition.condition_data.conditions.slice(i+1)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
throw new Error("Not Implemented")
|
throw new Error("Not Implemented")
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { Styles } from "jss";
|
import { Styles } from "jss";
|
||||||
import Color from 'chroma-js';
|
|
||||||
import { createAppUseStyles } from "styles/theme";
|
import { createAppUseStyles } from "styles/theme";
|
||||||
|
|
||||||
export const useStyles = createAppUseStyles<{
|
export const useStyles = createAppUseStyles<{
|
||||||
@@ -26,9 +25,9 @@ export const useStyles = createAppUseStyles<{
|
|||||||
padding: 0,
|
padding: 0,
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: hasChildren? 'column' : 'row',
|
flexDirection: hasChildren ? 'column' : 'row',
|
||||||
}),
|
}),
|
||||||
title: ({hasChildren}) => ({
|
title: ({ hasChildren }) => ({
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none',
|
border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none',
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
@@ -36,7 +35,7 @@ export const useStyles = createAppUseStyles<{
|
|||||||
borderBottomLeftRadius: 0,
|
borderBottomLeftRadius: 0,
|
||||||
height: '100%',
|
height: '100%',
|
||||||
}),
|
}),
|
||||||
titleText: ({hasChildren}) => ({
|
titleText: ({ hasChildren }) => ({
|
||||||
background: theme.condition.primaryColor,
|
background: theme.condition.primaryColor,
|
||||||
border: `1px solid ${theme.primaryAccent}`,
|
border: `1px solid ${theme.primaryAccent}`,
|
||||||
borderRadius: 10,
|
borderRadius: 10,
|
||||||
@@ -44,7 +43,6 @@ export const useStyles = createAppUseStyles<{
|
|||||||
borderBottomRightRadius: 0,
|
borderBottomRightRadius: 0,
|
||||||
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
||||||
padding: 10,
|
padding: 10,
|
||||||
maxWidth: 120,
|
|
||||||
minWidth: 30,
|
minWidth: 30,
|
||||||
textOverflow: 'ellipsis',
|
textOverflow: 'ellipsis',
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
@@ -57,9 +55,10 @@ export const useStyles = createAppUseStyles<{
|
|||||||
left: -35,
|
left: -35,
|
||||||
top: 10,
|
top: 10,
|
||||||
},
|
},
|
||||||
modifyBtn: ({hasChildren}) => ({
|
modifyBtn: ({ hasChildren }) => ({
|
||||||
// styling
|
// styling
|
||||||
backgroundColor: theme.primary,
|
backgroundColor: theme.green,
|
||||||
|
color: theme.primary,
|
||||||
fill: theme.primaryAccent,
|
fill: theme.primaryAccent,
|
||||||
borderColor: theme.primaryAccent,
|
borderColor: theme.primaryAccent,
|
||||||
borderWidth: 1,
|
borderWidth: 1,
|
||||||
@@ -67,20 +66,19 @@ export const useStyles = createAppUseStyles<{
|
|||||||
borderTopLeftRadius: 0,
|
borderTopLeftRadius: 0,
|
||||||
borderBottomLeftRadius: 0,
|
borderBottomLeftRadius: 0,
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
|
|
||||||
// positioning
|
// positioning
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
padding: '0px 10px',
|
padding: '0px 10px',
|
||||||
// position: hasChildren ? 'absolute' : 'block',
|
|
||||||
right: 1,
|
right: 1,
|
||||||
top: 10,
|
top: 10,
|
||||||
|
|
||||||
// on hover
|
// on hover
|
||||||
"&:hover": {
|
"&:hover": {
|
||||||
backgroundColor: Color(theme.primary).brighten().hex(),
|
backgroundColor: theme.greenLight,
|
||||||
fill: Color(theme.primaryAccent).brighten().hex(),
|
fill: theme.primaryAccentLight,
|
||||||
},
|
},
|
||||||
"&:hover $icon": {
|
"&:hover $icon": {
|
||||||
transform: "rotate(90deg)"
|
transform: "rotate(90deg)"
|
||||||
@@ -88,14 +86,14 @@ export const useStyles = createAppUseStyles<{
|
|||||||
}),
|
}),
|
||||||
icon: {},
|
icon: {},
|
||||||
deleteBtn,
|
deleteBtn,
|
||||||
children: ({hasChildren}) => ({
|
children: ({ hasChildren }) => ({
|
||||||
flex: 1,
|
flex: 1,
|
||||||
paddingLeft: hasChildren ? 50 : 10,
|
paddingLeft: hasChildren ? 50 : 10,
|
||||||
paddingRight: hasChildren ? 0 : 10,
|
paddingRight: hasChildren ? 0 : 10,
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
justifyContent: 'center',
|
justifyContent: 'center',
|
||||||
border: `1px solid ${theme.primaryAccent}`,
|
border: `1px solid ${theme.secondaryAccent}`,
|
||||||
borderBottomRightRadius: hasChildren ? 10 : 0,
|
borderBottomRightRadius: hasChildren ? 10 : 0,
|
||||||
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
||||||
minHeight: hasChildren ? undefined : '100%'
|
minHeight: hasChildren ? undefined : '100%'
|
||||||
@@ -114,8 +112,8 @@ export const useStyles = createAppUseStyles<{
|
|||||||
paddingRight: 20,
|
paddingRight: 20,
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
"&:hover": {
|
"&:hover": {
|
||||||
backgroundColor: Color(theme.primary).brighten().hex(),
|
backgroundColor: theme.primaryLight,
|
||||||
fill: Color(theme.primaryAccent).brighten().hex(),
|
fill: theme.primaryAccentLight,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
addBtn: {
|
addBtn: {
|
||||||
@@ -131,8 +129,8 @@ export const useStyles = createAppUseStyles<{
|
|||||||
paddingRight: 20,
|
paddingRight: 20,
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
"&:hover": {
|
"&:hover": {
|
||||||
backgroundColor: Color(theme.primary).brighten().hex(),
|
backgroundColor: theme.primaryLight,
|
||||||
fill: Color(theme.primaryAccent).brighten().hex(),
|
fill: theme.primaryAccentLight,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ export const LogicViewer: Viewer<LogicCondition> = ({
|
|||||||
onChange,
|
onChange,
|
||||||
}) => {
|
}) => {
|
||||||
return <>
|
return <>
|
||||||
{condition.condition_data.conditions.map((c, i) => {
|
{condition.conditions.map((c, i) => {
|
||||||
return <ConditionNode key={i} condition={c} displayMode
|
return <ConditionNode key={i} condition={c} displayMode
|
||||||
{...genUpdateMethods(condition, onChange)(i)}
|
{...genUpdateMethods(condition, onChange)(i)}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -0,0 +1,59 @@
|
|||||||
|
import { FC } from "react";
|
||||||
|
import { AddIcon, PencilIcon, TrashIcon } from '../Icons/index';
|
||||||
|
import { useCircleStyles } from './styles';
|
||||||
|
import { Handle, Position, XYPosition } from 'react-flow-renderer';
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
export interface DAGCircleProps {
|
||||||
|
onAdd?: () => void;
|
||||||
|
onRemove?: () => void;
|
||||||
|
size: number,
|
||||||
|
backgroundColor?: string;
|
||||||
|
disableSource?: boolean;
|
||||||
|
disableTarget?: boolean;
|
||||||
|
}
|
||||||
|
export const makeFlowCircle = (
|
||||||
|
circleId: string,
|
||||||
|
position: XYPosition,
|
||||||
|
data: DAGCircleProps,
|
||||||
|
) => ({
|
||||||
|
id: circleId,
|
||||||
|
type: 'dagcircle',
|
||||||
|
position,
|
||||||
|
data
|
||||||
|
})
|
||||||
|
|
||||||
|
export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
|
||||||
|
data: {
|
||||||
|
size,
|
||||||
|
onAdd,
|
||||||
|
onRemove,
|
||||||
|
backgroundColor,
|
||||||
|
disableSource = false,
|
||||||
|
disableTarget = false,
|
||||||
|
}
|
||||||
|
}) => {
|
||||||
|
const { classes } = useCircleStyles({
|
||||||
|
size,
|
||||||
|
hasOnFunction: !!onRemove || !!onAdd,
|
||||||
|
hasRemoveFunction: !!onRemove,
|
||||||
|
backgroundColor,
|
||||||
|
});
|
||||||
|
return <>
|
||||||
|
{!disableSource && <Handle type="source" position={Position.Right} />}
|
||||||
|
{!disableTarget && <Handle type="target" position={Position.Left} />}
|
||||||
|
<div className={classes.root}>
|
||||||
|
{
|
||||||
|
onAdd ?
|
||||||
|
<AddIcon
|
||||||
|
size={70} units="%"
|
||||||
|
className={classes.icon}
|
||||||
|
onClick={onAdd}
|
||||||
|
/>
|
||||||
|
: (backgroundColor || onRemove) ? "" : "else"
|
||||||
|
}
|
||||||
|
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
import { PencilIcon } from "components/Icons"
|
||||||
|
import { NodeColor } from "types/graphs";
|
||||||
|
import { useNodeStyles } from "./styles";
|
||||||
|
import { Handle, Position } from 'react-flow-renderer';
|
||||||
|
import { FC } from "react";
|
||||||
|
|
||||||
|
|
||||||
|
export interface DAGNodeProps {
|
||||||
|
height: number;
|
||||||
|
width: number;
|
||||||
|
onXClick?: () => void;
|
||||||
|
onEditClick?: () => void;
|
||||||
|
color: NodeColor;
|
||||||
|
label: string;
|
||||||
|
hasInput?: boolean;
|
||||||
|
accentBackground?: boolean;
|
||||||
|
}
|
||||||
|
export const DAGNode: FC<{ data: DAGNodeProps }> = ({
|
||||||
|
data: {
|
||||||
|
label,
|
||||||
|
height,
|
||||||
|
width,
|
||||||
|
onXClick,
|
||||||
|
onEditClick = () => { },
|
||||||
|
color,
|
||||||
|
hasInput = false,
|
||||||
|
accentBackground = false,
|
||||||
|
},
|
||||||
|
}) => {
|
||||||
|
const { classes, theme } = useNodeStyles({
|
||||||
|
color,
|
||||||
|
nodeHeight: height,
|
||||||
|
nodeWidth: width,
|
||||||
|
accentBackground,
|
||||||
|
});
|
||||||
|
return <>
|
||||||
|
{hasInput && <Handle type="target" position={Position.Left} />}
|
||||||
|
<Handle type="source" position={Position.Right} />
|
||||||
|
<div className={classes.root}>
|
||||||
|
<div className={classes.inner}>
|
||||||
|
<div className={classes.leftEdge} onClick={onXClick}>
|
||||||
|
{!!onXClick && <button className={classes.buttonDelete}>X</button>}
|
||||||
|
</div>
|
||||||
|
<div className={classes.textWrap}>
|
||||||
|
<span className={classes.text} title={label}>
|
||||||
|
{label}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className={classes.rightEdge} onClick={() => {
|
||||||
|
console.log('editing me', label, onEditClick, onEditClick())
|
||||||
|
}}>
|
||||||
|
<button className={classes.buttonEdit}>
|
||||||
|
<PencilIcon size={1.1} color={theme.green} />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
}
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import { makeFlowCircle } from "./DAGCircle"
|
||||||
|
import { DAGAutomationFlowDims, FlowData } from "./types"
|
||||||
|
import { XYPosition } from 'react-flow-renderer';
|
||||||
|
|
||||||
|
export const makeAddButton = (
|
||||||
|
id: string,
|
||||||
|
position: XYPosition,
|
||||||
|
{
|
||||||
|
circleSize,
|
||||||
|
}: DAGAutomationFlowDims,
|
||||||
|
onAdd: () => void,
|
||||||
|
disableTarget: boolean = true,
|
||||||
|
) => makeFlowCircle(
|
||||||
|
id,
|
||||||
|
position,
|
||||||
|
{
|
||||||
|
size: circleSize,
|
||||||
|
onAdd,
|
||||||
|
disableSource: true,
|
||||||
|
disableTarget,
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
export const makeConditionPoint = (
|
||||||
|
id: string,
|
||||||
|
position: XYPosition,
|
||||||
|
{
|
||||||
|
padding,
|
||||||
|
conditionWidth,
|
||||||
|
conditionHeight,
|
||||||
|
nodeWidth,
|
||||||
|
nodeHeight,
|
||||||
|
circleSize,
|
||||||
|
distanceFactor,
|
||||||
|
}: DAGAutomationFlowDims,
|
||||||
|
totalConditions: number,
|
||||||
|
onEditClick: () => void,
|
||||||
|
) => ({
|
||||||
|
id,
|
||||||
|
type: 'dagnode',
|
||||||
|
position,
|
||||||
|
data: {
|
||||||
|
size: circleSize,
|
||||||
|
color: 'lblue',
|
||||||
|
accentBackground: true,
|
||||||
|
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
|
||||||
|
height: conditionHeight,
|
||||||
|
width: conditionWidth,
|
||||||
|
hasInput: true,
|
||||||
|
onEditClick,
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -0,0 +1,213 @@
|
|||||||
|
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
|
import { DAGAutomationFlow } from '.';
|
||||||
|
import { useState } from 'react';
|
||||||
|
import * as dgconst from "components/DAGSvgs/constants";
|
||||||
|
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'DAGAutomationFlow/Viewer',
|
||||||
|
component: DAGAutomationFlow,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {
|
||||||
|
dims: dgconst.DEFAULT_DIMS
|
||||||
|
}
|
||||||
|
} as ComponentMeta<typeof DAGAutomationFlow>
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
|
||||||
|
const [state, setState] = useState({
|
||||||
|
trigger: args.trigger,
|
||||||
|
sequence: args.sequence,
|
||||||
|
condition: args.condition,
|
||||||
|
})
|
||||||
|
return <div className="page">
|
||||||
|
<DAGAutomationFlow
|
||||||
|
{...args}
|
||||||
|
{...state}
|
||||||
|
onTriggerUpdate={trigger => {
|
||||||
|
console.log({ trigger })
|
||||||
|
setState({ ...state, trigger })
|
||||||
|
}}
|
||||||
|
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
||||||
|
onConditionUpdate={condition => setState({ ...state, condition })}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Simple = Template.bind({})
|
||||||
|
Simple.args = {
|
||||||
|
...Simple.args,
|
||||||
|
condition: [],
|
||||||
|
trigger: [
|
||||||
|
{
|
||||||
|
"platform": "numeric_state",
|
||||||
|
"entity_id": "test",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"platform": "homeassistant",
|
||||||
|
"event": "start",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
sequence: [
|
||||||
|
{
|
||||||
|
condition: 'and',
|
||||||
|
conditions: [
|
||||||
|
{
|
||||||
|
condition: 'numeric_state',
|
||||||
|
entity_id: 'sensor.temperature_kitchen',
|
||||||
|
below: '15',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
condition: 'template',
|
||||||
|
value_template: 'states(switch.kitchen_light) == "on"'
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
alias: "Start Music In Kitchen",
|
||||||
|
service: 'media_player.play_media',
|
||||||
|
target: {
|
||||||
|
entity_id: "media_player.kitchen_dot"
|
||||||
|
},
|
||||||
|
data: {
|
||||||
|
media_content_id: "Good Morning",
|
||||||
|
media_content_type: "SPOTIFY",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const Complex = Template.bind({})
|
||||||
|
Complex.args = {
|
||||||
|
...Complex.args,
|
||||||
|
condition: [],
|
||||||
|
trigger: [
|
||||||
|
{
|
||||||
|
"platform": "numeric_state",
|
||||||
|
"entity_id": "test",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"platform": "homeassistant",
|
||||||
|
"event": "start",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
sequence: [
|
||||||
|
{
|
||||||
|
"condition": "and",
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "numeric_state",
|
||||||
|
"entity_id": "sensor.temperature_kitchen",
|
||||||
|
"below": "15"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"condition": "template",
|
||||||
|
"value_template": "states(switch.kitchen_light) == \"on\""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"alias": "Start Music In Kitchen",
|
||||||
|
"service": "media_player.play_media",
|
||||||
|
"target": {
|
||||||
|
"entity_id": "media_player.kitchen_dot"
|
||||||
|
},
|
||||||
|
"data": {
|
||||||
|
"media_content_id": "Good Morning",
|
||||||
|
"media_content_type": "SPOTIFY"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"choose": [
|
||||||
|
{
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "state",
|
||||||
|
"entity_id": "lights.bathroom",
|
||||||
|
"state": "off",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"sequence": [
|
||||||
|
{
|
||||||
|
"service": "light.turn_on",
|
||||||
|
"target": {
|
||||||
|
"entity_id": "lights.bathroom"
|
||||||
|
},
|
||||||
|
"data": {}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"alias": "Turn off bedroom",
|
||||||
|
"service": "light.turn_off",
|
||||||
|
"target": {
|
||||||
|
"entity_id": "lights.bedroom"
|
||||||
|
},
|
||||||
|
"data": {}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"conditions": [
|
||||||
|
{
|
||||||
|
"condition": "state",
|
||||||
|
"entity_id": "lights.bedroom",
|
||||||
|
"state": "off",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"sequence": [
|
||||||
|
{
|
||||||
|
"alias": "Turn on bedroom",
|
||||||
|
"service": "light.turn_on",
|
||||||
|
"target": {
|
||||||
|
"entity_id": "lights.bedroom"
|
||||||
|
},
|
||||||
|
"data": {}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"choose": [
|
||||||
|
{
|
||||||
|
"conditions": [],
|
||||||
|
"sequence": [
|
||||||
|
{
|
||||||
|
"choose": [],
|
||||||
|
"default": [],
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"default": [
|
||||||
|
{
|
||||||
|
"choose": [],
|
||||||
|
"default": [],
|
||||||
|
}
|
||||||
|
],
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"default": [
|
||||||
|
{
|
||||||
|
"service": "light.turn_off",
|
||||||
|
"target": {
|
||||||
|
"entity_id": "lights.bathroom"
|
||||||
|
},
|
||||||
|
"data": {}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"condition": "and",
|
||||||
|
"conditions": []
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
export const EmptyStart = Template.bind({})
|
||||||
|
EmptyStart.args = {
|
||||||
|
...EmptyStart.args,
|
||||||
|
condition: [],
|
||||||
|
trigger: [],
|
||||||
|
sequence: []
|
||||||
|
}
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
import { FC, useState } from "react";
|
||||||
|
|
||||||
|
import ReactFlow, { MiniMap, Controls } from 'react-flow-renderer';
|
||||||
|
import { AutomationSequenceNode } from "types/automations";
|
||||||
|
import { AutomationTrigger } from 'types/automations/triggers';
|
||||||
|
import { triggerToFlow } from "./triggerConvertor";
|
||||||
|
import { DAGNode } from "./DAGNode";
|
||||||
|
import { DAGAutomationFlowDims, FlowData, ModalState, UpdateModalState } from './types';
|
||||||
|
import { DAGCircle } from './DAGCircle';
|
||||||
|
import { sequenceToFlow } from "./sequenceConvertor";
|
||||||
|
import { makeSequenceUpdater } from "./updater";
|
||||||
|
import { NodeEditor } from "components/NodeEditor";
|
||||||
|
import { MultiNodeEditor } from "components/MultiNodeEditors";
|
||||||
|
import { Modal } from "components/Modal";
|
||||||
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
|
import { makeConditionPoint } from "./flowDataMods";
|
||||||
|
|
||||||
|
const nodeTypes = {
|
||||||
|
'dagnode': DAGNode,
|
||||||
|
'dagcircle': DAGCircle,
|
||||||
|
}
|
||||||
|
|
||||||
|
interface Props {
|
||||||
|
className?: string;
|
||||||
|
trigger: AutomationTrigger[];
|
||||||
|
condition: AutomationCondition[];
|
||||||
|
sequence: AutomationSequenceNode[];
|
||||||
|
dims: DAGAutomationFlowDims;
|
||||||
|
onTriggerUpdate: (t: AutomationTrigger[]) => void;
|
||||||
|
onSequenceUpdate: (s: AutomationSequenceNode[]) => void;
|
||||||
|
onConditionUpdate: (s: AutomationCondition[]) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const DAGAutomationFlow: FC<Props> = ({
|
||||||
|
className,
|
||||||
|
trigger,
|
||||||
|
condition,
|
||||||
|
sequence,
|
||||||
|
onTriggerUpdate,
|
||||||
|
onSequenceUpdate,
|
||||||
|
onConditionUpdate,
|
||||||
|
dims,
|
||||||
|
}) => {
|
||||||
|
// state
|
||||||
|
const [modalState, setModalState] = useState<ModalState | null>(null);
|
||||||
|
|
||||||
|
// modal
|
||||||
|
let modalBody = <></>
|
||||||
|
if (modalState) {
|
||||||
|
if (modalState.single) {
|
||||||
|
modalBody = <NodeEditor
|
||||||
|
node={modalState.node}
|
||||||
|
onClose={() => setModalState(null)}
|
||||||
|
onSave={n => { modalState.update(n as any); setModalState(null); }}
|
||||||
|
allowedTypes={modalState.allowedTypes}
|
||||||
|
saveBtnCreateText={modalState.saveBtnCreateText}
|
||||||
|
/>
|
||||||
|
} else {
|
||||||
|
modalBody = <MultiNodeEditor
|
||||||
|
sequence={modalState.node}
|
||||||
|
onClose={() => setModalState(null)}
|
||||||
|
onSave={(n) => modalState.update(n as any)}
|
||||||
|
allowedTypes={['condition']}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// convert automation to flow data
|
||||||
|
const condPoint = makeConditionPoint('c', {
|
||||||
|
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
y: dims.padding.y + dims.nodeHeight * 0.25
|
||||||
|
}, dims, condition.length, makeOnEditAutomationConditions(
|
||||||
|
condition,
|
||||||
|
onConditionUpdate,
|
||||||
|
setModalState,
|
||||||
|
));
|
||||||
|
const flowData: FlowData = {
|
||||||
|
nodes: [condPoint],
|
||||||
|
edges: [],
|
||||||
|
}
|
||||||
|
triggerToFlow(flowData, trigger, condPoint.id, dims, {
|
||||||
|
onAdd: () => onTriggerUpdate([
|
||||||
|
...trigger, {
|
||||||
|
platform: 'event',
|
||||||
|
event_type: '',
|
||||||
|
}
|
||||||
|
]),
|
||||||
|
onDelete: i => onTriggerUpdate([
|
||||||
|
...trigger.slice(0, i),
|
||||||
|
...trigger.slice(i + 1)
|
||||||
|
]),
|
||||||
|
onEdit: i => setModalState({
|
||||||
|
single: true,
|
||||||
|
node: trigger[i],
|
||||||
|
update: t => onTriggerUpdate([
|
||||||
|
...trigger.slice(0, i),
|
||||||
|
t,
|
||||||
|
...trigger.slice(i + 1)
|
||||||
|
]),
|
||||||
|
allowedTypes: ['trigger'],
|
||||||
|
})
|
||||||
|
});
|
||||||
|
sequenceToFlow(
|
||||||
|
flowData,
|
||||||
|
sequence,
|
||||||
|
condPoint.id,
|
||||||
|
{
|
||||||
|
...dims, padding: {
|
||||||
|
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
|
||||||
|
y: dims.padding.y,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
|
||||||
|
);
|
||||||
|
|
||||||
|
// render
|
||||||
|
return <>
|
||||||
|
<Modal open={!!modalState}>
|
||||||
|
{modalBody}
|
||||||
|
</Modal>
|
||||||
|
<ReactFlow
|
||||||
|
className={className}
|
||||||
|
nodeTypes={nodeTypes}
|
||||||
|
snapToGrid
|
||||||
|
onlyRenderVisibleElements
|
||||||
|
nodesConnectable={false}
|
||||||
|
nodesDraggable={false}
|
||||||
|
{...flowData}
|
||||||
|
>
|
||||||
|
<MiniMap />
|
||||||
|
<Controls />
|
||||||
|
</ReactFlow>
|
||||||
|
</>;
|
||||||
|
}
|
||||||
|
|
||||||
|
const makeOnEditAutomationConditions = (
|
||||||
|
conditions: AutomationCondition[],
|
||||||
|
updateConditions: (c: AutomationCondition[]) => void,
|
||||||
|
openModal: UpdateModalState,
|
||||||
|
) => () => openModal({
|
||||||
|
single: false,
|
||||||
|
node: conditions,
|
||||||
|
allowedTypes: ['condition'],
|
||||||
|
update: c => updateConditions(c as any),
|
||||||
|
})
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
import { AutomationSequenceNode } from 'types/automations';
|
||||||
|
import { DAGAutomationFlowDims, FlowData } from './types';
|
||||||
|
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
||||||
|
import { XYPosition } from 'react-flow-renderer';
|
||||||
|
import { ChooseAction } from 'types/automations/actions';
|
||||||
|
import { makeFlowCircle } from './DAGCircle';
|
||||||
|
import { createOnRemoveForChooseNode, SequenceUpdater } from './updater';
|
||||||
|
import { getNodeType } from 'utils/automations';
|
||||||
|
import { makeAddButton, makeConditionPoint } from './flowDataMods';
|
||||||
|
|
||||||
|
|
||||||
|
export const sequenceToFlow = (
|
||||||
|
flowData: FlowData,
|
||||||
|
sequence: AutomationSequenceNode[],
|
||||||
|
fromPoint: string,
|
||||||
|
dims: DAGAutomationFlowDims,
|
||||||
|
updater: SequenceUpdater,
|
||||||
|
prefix: string = "",
|
||||||
|
) => {
|
||||||
|
let lastPointId = fromPoint;
|
||||||
|
let lasPos: XYPosition | null = null;
|
||||||
|
// sequence
|
||||||
|
for (let i = 0; i < sequence.length; i++) {
|
||||||
|
const node = sequence[i];
|
||||||
|
const nodeId = `${prefix}n-${i}`;
|
||||||
|
let position: XYPosition;
|
||||||
|
if (lasPos) {
|
||||||
|
position = {
|
||||||
|
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
y: dims.padding.y
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
position = {
|
||||||
|
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
|
||||||
|
y: dims.padding.y
|
||||||
|
};
|
||||||
|
}
|
||||||
|
// draw node
|
||||||
|
if (getNodeType(node) === 'action') {
|
||||||
|
if ('choose' in node) {
|
||||||
|
position = addChooseNode(flowData, node, position, nodeId, dims, updater, i)
|
||||||
|
} else {
|
||||||
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
|
onXClick: () => updater.removeNode(i)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
|
onXClick: () => updater.removeNode(i)
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
addEdge(flowData, lastPointId, nodeId, false)
|
||||||
|
lastPointId = nodeId;
|
||||||
|
lasPos = position;
|
||||||
|
}
|
||||||
|
// add button
|
||||||
|
const addCircle = makeAddButton(
|
||||||
|
`${prefix}-+`,
|
||||||
|
{
|
||||||
|
x: (
|
||||||
|
lasPos === null ?
|
||||||
|
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
|
||||||
|
lasPos.x
|
||||||
|
) + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
y: dims.padding.y + dims.circleSize / 4
|
||||||
|
},
|
||||||
|
dims,
|
||||||
|
updater.addNode,
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
flowData.nodes.push(addCircle)
|
||||||
|
addEdge(flowData, lastPointId, addCircle.id, false)
|
||||||
|
return {
|
||||||
|
position: lasPos,
|
||||||
|
pointId: lastPointId,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const xyApply = (p1: XYPosition, p2: XYPosition, fcn: (a: number, b: number) => number): XYPosition => ({
|
||||||
|
x: fcn(p1.x, p2.x), y: fcn(p1.y, p2.y)
|
||||||
|
})
|
||||||
|
|
||||||
|
const addEdge = (flowData: FlowData, source: string, target: string, animated: boolean = false) => flowData.edges.push({
|
||||||
|
id: `${source}-${target}`,
|
||||||
|
source,
|
||||||
|
target,
|
||||||
|
animated,
|
||||||
|
})
|
||||||
|
|
||||||
|
const addSingleNode = (
|
||||||
|
flowData: FlowData,
|
||||||
|
node: AutomationSequenceNode,
|
||||||
|
position: XYPosition,
|
||||||
|
nodeId: string,
|
||||||
|
{
|
||||||
|
nodeHeight,
|
||||||
|
nodeWidth,
|
||||||
|
}: DAGAutomationFlowDims,
|
||||||
|
opts: {
|
||||||
|
onEditClick: () => void;
|
||||||
|
onXClick: () => void;
|
||||||
|
}
|
||||||
|
) => flowData.nodes.push({
|
||||||
|
id: nodeId,
|
||||||
|
type: 'dagnode',
|
||||||
|
data: {
|
||||||
|
label: getDescriptionFromAutomationNode(node),
|
||||||
|
height: nodeHeight,
|
||||||
|
width: nodeWidth,
|
||||||
|
color: getNodeType(node) === 'action' ? 'green' : 'blue',
|
||||||
|
hasInput: true,
|
||||||
|
...opts,
|
||||||
|
},
|
||||||
|
position,
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const addChooseNode = (
|
||||||
|
flowData: FlowData,
|
||||||
|
node: ChooseAction,
|
||||||
|
position: XYPosition,
|
||||||
|
nodeId: string,
|
||||||
|
dims: DAGAutomationFlowDims,
|
||||||
|
updater: SequenceUpdater,
|
||||||
|
i: number,
|
||||||
|
) => {
|
||||||
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
|
onXClick: () => updater.removeNode(i),
|
||||||
|
});
|
||||||
|
let lastPos: XYPosition = position;
|
||||||
|
// conditions
|
||||||
|
node.choose.forEach(({ sequence, conditions }, j) => {
|
||||||
|
const sequenceId = `${nodeId}.${j}`;
|
||||||
|
// edit/delete circle
|
||||||
|
const circle = makeFlowCircle(`${sequenceId}>delete`, {
|
||||||
|
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
}, {
|
||||||
|
size: dims.circleSize,
|
||||||
|
onRemove: createOnRemoveForChooseNode(
|
||||||
|
node,
|
||||||
|
d => updater.updateNode(i, d),
|
||||||
|
j,
|
||||||
|
),
|
||||||
|
})
|
||||||
|
flowData.nodes.push(circle)
|
||||||
|
addEdge(flowData, nodeId, circle.id, true)
|
||||||
|
const condNode = makeConditionPoint(
|
||||||
|
`${sequenceId}>cond`,
|
||||||
|
{
|
||||||
|
x: circle.position.x + dims.circleSize * dims.distanceFactor,
|
||||||
|
y: circle.position.y + dims.circleSize / 8,
|
||||||
|
},
|
||||||
|
dims,
|
||||||
|
conditions.length,
|
||||||
|
updater.makeOnEditConditionsForChooseNode(i, j)
|
||||||
|
);
|
||||||
|
flowData.nodes.push(condNode)
|
||||||
|
addEdge(flowData, circle.id, condNode.id, true)
|
||||||
|
|
||||||
|
// actual sub sequence
|
||||||
|
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
|
||||||
|
...dims,
|
||||||
|
padding: {
|
||||||
|
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
|
||||||
|
y: condNode.position.y - dims.conditionHeight / 2,
|
||||||
|
},
|
||||||
|
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
|
||||||
|
if (lastPoint.position) {
|
||||||
|
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
||||||
|
} else {
|
||||||
|
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
const totalChildren = node.choose.length;
|
||||||
|
|
||||||
|
// add button
|
||||||
|
const addCirlce = makeAddButton(
|
||||||
|
`${nodeId}>add`,
|
||||||
|
{
|
||||||
|
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||||
|
},
|
||||||
|
dims,
|
||||||
|
() => updater.updateNode(i, {
|
||||||
|
...node,
|
||||||
|
choose: [
|
||||||
|
...node.choose,
|
||||||
|
{
|
||||||
|
sequence: [],
|
||||||
|
conditions: [],
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}),
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
flowData.nodes.push(addCirlce)
|
||||||
|
addEdge(flowData, nodeId, addCirlce.id, true)
|
||||||
|
|
||||||
|
// else
|
||||||
|
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
|
||||||
|
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||||
|
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
|
||||||
|
}, { size: dims.circleSize })
|
||||||
|
flowData.nodes.push(elseCircle)
|
||||||
|
addEdge(flowData, nodeId, elseCircle.id, true)
|
||||||
|
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
|
||||||
|
...dims,
|
||||||
|
padding: {
|
||||||
|
x: position.x - dims.nodeWidth,
|
||||||
|
y: elseCircle.position.y - dims.circleSize / 4,
|
||||||
|
},
|
||||||
|
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
|
||||||
|
if (lastPoint.position) {
|
||||||
|
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
||||||
|
} else {
|
||||||
|
lastPos = xyApply(lastPos, elseCircle.position, Math.max)
|
||||||
|
}
|
||||||
|
return lastPos
|
||||||
|
}
|
||||||
@@ -1,49 +1,12 @@
|
|||||||
import { Styles } from "jss";
|
import { Styles } from "jss";
|
||||||
import Color from 'chroma-js';
|
|
||||||
import { createAppUseStyles } from "styles/theme";
|
import { createAppUseStyles } from "styles/theme";
|
||||||
import { Node } from "types/graphs";
|
import { NodeColor } from "types/graphs";
|
||||||
|
|
||||||
|
|
||||||
export const useBoardStyles = createAppUseStyles<{
|
|
||||||
boardHeight: number,
|
|
||||||
boardWidth: number,
|
|
||||||
}>(theme => ({
|
|
||||||
dag: {
|
|
||||||
borderWidth: 1,
|
|
||||||
borderStyle: 'solid',
|
|
||||||
borderColor: theme.secondaryAccent,
|
|
||||||
color: theme.primaryAccent,
|
|
||||||
background: theme.primary,
|
|
||||||
width: '100%',
|
|
||||||
height: '100%',
|
|
||||||
overflow: 'scroll'
|
|
||||||
},
|
|
||||||
svg: ({ boardHeight, boardWidth }) => ({
|
|
||||||
minHeight: `${boardHeight}px`,
|
|
||||||
minWidth: `${boardWidth}px`,
|
|
||||||
padding: 0,
|
|
||||||
margin: 0,
|
|
||||||
}),
|
|
||||||
circle: {
|
|
||||||
fill: Color(theme.secondary).set('rgb.b', 125).hex(),
|
|
||||||
},
|
|
||||||
infoBox: {
|
|
||||||
paddingLeft: '10px',
|
|
||||||
paddingRight: '10px',
|
|
||||||
display: 'flex',
|
|
||||||
flexDirection: 'column',
|
|
||||||
justifyContent: 'flex-start',
|
|
||||||
overflow: 'auto',
|
|
||||||
},
|
|
||||||
dagEdge: {
|
|
||||||
stroke: theme.secondaryAccent,
|
|
||||||
},
|
|
||||||
}))
|
|
||||||
|
|
||||||
export const useNodeStyles = createAppUseStyles<{
|
export const useNodeStyles = createAppUseStyles<{
|
||||||
color: Node['color'],
|
color: NodeColor,
|
||||||
nodeHeight: number,
|
nodeHeight: number,
|
||||||
nodeWidth: number,
|
nodeWidth: number,
|
||||||
|
accentBackground: boolean,
|
||||||
}>(theme => {
|
}>(theme => {
|
||||||
const edgeStyle: Styles = {
|
const edgeStyle: Styles = {
|
||||||
flex: '1',
|
flex: '1',
|
||||||
@@ -68,21 +31,22 @@ export const useNodeStyles = createAppUseStyles<{
|
|||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
root: {
|
root: ({ nodeHeight, nodeWidth }) => ({
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
justifyContent: 'flex-end',
|
justifyContent: 'flex-end',
|
||||||
height: `100%`,
|
height: nodeHeight,
|
||||||
maxHeight: `100%`,
|
maxHeight: nodeHeight,
|
||||||
maxWidth: '100%',
|
maxWidth: nodeWidth,
|
||||||
width: '100%',
|
width: nodeWidth,
|
||||||
fontSize: 10,
|
fontSize: 10,
|
||||||
},
|
}),
|
||||||
inner: ({ color }) => ({
|
inner: ({ color, accentBackground }) => ({
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'row',
|
flexDirection: 'row',
|
||||||
backgroundColor: theme.secondary,
|
backgroundColor: !accentBackground ? theme.secondary :
|
||||||
|
color === 'lblue' ? theme.condition.primaryColorOpaque : 'none',
|
||||||
borderRadius: '1em',
|
borderRadius: '1em',
|
||||||
flex: 1,
|
flex: 1,
|
||||||
height: `100%`,
|
height: `100%`,
|
||||||
@@ -94,10 +58,11 @@ export const useNodeStyles = createAppUseStyles<{
|
|||||||
borderTopStyle: 'solid',
|
borderTopStyle: 'solid',
|
||||||
borderTopLeftRadius: '10px',
|
borderTopLeftRadius: '10px',
|
||||||
borderTopRightRadius: '10px',
|
borderTopRightRadius: '10px',
|
||||||
borderTopColor: color === 'red' ? Color(theme.secondary).set('rgb.r', 125).hex() :
|
borderTopColor: color === 'red' ? theme.redAccent :
|
||||||
color === 'blue' ? Color(theme.secondary).set('rgb.b', 125).hex() :
|
color === 'blue' ? theme.condition.primaryColor :
|
||||||
color === 'green' ? Color(theme.secondary).set('rgb.g', 125).hex() :
|
color === 'green' ? theme.green :
|
||||||
'none'
|
color === 'lblue' ? theme.condition.primaryAccent :
|
||||||
|
'none'
|
||||||
}),
|
}),
|
||||||
textWrap: {
|
textWrap: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@@ -149,13 +114,14 @@ export const useCircleStyles = createAppUseStyles<{
|
|||||||
backgroundColor?: string,
|
backgroundColor?: string,
|
||||||
}>(theme => ({
|
}>(theme => ({
|
||||||
root: ({ size, hasOnFunction, hasRemoveFunction, backgroundColor }) => {
|
root: ({ size, hasOnFunction, hasRemoveFunction, backgroundColor }) => {
|
||||||
const baseColor = backgroundColor ? backgroundColor : Color(theme.primary).set('rgb.g', 100).hex();
|
const baseColor = backgroundColor ? backgroundColor : theme.green;
|
||||||
const hoverColor = (hasOnFunction && !hasRemoveFunction) ? Color(theme.primary).set('rgb.g', 150).hex() : baseColor
|
const hoverColor = hasOnFunction ? theme.greenOpaque : baseColor
|
||||||
return {
|
return {
|
||||||
backgroundColor: baseColor,
|
backgroundColor: baseColor,
|
||||||
borderRadius: hasRemoveFunction ? 10 : 500,
|
borderRadius: hasRemoveFunction ? 10 : 500,
|
||||||
height: size,
|
height: size,
|
||||||
width: size,
|
width: size,
|
||||||
|
color: theme.primary,
|
||||||
cursor: hasOnFunction ? "pointer" : 'default',
|
cursor: hasOnFunction ? "pointer" : 'default',
|
||||||
"&:hover": {
|
"&:hover": {
|
||||||
backgroundColor: hoverColor,
|
backgroundColor: hoverColor,
|
||||||
@@ -166,18 +132,7 @@ export const useCircleStyles = createAppUseStyles<{
|
|||||||
alignItems: 'center',
|
alignItems: 'center',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
icon: {
|
|
||||||
"&:hover": {
|
|
||||||
borderRadius: 500,
|
|
||||||
background: Color(theme.primary).set('rgb.g', 150).hex(),
|
|
||||||
}
|
|
||||||
},
|
|
||||||
trashIcon: {
|
trashIcon: {
|
||||||
padding: 1,
|
padding: 1,
|
||||||
"&:hover": {
|
|
||||||
borderRadius: 500,
|
|
||||||
background: Color(theme.primary).set('rgb.g', 150).hex(),
|
|
||||||
cursor: 'pointer',
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}))
|
}))
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
import { AutomationTrigger } from 'types/automations/triggers';
|
||||||
|
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
|
||||||
|
import { makeFlowCircle } from './DAGCircle';
|
||||||
|
import { makeAddButton } from './flowDataMods';
|
||||||
|
|
||||||
|
export const triggerToFlow = (
|
||||||
|
flowData: FlowData,
|
||||||
|
trigger: AutomationTrigger[],
|
||||||
|
toPoint: string,
|
||||||
|
dims: DAGAutomationFlowDims,
|
||||||
|
opts: TriggerMakerOptions,
|
||||||
|
) => {
|
||||||
|
const {
|
||||||
|
distanceFactor,
|
||||||
|
nodeHeight,
|
||||||
|
nodeWidth,
|
||||||
|
circleSize,
|
||||||
|
padding,
|
||||||
|
conditionHeight,
|
||||||
|
} = dims;
|
||||||
|
// convert all triggers to dag nodes
|
||||||
|
trigger.forEach((t, i) => {
|
||||||
|
const flowId = `t-${i}`;
|
||||||
|
flowData.nodes.push({
|
||||||
|
id: flowId,
|
||||||
|
type: 'dagnode',
|
||||||
|
data: {
|
||||||
|
label: t.alias ?? t.platform,
|
||||||
|
height: nodeHeight,
|
||||||
|
width: nodeWidth,
|
||||||
|
color: 'red',
|
||||||
|
onEditClick: () => opts.onEdit(i),
|
||||||
|
onXClick: () => opts.onDelete(i),
|
||||||
|
},
|
||||||
|
position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i }
|
||||||
|
})
|
||||||
|
flowData.edges.push({
|
||||||
|
id: `e(${flowId})-(${toPoint})`,
|
||||||
|
source: flowId,
|
||||||
|
target: toPoint,
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
// create a 'add button'
|
||||||
|
flowData.nodes.push(makeAddButton(
|
||||||
|
'trigger-add',
|
||||||
|
{
|
||||||
|
x: padding.x + nodeWidth * 0.4,
|
||||||
|
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
|
||||||
|
},
|
||||||
|
dims,
|
||||||
|
opts.onAdd
|
||||||
|
))
|
||||||
|
}
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
import { Edge, Node, XYPosition } from 'react-flow-renderer';
|
||||||
|
import { AutomationSequenceNode } from 'types/automations';
|
||||||
|
import { DAGCircleProps } from './DAGCircle';
|
||||||
|
import { DAGNodeProps } from './DAGNode';
|
||||||
|
import { AutomationTrigger } from 'types/automations/triggers';
|
||||||
|
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
|
||||||
|
|
||||||
|
|
||||||
|
export type DAGAutomationFlowDims = {
|
||||||
|
padding: XYPosition;
|
||||||
|
nodeHeight: number;
|
||||||
|
nodeWidth: number;
|
||||||
|
conditionWidth: number;
|
||||||
|
conditionHeight: number;
|
||||||
|
circleSize: number;
|
||||||
|
distanceFactor: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | any>;
|
||||||
|
export type FlowData = {
|
||||||
|
nodes: DAGAutomationFlowNode[],
|
||||||
|
edges: Edge[],
|
||||||
|
}
|
||||||
|
|
||||||
|
export type TriggerMakerOptions = {
|
||||||
|
onAdd: () => void,
|
||||||
|
onEdit: (i: number) => void,
|
||||||
|
onDelete: (i: number) => void,
|
||||||
|
}
|
||||||
|
|
||||||
|
export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = (
|
||||||
|
s: ModalState<T>
|
||||||
|
) => void;
|
||||||
|
|
||||||
|
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
|
||||||
|
single: true,
|
||||||
|
node: T
|
||||||
|
update: (n: T) => void;
|
||||||
|
saveBtnCreateText?: boolean;
|
||||||
|
allowedTypes: MultiNodeEditorProps['allowedTypes'],
|
||||||
|
} | {
|
||||||
|
single: false,
|
||||||
|
node: AutomationSequenceNode[]
|
||||||
|
update: (n: AutomationSequenceNode[]) => void;
|
||||||
|
allowedTypes: ['condition']
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
import { AutomationSequenceNode } from "types/automations"
|
||||||
|
import { ChooseAction } from "types/automations/actions";
|
||||||
|
import { ModalState } from "./types";
|
||||||
|
import { makeSequenceUpdater } from "./updater"
|
||||||
|
|
||||||
|
const mockSequenceUpdater = (defaultState: AutomationSequenceNode[] = []) => {
|
||||||
|
let state: AutomationSequenceNode[] = [...defaultState]
|
||||||
|
const modalStates: ModalState[] = [];
|
||||||
|
|
||||||
|
const updater = makeSequenceUpdater(
|
||||||
|
state,
|
||||||
|
s => {
|
||||||
|
state = s
|
||||||
|
console.log(state, s)
|
||||||
|
},
|
||||||
|
ms => modalStates.push(ms)
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
get state() {
|
||||||
|
return state
|
||||||
|
},
|
||||||
|
modalStates,
|
||||||
|
updater
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
test("sequence updater updates nodes", () => {
|
||||||
|
const mock = mockSequenceUpdater([
|
||||||
|
{
|
||||||
|
"choose": [
|
||||||
|
{
|
||||||
|
"conditions": [],
|
||||||
|
"sequence": [],
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"default": [],
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
expect(mock.state.length).toBe(1)
|
||||||
|
expect((mock.state[0] as ChooseAction).alias).toBe(undefined)
|
||||||
|
mock.updater.updateNode(0, {
|
||||||
|
...mock.state[0],
|
||||||
|
alias: "Hello"
|
||||||
|
})
|
||||||
|
expect(mock.state[0].alias).toBe("Hello")
|
||||||
|
})
|
||||||
|
test('update conditions for node', () => {
|
||||||
|
const mock = mockSequenceUpdater([
|
||||||
|
{
|
||||||
|
"choose": [
|
||||||
|
{
|
||||||
|
"conditions": [],
|
||||||
|
"sequence": [],
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"default": [],
|
||||||
|
}
|
||||||
|
]);
|
||||||
|
mock.updater.makeOnEditConditionsForChooseNode(0, 0)();
|
||||||
|
|
||||||
|
expect(mock.modalStates.length).toBe(1)
|
||||||
|
expect((mock.modalStates[0].node as AutomationSequenceNode[]).length).toBe(0)
|
||||||
|
mock.modalStates[0].update([
|
||||||
|
{
|
||||||
|
"condition": "and",
|
||||||
|
"conditions": [],
|
||||||
|
}
|
||||||
|
] as any)
|
||||||
|
expect((mock.state[0] as ChooseAction).choose[0].conditions.length).toBe(1)
|
||||||
|
expect((mock.state[0] as ChooseAction).choose[0].conditions[0].condition).toBe("and")
|
||||||
|
})
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
import { AutomationSequenceNode } from "types/automations";
|
||||||
|
import { ChooseAction } from "types/automations/actions";
|
||||||
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
|
import { UpdateModalState } from "./types";
|
||||||
|
|
||||||
|
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
|
||||||
|
|
||||||
|
export const makeSequenceUpdater = (
|
||||||
|
sequence: AutomationSequenceNode[],
|
||||||
|
onChange: (s: AutomationSequenceNode[]) => void,
|
||||||
|
openModal: UpdateModalState,
|
||||||
|
) => ({
|
||||||
|
sequence,
|
||||||
|
onChange,
|
||||||
|
removeNode(i: number) {
|
||||||
|
return onChange([
|
||||||
|
...sequence.slice(0, i),
|
||||||
|
...sequence.slice(i + 1),
|
||||||
|
])
|
||||||
|
},
|
||||||
|
addNode() {
|
||||||
|
return openModal({
|
||||||
|
single: true,
|
||||||
|
saveBtnCreateText: true,
|
||||||
|
node: {
|
||||||
|
choose: [],
|
||||||
|
default: [],
|
||||||
|
},
|
||||||
|
update: n => onChange([
|
||||||
|
...sequence,
|
||||||
|
n,
|
||||||
|
]),
|
||||||
|
allowedTypes: ['action', 'condition']
|
||||||
|
})
|
||||||
|
},
|
||||||
|
updateNode(i: number, node: AutomationSequenceNode) {
|
||||||
|
return onChange([
|
||||||
|
...sequence.slice(0, i),
|
||||||
|
node,
|
||||||
|
...sequence.slice(i + 1),
|
||||||
|
])
|
||||||
|
},
|
||||||
|
updateChooseActionData(i: number, data: ChooseAction) {
|
||||||
|
const node = sequence[i] as ChooseAction;
|
||||||
|
return this.updateNode(i, {
|
||||||
|
...node,
|
||||||
|
...data,
|
||||||
|
})
|
||||||
|
},
|
||||||
|
makeChildUpdaterForChooseAction(i: number, j: number | null) {
|
||||||
|
const node = sequence[i];
|
||||||
|
if ('choose' in node) {
|
||||||
|
if (j !== null) {
|
||||||
|
return makeSequenceUpdater(
|
||||||
|
node.choose[j].sequence,
|
||||||
|
seq => this.updateNode(i, {
|
||||||
|
...node,
|
||||||
|
choose: [
|
||||||
|
...node.choose.slice(0, j),
|
||||||
|
{
|
||||||
|
...node.choose[j],
|
||||||
|
sequence: seq,
|
||||||
|
},
|
||||||
|
...node.choose.slice(j + 1),
|
||||||
|
]
|
||||||
|
}),
|
||||||
|
openModal,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
return makeSequenceUpdater(
|
||||||
|
node.default,
|
||||||
|
seq => this.updateNode(i, {
|
||||||
|
...node,
|
||||||
|
default: seq
|
||||||
|
}),
|
||||||
|
openModal,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new Error(`Cannot create sub-updater for ${node}`)
|
||||||
|
},
|
||||||
|
makeOnModalOpenForNode(
|
||||||
|
i: number,
|
||||||
|
node: AutomationSequenceNode,
|
||||||
|
) {
|
||||||
|
return () => openModal({
|
||||||
|
single: true,
|
||||||
|
node,
|
||||||
|
allowedTypes: ['action', 'condition'],
|
||||||
|
update: n => this.updateNode(i, n),
|
||||||
|
})
|
||||||
|
},
|
||||||
|
makeOnEditConditionsForChooseNode(
|
||||||
|
i: number,
|
||||||
|
j: number,
|
||||||
|
) {
|
||||||
|
return () => {
|
||||||
|
const node = sequence[i] as ChooseAction;
|
||||||
|
return openModal({
|
||||||
|
single: false,
|
||||||
|
node: node.choose[j].conditions,
|
||||||
|
allowedTypes: ['condition'],
|
||||||
|
update: conditions => this.updateNode(i, {
|
||||||
|
...node,
|
||||||
|
choose: [
|
||||||
|
...node.choose.slice(0, j),
|
||||||
|
{
|
||||||
|
sequence: node.choose[j].sequence,
|
||||||
|
conditions: conditions as AutomationCondition[],
|
||||||
|
},
|
||||||
|
...node.choose.slice(j + 1),
|
||||||
|
]
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
export const createOnRemoveForChooseNode = (
|
||||||
|
action: ChooseAction,
|
||||||
|
update: (data: ChooseAction) => void,
|
||||||
|
j: number
|
||||||
|
) => () => update({
|
||||||
|
...action,
|
||||||
|
choose: [
|
||||||
|
...action.choose.slice(0, j),
|
||||||
|
...action.choose.slice(j + 1),
|
||||||
|
]
|
||||||
|
})
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
.dag-svg--add-btn > a {
|
|
||||||
height: 100%;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
.dag-svg--add-btn > a:hover > svg {
|
|
||||||
fill: rgb(48, 189, 59);
|
|
||||||
}
|
|
||||||
.dag-svg--add-btn:hover {
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
|
||||||
import { SVGBoard } from './Board';
|
|
||||||
import { AddButton } from "./AddButton";
|
|
||||||
|
|
||||||
|
|
||||||
export default {
|
|
||||||
title: 'DAGSvgs/AddButton',
|
|
||||||
component: AddButton,
|
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
|
||||||
args: {
|
|
||||||
height: 10,
|
|
||||||
width: 10,
|
|
||||||
loc: [50, 50]
|
|
||||||
}
|
|
||||||
} as ComponentMeta<typeof AddButton>
|
|
||||||
|
|
||||||
export const Basic: ComponentStory<typeof AddButton> = args => {
|
|
||||||
return <SVGBoard>
|
|
||||||
<AddButton
|
|
||||||
{...args}
|
|
||||||
/>
|
|
||||||
</SVGBoard>
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
import "./AddButton.css";
|
|
||||||
import { Point } from "types/graphs";
|
|
||||||
import { AddIcon } from '../Icons/index';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export interface AddProps {
|
|
||||||
onClick?: () => void;
|
|
||||||
loc: Point,
|
|
||||||
height: number,
|
|
||||||
width: number,
|
|
||||||
}
|
|
||||||
export const AddButton = ({
|
|
||||||
loc: [x, y],
|
|
||||||
height,
|
|
||||||
width,
|
|
||||||
onClick = () => { },
|
|
||||||
}: AddProps) => {
|
|
||||||
return <>
|
|
||||||
<foreignObject className="dag-svg--add-btn" x={x} y={y} width={width} height={height}>
|
|
||||||
<AddIcon onClick={onClick} />
|
|
||||||
</foreignObject>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
import { FC } from 'react';
|
|
||||||
import useWindowSize from "utils/useWindowSize";
|
|
||||||
import { useBoardStyles } from "./styles";
|
|
||||||
import { NODE_HEIGHT, NODE_WIDTH } from './constants';
|
|
||||||
|
|
||||||
|
|
||||||
export const SVGBoard: FC<{
|
|
||||||
graphHeight?: number,
|
|
||||||
minGraphWidth?: number,
|
|
||||||
nodeHeight?: number,
|
|
||||||
nodeWidth?: number,
|
|
||||||
zoomLevel?: number,
|
|
||||||
}> = ({
|
|
||||||
children,
|
|
||||||
graphHeight = 300,
|
|
||||||
minGraphWidth = 300,
|
|
||||||
nodeHeight = NODE_HEIGHT,
|
|
||||||
nodeWidth = NODE_WIDTH,
|
|
||||||
zoomLevel = 100,
|
|
||||||
}) => {
|
|
||||||
|
|
||||||
// state
|
|
||||||
const { ratioWbh } = useWindowSize();
|
|
||||||
// alias
|
|
||||||
const paddedZoomLevel = zoomLevel / 100;
|
|
||||||
const graphWidth = Math.max(
|
|
||||||
Math.round(graphHeight * ratioWbh),
|
|
||||||
minGraphWidth
|
|
||||||
);
|
|
||||||
const { classes, theme } = useBoardStyles({
|
|
||||||
boardHeight: Math.max(nodeHeight, graphHeight) * paddedZoomLevel,
|
|
||||||
boardWidth: Math.max(4 * nodeWidth, graphWidth) * paddedZoomLevel,
|
|
||||||
});
|
|
||||||
// render
|
|
||||||
return <div className={classes.dag} >
|
|
||||||
<svg
|
|
||||||
className={classes.svg}
|
|
||||||
viewBox={[0, 0, graphWidth / paddedZoomLevel, graphHeight / paddedZoomLevel].join(" ")}
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
>
|
|
||||||
<defs>
|
|
||||||
<marker id="arrow" viewBox="0 0 10 10" refX="10" refY="5"
|
|
||||||
markerWidth="6" markerHeight="6"
|
|
||||||
orient="auto-start-reverse">
|
|
||||||
<path d="M 0 0 L 10 5 L 0 10 z" fill={theme.secondaryAccent} />
|
|
||||||
</marker>
|
|
||||||
</defs>
|
|
||||||
{children}
|
|
||||||
</svg>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
@@ -1,160 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
|
||||||
import { DAGBoard, DAGElement, DAGNodeElm } from "./DAGBoard";
|
|
||||||
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, DISTANCE_FACTOR, CIRCLE_SIZE } from './constants';
|
|
||||||
import { AutomationAction } from 'types/automations/actions';
|
|
||||||
|
|
||||||
|
|
||||||
export default {
|
|
||||||
title: 'DAGSvgs/DAGBoard',
|
|
||||||
component: DAGBoard,
|
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
|
||||||
args: {
|
|
||||||
zoomLevel: 100,
|
|
||||||
settings: {
|
|
||||||
nodeHeight: NODE_HEIGHT,
|
|
||||||
nodeWidth: NODE_WIDTH,
|
|
||||||
addHeight: ADD_HEIGHT,
|
|
||||||
addWidth: ADD_WIDTH,
|
|
||||||
circleSize: CIRCLE_SIZE,
|
|
||||||
distanceFactor: DISTANCE_FACTOR,
|
|
||||||
edgeChildColor: 'blue',
|
|
||||||
edgeNextColor: 'white',
|
|
||||||
},
|
|
||||||
}
|
|
||||||
} as ComponentMeta<typeof DAGBoard>;
|
|
||||||
|
|
||||||
|
|
||||||
const nodeFromPoint = ([x, y, add = true]: any): DAGNodeElm => ({
|
|
||||||
type: 'node',
|
|
||||||
loc: [x, y],
|
|
||||||
onRemove() { },
|
|
||||||
onAdd: add ? () => { } : undefined,
|
|
||||||
node: ({
|
|
||||||
alias: `${x},${y}`,
|
|
||||||
"$smType": "action",
|
|
||||||
"action": "wait",
|
|
||||||
"action_data": {
|
|
||||||
"wait_template": "",
|
|
||||||
}
|
|
||||||
} as AutomationAction)
|
|
||||||
});
|
|
||||||
|
|
||||||
function* makeDummyData(pts: Array<any>, extras: DAGElement[]): Generator<DAGElement> {
|
|
||||||
for (const p of pts) {
|
|
||||||
yield nodeFromPoint(p);
|
|
||||||
};
|
|
||||||
for (const e of extras) {
|
|
||||||
yield e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const Simple: ComponentStory<typeof DAGBoard> = args => {
|
|
||||||
return <div className="page">
|
|
||||||
<DAGBoard {...args} />
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
Simple.args = {
|
|
||||||
...Simple.args,
|
|
||||||
elements: Array.from(makeDummyData(
|
|
||||||
[
|
|
||||||
[0, 0, false],
|
|
||||||
[1, 0, false],
|
|
||||||
[2, 1, false],
|
|
||||||
],
|
|
||||||
[
|
|
||||||
{
|
|
||||||
type: 'edge',
|
|
||||||
p1: [0, 0],
|
|
||||||
p2: [1, 0],
|
|
||||||
direction: '1->2'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'edge',
|
|
||||||
p1: [2, 1],
|
|
||||||
p2: [2, 3],
|
|
||||||
direction: '1->2'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'circle',
|
|
||||||
icon: 'blank',
|
|
||||||
loc: [2, 3]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'edge',
|
|
||||||
p1: [2, 1],
|
|
||||||
p2: [2, 2],
|
|
||||||
direction: '1->2'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'circle',
|
|
||||||
loc: [2, 2],
|
|
||||||
icon: 'color',
|
|
||||||
color: 'red',
|
|
||||||
}
|
|
||||||
]))
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const Complex: ComponentStory<typeof DAGBoard> = args => {
|
|
||||||
return <div className="page">
|
|
||||||
<DAGBoard {...args} />
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
Complex.args = {
|
|
||||||
...Complex.args,
|
|
||||||
elements: Array.from(makeDummyData(
|
|
||||||
[
|
|
||||||
[0, 0, false],
|
|
||||||
[1, 0, false],
|
|
||||||
[2, 1, false],
|
|
||||||
[4, 1],
|
|
||||||
[3, 2],
|
|
||||||
[2, 3],
|
|
||||||
[5, 0, false],
|
|
||||||
[6, 0],
|
|
||||||
[0, 6],
|
|
||||||
],
|
|
||||||
[
|
|
||||||
{
|
|
||||||
type: 'edge',
|
|
||||||
p1: [0, 0],
|
|
||||||
p2: [1, 0],
|
|
||||||
direction: '1->2'
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'edge',
|
|
||||||
p1: [2, 1],
|
|
||||||
p2: [4, 1],
|
|
||||||
direction: '1->2',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'edge',
|
|
||||||
p1: [1, 0],
|
|
||||||
p2: [2, 1],
|
|
||||||
direction: '1->2',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'edge',
|
|
||||||
p1: [2, 1],
|
|
||||||
p2: [3, 2],
|
|
||||||
direction: '1->2',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'edge',
|
|
||||||
p1: [1, 0],
|
|
||||||
p2: [2, 3],
|
|
||||||
direction: '1->2',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'edge',
|
|
||||||
p1: [1, 0],
|
|
||||||
p2: [5, 0],
|
|
||||||
direction: '1->2'
|
|
||||||
},
|
|
||||||
]
|
|
||||||
))
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,205 +0,0 @@
|
|||||||
import { FC, useRef } from "react";
|
|
||||||
import { SVGBoard } from "./Board";
|
|
||||||
import { AutomationNode } from '../../types/automations/index';
|
|
||||||
import { Point, EdgeDirection, BBox } from 'types/graphs';
|
|
||||||
import { DAGNode } from "./DAGNode";
|
|
||||||
import { DAGEdge } from "./DAGEdge";
|
|
||||||
import { AddButton } from "./AddButton";
|
|
||||||
import { IteratorWrap } from "utils/iter";
|
|
||||||
import { DAGCircle, AddProps } from "./DAGCircle";
|
|
||||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
|
||||||
import { minPoints } from "utils/graph";
|
|
||||||
import { maxPoints } from '../../utils/graph';
|
|
||||||
|
|
||||||
|
|
||||||
export type DAGCircleElm = {
|
|
||||||
type: 'circle';
|
|
||||||
loc: Point;
|
|
||||||
} & (
|
|
||||||
{
|
|
||||||
icon: 'add',
|
|
||||||
onAdd: () => void;
|
|
||||||
} |
|
|
||||||
{
|
|
||||||
icon: 'edit',
|
|
||||||
onEdit: () => void;
|
|
||||||
onRemove?: () => void;
|
|
||||||
} |
|
|
||||||
{
|
|
||||||
icon: 'blank',
|
|
||||||
onRemove?: () => void;
|
|
||||||
} |
|
|
||||||
{
|
|
||||||
icon: 'color',
|
|
||||||
color: string,
|
|
||||||
}
|
|
||||||
)
|
|
||||||
export interface DAGNodeElm {
|
|
||||||
type: 'node';
|
|
||||||
loc: Point;
|
|
||||||
node: AutomationNode;
|
|
||||||
onRemove: () => void;
|
|
||||||
onAdd?: () => void;
|
|
||||||
onOpen?: () => void;
|
|
||||||
}
|
|
||||||
export interface DAGEdgeElm {
|
|
||||||
type: 'edge';
|
|
||||||
p1: Point;
|
|
||||||
p2: Point;
|
|
||||||
direction: EdgeDirection;
|
|
||||||
fromCircle?: boolean;
|
|
||||||
onAdd?: () => void;
|
|
||||||
}
|
|
||||||
export type DAGElement = DAGEdgeElm | DAGNodeElm | DAGCircleElm;
|
|
||||||
export interface DAGBoardSettings extends DAGBoardElmDims {
|
|
||||||
edgeChildColor: string;
|
|
||||||
edgeNextColor: string;
|
|
||||||
}
|
|
||||||
export interface DAGBoardElmDims {
|
|
||||||
nodeHeight: number;
|
|
||||||
nodeWidth: number;
|
|
||||||
addHeight: number;
|
|
||||||
addWidth: number;
|
|
||||||
circleSize: number;
|
|
||||||
distanceFactor: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface Props {
|
|
||||||
elements: Generator<DAGElement> | Array<DAGElement>;
|
|
||||||
settings: DAGBoardSettings;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export function* mapDataToElements({
|
|
||||||
elements,
|
|
||||||
settings: st,
|
|
||||||
}: Props) {
|
|
||||||
let bbox: BBox = [[0, 0], [0, 0]];
|
|
||||||
const updateBBox = (p: Point) => {
|
|
||||||
bbox = [
|
|
||||||
[Math.min(bbox[0][0], p[0]), Math.min(bbox[0][1], p[1])],
|
|
||||||
[Math.max(bbox[1][0], p[0] + st.nodeWidth), Math.max(bbox[1][1], p[1] + st.nodeHeight)],
|
|
||||||
]
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
const offsetPoint = (
|
|
||||||
[x, y]: Point,
|
|
||||||
[ox, oy]: Point = [0, 0]
|
|
||||||
): Point => updateBBox([x + ox, y + oy]);
|
|
||||||
const mapWithNode = (
|
|
||||||
[x, y]: Point,
|
|
||||||
[ox, oy]: Point = [0, 0],
|
|
||||||
): Point => updateBBox([
|
|
||||||
x * st.nodeWidth * st.distanceFactor + ox,
|
|
||||||
y * st.nodeHeight * st.distanceFactor + oy,
|
|
||||||
])
|
|
||||||
for (let elm of elements) {
|
|
||||||
switch (elm.type) {
|
|
||||||
case 'node':
|
|
||||||
const nodeLoc = mapWithNode(elm.loc);
|
|
||||||
const addLoc = mapWithNode(elm.loc, [
|
|
||||||
st.nodeWidth * st.distanceFactor,
|
|
||||||
st.addHeight + st.addHeight / 2
|
|
||||||
])
|
|
||||||
yield <DAGNode
|
|
||||||
key={`(${elm.loc})-*`}
|
|
||||||
height={st.nodeHeight}
|
|
||||||
width={st.nodeWidth}
|
|
||||||
loc={nodeLoc}
|
|
||||||
text={getDescriptionFromAutomationNode(elm.node)}
|
|
||||||
color={elm.node.$smType === 'action' ? 'green' : 'blue'}
|
|
||||||
onXClick={elm.onRemove}
|
|
||||||
onOpenClick={elm.onOpen}
|
|
||||||
/>
|
|
||||||
if (elm.onAdd) {
|
|
||||||
yield <DAGEdge
|
|
||||||
key={`(${elm.loc})->+`}
|
|
||||||
p1={offsetPoint(nodeLoc, [st.nodeWidth, st.nodeHeight / 2])}
|
|
||||||
p2={offsetPoint(addLoc, [0, st.addHeight / 2])}
|
|
||||||
direction="1->2"
|
|
||||||
color={st.edgeNextColor}
|
|
||||||
/>
|
|
||||||
yield <AddButton
|
|
||||||
key={`(${elm.loc})-+`}
|
|
||||||
loc={addLoc}
|
|
||||||
height={st.addHeight}
|
|
||||||
width={st.addWidth}
|
|
||||||
onClick={elm.onAdd}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
break
|
|
||||||
case 'edge':
|
|
||||||
const p2 = mapWithNode(elm.p2, [0, st.nodeHeight / 2]);
|
|
||||||
let p1: Point;
|
|
||||||
if (elm.fromCircle) {
|
|
||||||
p1 = mapWithNode(elm.p1, [st.circleSize * 0.95, 1.3 * st.circleSize / 2])
|
|
||||||
} else {
|
|
||||||
p1 = mapWithNode(elm.p1, [st.nodeWidth, st.nodeHeight / 2])
|
|
||||||
}
|
|
||||||
yield <DAGEdge
|
|
||||||
key={`(${elm.p1})->(${elm.p2})`}
|
|
||||||
p1={p1}
|
|
||||||
p2={p2}
|
|
||||||
direction={elm.direction}
|
|
||||||
color={st.edgeNextColor}
|
|
||||||
/>
|
|
||||||
if (elm.onAdd) {
|
|
||||||
yield <AddButton
|
|
||||||
key={`(${elm.p2})-+`}
|
|
||||||
loc={offsetPoint(p2, [0, -st.addHeight / 2])}
|
|
||||||
height={st.addHeight}
|
|
||||||
width={st.addWidth}
|
|
||||||
onClick={elm.onAdd}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
break
|
|
||||||
case 'circle':
|
|
||||||
const loc = mapWithNode(elm.loc, [0, st.nodeHeight / 2 - st.circleSize / 2]);
|
|
||||||
const clickProps: Partial<AddProps> = {}
|
|
||||||
if (elm.icon === 'add') {
|
|
||||||
clickProps.onAdd = elm.onAdd;
|
|
||||||
} else if (elm.icon === 'edit') {
|
|
||||||
clickProps.onEdit = elm.onEdit
|
|
||||||
clickProps.onRemove = elm.onRemove
|
|
||||||
} else if (elm.icon === 'blank') {
|
|
||||||
clickProps.onRemove = elm.onRemove
|
|
||||||
} else {
|
|
||||||
clickProps.backgroundColor = elm.color
|
|
||||||
}
|
|
||||||
yield <DAGCircle
|
|
||||||
key={`(${elm.loc})-o`}
|
|
||||||
loc={loc}
|
|
||||||
size={st.circleSize}
|
|
||||||
{...clickProps}
|
|
||||||
/>
|
|
||||||
break
|
|
||||||
default:
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return bbox;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const DAGBoard: FC<Props & { zoomLevel: number }> = props => {
|
|
||||||
const graphDims = useRef<BBox>([[0, 0], [0, 0]]);
|
|
||||||
const it = new IteratorWrap(mapDataToElements(props));
|
|
||||||
const el = it.toArray();
|
|
||||||
const [p0, p1] = it.returnValue as BBox;
|
|
||||||
const [[x0, y0], [x1, y1]] = graphDims.current = [
|
|
||||||
minPoints(p0, graphDims.current[0]),
|
|
||||||
maxPoints(p1, graphDims.current[1])
|
|
||||||
];
|
|
||||||
return <SVGBoard
|
|
||||||
graphHeight={y1 - y0}
|
|
||||||
minGraphWidth={Math.max(x1 - x0, props.settings.nodeWidth * 8)}
|
|
||||||
nodeHeight={props.settings.nodeHeight}
|
|
||||||
nodeWidth={props.settings.nodeWidth}
|
|
||||||
zoomLevel={props.zoomLevel}
|
|
||||||
>
|
|
||||||
{el}
|
|
||||||
{props.children}
|
|
||||||
</SVGBoard>
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
|
||||||
import { SVGBoard } from './Board';
|
|
||||||
import { DAGCircle } from "./DAGCircle";
|
|
||||||
|
|
||||||
|
|
||||||
export default {
|
|
||||||
title: 'DAGSvgs/DAGCircle',
|
|
||||||
component: DAGCircle,
|
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
|
||||||
args: {
|
|
||||||
size: 20,
|
|
||||||
loc: [50, 50]
|
|
||||||
}
|
|
||||||
} as ComponentMeta<typeof DAGCircle>
|
|
||||||
|
|
||||||
export const Basic: ComponentStory<typeof DAGCircle> = args => {
|
|
||||||
return <SVGBoard>
|
|
||||||
<DAGCircle
|
|
||||||
size={args.size}
|
|
||||||
loc={args.loc}
|
|
||||||
/>
|
|
||||||
<DAGCircle
|
|
||||||
size={args.size}
|
|
||||||
loc={[args.loc[0] + args.size, args.loc[1]]}
|
|
||||||
onAdd={args.onAdd}
|
|
||||||
/>
|
|
||||||
<DAGCircle
|
|
||||||
size={args.size}
|
|
||||||
loc={[args.loc[0] + 2 * args.size, args.loc[1]]}
|
|
||||||
onEdit={args.onEdit}
|
|
||||||
/>
|
|
||||||
<DAGCircle
|
|
||||||
size={args.size}
|
|
||||||
loc={[args.loc[0] + 3 * args.size, args.loc[1]]}
|
|
||||||
onEdit={args.onEdit}
|
|
||||||
onRemove={args.onRemove}
|
|
||||||
/>
|
|
||||||
<DAGCircle
|
|
||||||
size={args.size}
|
|
||||||
loc={[args.loc[0] + 4 * args.size, args.loc[1]]}
|
|
||||||
onRemove={args.onRemove}
|
|
||||||
/>
|
|
||||||
</SVGBoard>
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
// import "./DAGCircle.css";
|
|
||||||
import { Point } from "types/graphs";
|
|
||||||
import { AddIcon, PencilIcon, TrashIcon } from '../Icons/index';
|
|
||||||
import { useCircleStyles } from './styles';
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export interface AddProps {
|
|
||||||
onEdit?: () => void;
|
|
||||||
onAdd?: () => void;
|
|
||||||
onRemove?: () => void;
|
|
||||||
loc: Point,
|
|
||||||
size: number,
|
|
||||||
backgroundColor?: string;
|
|
||||||
}
|
|
||||||
export const DAGCircle = ({
|
|
||||||
loc: [x, y],
|
|
||||||
size,
|
|
||||||
onEdit,
|
|
||||||
onAdd,
|
|
||||||
onRemove,
|
|
||||||
backgroundColor,
|
|
||||||
}: AddProps) => {
|
|
||||||
const { classes } = useCircleStyles({
|
|
||||||
size: size * 0.9,
|
|
||||||
hasOnFunction: !!onEdit || !!onAdd,
|
|
||||||
hasRemoveFunction: !!onRemove,
|
|
||||||
backgroundColor,
|
|
||||||
});
|
|
||||||
return <>
|
|
||||||
<foreignObject x={x} y={y} width={size} height={size}>
|
|
||||||
<div className={classes.root}>
|
|
||||||
{
|
|
||||||
onEdit ?
|
|
||||||
<PencilIcon
|
|
||||||
size={70} units="%"
|
|
||||||
className={classes.icon}
|
|
||||||
onClick={onEdit}
|
|
||||||
/> : onAdd ?
|
|
||||||
<AddIcon
|
|
||||||
size={70} units="%"
|
|
||||||
className={classes.icon}
|
|
||||||
onClick={onAdd}
|
|
||||||
/>
|
|
||||||
: backgroundColor ? "" : "else"
|
|
||||||
}
|
|
||||||
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
|
|
||||||
</div>
|
|
||||||
</foreignObject>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
import { EdgeDirection, Point } from "types/graphs"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export interface EdgeProp {
|
|
||||||
p1: Point,
|
|
||||||
p2: Point,
|
|
||||||
direction: EdgeDirection,
|
|
||||||
color: string,
|
|
||||||
debug?: boolean,
|
|
||||||
}
|
|
||||||
export const DAGEdge = ({
|
|
||||||
p1: [x1, y1],
|
|
||||||
p2: [x2, y2],
|
|
||||||
direction,
|
|
||||||
color,
|
|
||||||
debug = false,
|
|
||||||
}: EdgeProp) => {
|
|
||||||
const [mx, my] = [(x1 + x2) / 2, (y1 + y2) / 2]
|
|
||||||
let [cx1, cy1] = [(x1 + mx) / 2, (y1 + my) / 2]
|
|
||||||
let [cx2, cy2] = [(x2 + mx) / 2, (y2 + my) / 2]
|
|
||||||
const l1 = Math.sqrt((cy1 - y1) ** 2 + (cx1 - x1) ** 2)
|
|
||||||
const l2 = Math.sqrt((cy2 - y2) ** 2 + (cx2 - x2) ** 2)
|
|
||||||
const theta = Math.atan2(y2 - y1, x2 - x1)
|
|
||||||
if ((theta < Math.PI / 2) && (theta > -Math.PI / 2)) {
|
|
||||||
cy1 = y1 - 0.5 * l1 * Math.sin(theta)
|
|
||||||
cx1 = x1 + 2 * l1 * Math.cos(theta)
|
|
||||||
cy2 = y2
|
|
||||||
cx2 = x2 - 3 * l2 * Math.cos(theta)
|
|
||||||
} else if ((theta > Math.PI / 2) && (theta < Math.PI)) {
|
|
||||||
cy2 += l2 * Math.sin(theta)
|
|
||||||
cx2 += 10 * l2 * Math.cos(theta)
|
|
||||||
cx1 -= 10 * l1 * Math.cos(theta)
|
|
||||||
}
|
|
||||||
|
|
||||||
return <>
|
|
||||||
{debug && <>
|
|
||||||
<circle cx={cx1} cy={cy1} r="5" fill="yellow" />
|
|
||||||
<line x1={cx1} y1={cy1} x2={x1} y2={y1} stroke="yellow" />
|
|
||||||
<line x1={cx1} y1={cy1} x2={x2} y2={y2} stroke="yellow" />
|
|
||||||
<circle cx={cx2} cy={cy2} r="5" fill="green" />
|
|
||||||
<line x1={cx2} y1={cy2} x2={x1} y2={y1} stroke="green" />
|
|
||||||
<line x1={cx2} y1={cy2} x2={x2} y2={y2} stroke="green" />
|
|
||||||
<text x={mx} y={my} stroke="white">{theta}</text>
|
|
||||||
</>}
|
|
||||||
<path stroke={color}
|
|
||||||
d={`M${x1} ${y1} C${cx1} ${cy1}, ${cx2} ${cy2}, ${x2} ${y2}`}
|
|
||||||
fill="none"
|
|
||||||
markerStart={
|
|
||||||
(direction === '1<-2' || direction === '1<->2') ?
|
|
||||||
"url(#arrow)" : ''
|
|
||||||
}
|
|
||||||
markerEnd={
|
|
||||||
(direction === '1->2' || direction === '1<->2') ?
|
|
||||||
"url(#arrow)" : ''
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
|
||||||
import { DAGNode } from "./DAGNode";
|
|
||||||
import { SVGBoard } from './Board';
|
|
||||||
import { NODE_HEIGHT, NODE_WIDTH } from './constants';
|
|
||||||
import { DAGEdge } from "./DAGEdge";
|
|
||||||
|
|
||||||
const GRAPH_HEIGHT = 300;
|
|
||||||
|
|
||||||
export default {
|
|
||||||
title: 'DAGSvgs/DAGNode',
|
|
||||||
component: DAGNode,
|
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
|
||||||
args: {
|
|
||||||
height: NODE_HEIGHT,
|
|
||||||
width: NODE_WIDTH,
|
|
||||||
text: "Test",
|
|
||||||
loc: [NODE_WIDTH * 2,GRAPH_HEIGHT / 2]
|
|
||||||
}
|
|
||||||
} as ComponentMeta<typeof DAGNode>;
|
|
||||||
|
|
||||||
export const Basic: ComponentStory<typeof DAGNode> = args => <SVGBoard
|
|
||||||
graphHeight={GRAPH_HEIGHT}
|
|
||||||
>
|
|
||||||
<DAGNode {...args}/>
|
|
||||||
</SVGBoard>
|
|
||||||
|
|
||||||
export const WithFromEdge: ComponentStory<typeof DAGNode> = args => <SVGBoard
|
|
||||||
graphHeight={GRAPH_HEIGHT}
|
|
||||||
>
|
|
||||||
<DAGNode {...args} />
|
|
||||||
</SVGBoard>
|
|
||||||
WithFromEdge.args = {
|
|
||||||
...(WithFromEdge.args ?? {}),
|
|
||||||
edge: {
|
|
||||||
color: 'white',
|
|
||||||
loc: [NODE_WIDTH * 4, NODE_HEIGHT * 2],
|
|
||||||
direction: '1->2',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const WithToEdge: ComponentStory<typeof DAGNode> = args => <SVGBoard
|
|
||||||
graphHeight={GRAPH_HEIGHT}
|
|
||||||
>
|
|
||||||
<DAGNode {...args} edge={{
|
|
||||||
color: 'white',
|
|
||||||
loc: [args.loc[0] - args.width, args.loc[1] + args.height / 2],
|
|
||||||
direction: '1<-2',
|
|
||||||
}}/>
|
|
||||||
</SVGBoard>
|
|
||||||
export const WithManyEdges: ComponentStory<typeof DAGNode> = args => <SVGBoard
|
|
||||||
graphHeight={GRAPH_HEIGHT}
|
|
||||||
>
|
|
||||||
<DAGNode {...args} />
|
|
||||||
{[
|
|
||||||
// TODO: make it nicer to view when from behind
|
|
||||||
// [0, 0],
|
|
||||||
// [args.loc[0] - args.width, args.loc[1] + args.height / 2], // behind
|
|
||||||
// [args.loc[0] - 0.5*args.width, args.loc[1] + args.height ], // behind
|
|
||||||
// [args.loc[0], args.loc[1] + args.height ], // behind
|
|
||||||
// [args.loc[0], args.loc[1] + 2 * args.height ], // behind
|
|
||||||
[args.loc[0] + args.width / 2, args.loc[1] + 2 * args.height ], // below
|
|
||||||
[args.loc[0] + args.width, args.loc[1] + args.height * 2], // down
|
|
||||||
[args.loc[0] + args.width, args.loc[1] - args.height * 2], // up
|
|
||||||
[args.loc[0] + 2*args.width, args.loc[1] + args.height * 2], // down right
|
|
||||||
[args.loc[0] + 2*args.width, args.loc[1] + args.height / 2], // forward
|
|
||||||
[args.loc[0] + 2*args.width, args.loc[1] - args.height * 2], // up right
|
|
||||||
].map((p: any) => <DAGEdge
|
|
||||||
p1={[args.loc[0] + args.width, args.loc[1] + args.height / 2]}
|
|
||||||
p2={p}
|
|
||||||
direction="1->2"
|
|
||||||
color="white"
|
|
||||||
// debug
|
|
||||||
/>)}
|
|
||||||
</SVGBoard>
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
import Color from "chroma-js";
|
|
||||||
import { PencilIcon } from "components/Icons"
|
|
||||||
import { useNodeStyles } from "./styles"
|
|
||||||
import { EdgeDirection, Node, Point } from "types/graphs";
|
|
||||||
import { DAGEdge } from "./DAGEdge";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export interface NodeProp extends Node {
|
|
||||||
height: number;
|
|
||||||
width: number;
|
|
||||||
onXClick?: () => void;
|
|
||||||
onOpenClick?: () => void;
|
|
||||||
debug?: boolean;
|
|
||||||
edge?: {
|
|
||||||
color: string;
|
|
||||||
loc: Point;
|
|
||||||
direction: EdgeDirection;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
export const DAGNode = ({
|
|
||||||
loc: [x, y],
|
|
||||||
text,
|
|
||||||
height,
|
|
||||||
width,
|
|
||||||
onXClick = () => { },
|
|
||||||
onOpenClick = () => { },
|
|
||||||
color,
|
|
||||||
edge,
|
|
||||||
debug = false,
|
|
||||||
}: NodeProp) => {
|
|
||||||
const { classes, theme } = useNodeStyles({
|
|
||||||
color,
|
|
||||||
nodeHeight: height,
|
|
||||||
nodeWidth: width,
|
|
||||||
});
|
|
||||||
return <>
|
|
||||||
<foreignObject x={x} y={y} width={width} height={height}>
|
|
||||||
<div className={classes.root}>
|
|
||||||
<div className={classes.inner}>
|
|
||||||
<div className={classes.leftEdge} onClick={onXClick}>
|
|
||||||
<button className={classes.buttonDelete}>X</button>
|
|
||||||
</div>
|
|
||||||
<div className={classes.textWrap}>
|
|
||||||
<span className={classes.text} title={text}>
|
|
||||||
{text}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className={classes.rightEdge} onClick={onOpenClick}>
|
|
||||||
<button className={classes.buttonEdit}>
|
|
||||||
<PencilIcon size={1.1} color={Color(theme.primary).set('rgb.g', 200).hex()} />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</foreignObject>
|
|
||||||
{
|
|
||||||
edge && (edge.direction === '1->2' ?
|
|
||||||
<DAGEdge
|
|
||||||
p1={[x + width, y + height / 2]}
|
|
||||||
p2={edge.loc}
|
|
||||||
direction={edge.direction}
|
|
||||||
color={edge.color}
|
|
||||||
debug={debug}
|
|
||||||
/> :
|
|
||||||
<DAGEdge
|
|
||||||
p1={[x, y + height / 2]}
|
|
||||||
p2={edge.loc}
|
|
||||||
direction={edge.direction}
|
|
||||||
color={edge.color}
|
|
||||||
debug={debug}
|
|
||||||
/>)
|
|
||||||
}
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
@@ -1,19 +1,22 @@
|
|||||||
import { DAGBoardElmDims } from 'components/DAGSvgs/DAGBoard';
|
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export const NODE_WIDTH = 150 as const;
|
export const NODE_WIDTH = 150 as const;
|
||||||
export const NODE_HEIGHT = 60 as const;
|
export const NODE_HEIGHT = 60 as const;
|
||||||
export const ADD_HEIGHT = 10 as const;
|
export const CONDITION_HEIGHT = 30 as const;
|
||||||
export const ADD_WIDTH = 10 as const;
|
export const CONDITION_WIDTH = 120 as const;
|
||||||
export const CIRCLE_SIZE = 30 as const;
|
export const CIRCLE_SIZE = 40 as const;
|
||||||
export const DISTANCE_FACTOR = 1.5 as const;
|
export const DISTANCE_FACTOR = 1.5 as const;
|
||||||
|
export const PADDING = 50 as const;
|
||||||
|
|
||||||
export const DEFAULT_DIMS: DAGBoardElmDims = {
|
export const DEFAULT_DIMS = {
|
||||||
nodeHeight: NODE_HEIGHT,
|
nodeHeight: NODE_HEIGHT,
|
||||||
nodeWidth: NODE_WIDTH,
|
nodeWidth: NODE_WIDTH,
|
||||||
addHeight: ADD_HEIGHT,
|
conditionHeight: CONDITION_HEIGHT,
|
||||||
addWidth: ADD_WIDTH,
|
conditionWidth: CONDITION_WIDTH,
|
||||||
circleSize: CIRCLE_SIZE,
|
|
||||||
distanceFactor: DISTANCE_FACTOR,
|
distanceFactor: DISTANCE_FACTOR,
|
||||||
};
|
circleSize: CIRCLE_SIZE,
|
||||||
|
padding: {
|
||||||
|
x: PADDING,
|
||||||
|
y: PADDING,
|
||||||
|
},
|
||||||
|
} as DAGAutomationFlowDims
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
import { ComponentStory } from "@storybook/react";
|
import { ComponentStory } from "@storybook/react";
|
||||||
|
|
||||||
import { IconBase } from "./base";
|
import { IconBase } from "./base";
|
||||||
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon } from ".";
|
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from ".";
|
||||||
import { ButtonIcon } from "./ButtonIcons";
|
import { ButtonIcon } from "./ButtonIcons";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -19,6 +19,7 @@ export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
|||||||
<TrashIcon {...args} />
|
<TrashIcon {...args} />
|
||||||
<InfoIcon {...args} />
|
<InfoIcon {...args} />
|
||||||
<ZoomIcon {...args} />
|
<ZoomIcon {...args} />
|
||||||
|
<GearIcon {...args} />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
IconList.args = {
|
IconList.args = {
|
||||||
|
|||||||
@@ -64,4 +64,17 @@ export const ZoomIcon: FC<IconBaseProps> = props => <IconBase {...props}
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<path d="M410.9,10c54.3,0,106.2,10.6,155.7,31.8c49.5,21.2,92.1,49.7,127.9,85.4c35.7,35.7,64.2,78.4,85.4,127.9c21.2,49.5,31.8,101.4,31.8,155.7c0,46.6-7.6,91.3-22.8,134c-15.2,42.7-36.8,81.4-64.9,116.2l253,252.7c8.6,8.6,12.9,19.1,12.9,31.7c0,12.8-4.2,23.4-12.7,31.8c-8.5,8.5-19.1,12.7-31.8,12.7c-12.5,0-23.1-4.3-31.7-12.9l-252.7-253c-34.8,28.1-73.6,49.7-116.2,64.9c-42.7,15.2-87.3,22.8-134,22.8c-54.3,0-106.2-10.6-155.7-31.8c-49.5-21.2-92.1-49.7-127.9-85.4C91.5,658.8,63,616.2,41.8,566.7C20.6,517.1,10,465.2,10,410.9c0-54.3,10.6-106.2,31.8-155.7s49.7-92.2,85.4-127.9s78.3-64.2,127.9-85.4S356.6,10,410.9,10L410.9,10z M410.9,99.1c-42.2,0-82.6,8.2-121.1,24.7c-38.5,16.5-71.7,38.6-99.5,66.5c-27.8,27.8-50,61-66.5,99.5c-16.5,38.5-24.7,78.9-24.7,121.1c0,42.2,8.2,82.6,24.7,121.1c16.5,38.5,38.6,71.7,66.5,99.5s61,50,99.5,66.5c38.5,16.5,78.9,24.7,121.1,24.7c42.2,0,82.6-8.2,121.1-24.7c38.5-16.5,71.7-38.6,99.5-66.5s50-61,66.5-99.5c16.5-38.5,24.7-78.9,24.7-121.1c0-42.2-8.2-82.6-24.7-121.1c-16.5-38.5-38.6-71.7-66.5-99.5c-27.8-27.8-61-50-99.5-66.5C493.5,107.3,453.2,99.1,410.9,99.1z M410.9,232.7c12.3,0,22.8,4.4,31.5,13.1c8.7,8.7,13.1,19.2,13.1,31.5v89.1h89.1c12.3,0,22.8,4.4,31.5,13.1c8.7,8.7,13.1,19.2,13.1,31.5c0,12.3-4.4,22.8-13.1,31.5c-8.7,8.7-19.2,13.1-31.5,13.1h-89.1v89.1c0,12.3-4.4,22.8-13.1,31.5c-8.7,8.7-19.2,13.1-31.5,13.1c-12.3,0-22.8-4.4-31.5-13.1c-8.7-8.7-13.1-19.2-13.1-31.5v-89.1h-89.1c-12.3,0-22.8-4.4-31.5-13.1c-8.7-8.7-13.1-19.2-13.1-31.5c0-12.3,4.4-22.8,13.1-31.5c8.7-8.7,19.2-13.1,31.5-13.1h89.1v-89.1c0-12.3,4.4-22.8,13.1-31.5C388.1,237.1,398.6,232.7,410.9,232.7z" />
|
<path d="M410.9,10c54.3,0,106.2,10.6,155.7,31.8c49.5,21.2,92.1,49.7,127.9,85.4c35.7,35.7,64.2,78.4,85.4,127.9c21.2,49.5,31.8,101.4,31.8,155.7c0,46.6-7.6,91.3-22.8,134c-15.2,42.7-36.8,81.4-64.9,116.2l253,252.7c8.6,8.6,12.9,19.1,12.9,31.7c0,12.8-4.2,23.4-12.7,31.8c-8.5,8.5-19.1,12.7-31.8,12.7c-12.5,0-23.1-4.3-31.7-12.9l-252.7-253c-34.8,28.1-73.6,49.7-116.2,64.9c-42.7,15.2-87.3,22.8-134,22.8c-54.3,0-106.2-10.6-155.7-31.8c-49.5-21.2-92.1-49.7-127.9-85.4C91.5,658.8,63,616.2,41.8,566.7C20.6,517.1,10,465.2,10,410.9c0-54.3,10.6-106.2,31.8-155.7s49.7-92.2,85.4-127.9s78.3-64.2,127.9-85.4S356.6,10,410.9,10L410.9,10z M410.9,99.1c-42.2,0-82.6,8.2-121.1,24.7c-38.5,16.5-71.7,38.6-99.5,66.5c-27.8,27.8-50,61-66.5,99.5c-16.5,38.5-24.7,78.9-24.7,121.1c0,42.2,8.2,82.6,24.7,121.1c16.5,38.5,38.6,71.7,66.5,99.5s61,50,99.5,66.5c38.5,16.5,78.9,24.7,121.1,24.7c42.2,0,82.6-8.2,121.1-24.7c38.5-16.5,71.7-38.6,99.5-66.5s50-61,66.5-99.5c16.5-38.5,24.7-78.9,24.7-121.1c0-42.2-8.2-82.6-24.7-121.1c-16.5-38.5-38.6-71.7-66.5-99.5c-27.8-27.8-61-50-99.5-66.5C493.5,107.3,453.2,99.1,410.9,99.1z M410.9,232.7c12.3,0,22.8,4.4,31.5,13.1c8.7,8.7,13.1,19.2,13.1,31.5v89.1h89.1c12.3,0,22.8,4.4,31.5,13.1c8.7,8.7,13.1,19.2,13.1,31.5c0,12.3-4.4,22.8-13.1,31.5c-8.7,8.7-19.2,13.1-31.5,13.1h-89.1v89.1c0,12.3-4.4,22.8-13.1,31.5c-8.7,8.7-19.2,13.1-31.5,13.1c-12.3,0-22.8-4.4-31.5-13.1c-8.7-8.7-13.1-19.2-13.1-31.5v-89.1h-89.1c-12.3,0-22.8-4.4-31.5-13.1c-8.7-8.7-13.1-19.2-13.1-31.5c0-12.3,4.4-22.8,13.1-31.5c8.7-8.7,19.2-13.1,31.5-13.1h89.1v-89.1c0-12.3,4.4-22.8,13.1-31.5C388.1,237.1,398.6,232.7,410.9,232.7z" />
|
||||||
|
</IconBase>
|
||||||
|
|
||||||
|
export const GearIcon: FC<IconBaseProps> = props => <IconBase {...props}
|
||||||
|
svgProps={{
|
||||||
|
viewBox: "0 0 1000 1000",
|
||||||
|
x: 0,
|
||||||
|
y: 0,
|
||||||
|
enableBackground: 'new 0 0 1000 100',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<g transform="translate(0.000000,511.000000) scale(0.100000,-0.100000)">
|
||||||
|
<path d="M4559,4977.4c-53.3-23.4-108.6-70.3-134.2-110.8c-23.4-38.3-115-291.9-206.7-560.3l-161.9-492.1l-247.1-78.8c-136.3-44.7-364.3-138.5-504.9-208.8l-259.9-127.8l-492.1,247.1c-296.1,147-519.8,245-558.2,245c-34.1,0-98-14.9-140.6-32c-95.9-40.5-528.3-462.3-583.7-568.8c-76.7-151.3-61.8-208.8,202.4-737.1l242.9-485.7l-129.9-266.3c-72.4-144.9-166.2-372.8-206.7-502.8l-74.6-240.7L788.1,887c-283.3-95.9-539-191.7-566.7-213C114.9,590.9,100,518.4,100,109.4c0-349.4,4.3-383.5,46.9-462.3c25.6-44.7,76.7-100.1,112.9-121.4c34.1-21.3,285.5-112.9,553.9-202.4l490-164l81-253.5c44.7-138.5,136.4-360,204.5-494.3l121.4-240.7L1469.9-2315c-204.5-415.4-240.7-500.7-240.7-585.9c2.1-55.4,14.9-123.6,29.8-149.1c14.9-27.7,147-170.4,291.9-315.3c281.2-281.2,353.7-326,494.3-294c38.4,8.5,279.1,119.3,536.9,247.1l468.7,234.3l287.6-138.5c157.7-76.7,383.5-170.4,500.6-206.7l215.2-66l155.5-473c245-741.4,228-724.3,739.3-735c598.6-12.8,594.4-17,828.7,692.4l168.3,515.6l215.2,66c117.2,36.2,343,130,502.8,206.7l289.7,138.5l466.6-234.3c255.7-127.8,496.4-240.7,534.8-247.1c142.7-32,232.2,17.1,498.5,279.1c409,400.5,409,404.8,76.7,1067.3l-238.6,473l129.9,264.2c72.5,144.9,161.9,362.2,200.3,483.6c38.3,121.4,81,232.2,93.8,245c12.8,14.9,245,98,517.7,187.5c272.7,91.6,517.7,183.2,545.4,204.5C9885.1-370,9900-299.7,9900,124.3c0,428.2-12.8,479.3-140.6,564.6c-34.1,21.3-283.4,115-558.2,208.8l-498.5,170.4l-83.1,249.3c-44.8,136.3-136.4,360-204.5,494.3l-125.7,242.9l240.7,477.2c210.9,421.8,238.6,487.9,238.6,588c2.1,61.8-10.7,138.5-27.7,170.4c-51.1,95.9-507,532.6-592.3,568.8c-44.7,17-108.6,32-142.7,32c-38.3,0-262-98-556-245l-494.3-247.1l-242.9,121.4c-134.2,66-360,161.9-502.8,210.9l-259.9,87.3l-172.6,513.4c-93.7,283.3-189.6,534.7-213,560.3c-93.8,106.5-185.4,127.8-564.6,127.8C4699.6,5020,4635.7,5013.6,4559,4977.4z M5311,1992.7c385.6-68.2,707.3-232.2,997.1-507c954.4-914,703-2496.9-487.9-3070c-707.3-340.9-1548.8-210.9-2113.4,328.1c-266.3,251.4-424,507-532.6,858.6c-51.1,168.3-57.5,219.4-57.5,517.7s6.4,349.4,57.5,517.7c215.2,705.2,754.2,1199.4,1463.6,1346.4C4808.3,2018.3,5140.6,2024.6,5311,1992.7z" />
|
||||||
|
</g>
|
||||||
</IconBase>
|
</IconBase>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
.input-boolean {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
max-width: fit-content;
|
||||||
|
border: 1px solid var(--secondary-accent);
|
||||||
|
border-radius: 5px;
|
||||||
|
padding: 0.5em;
|
||||||
|
background-color: var(--secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-boolean:hover, .input-boolean:hover * {
|
||||||
|
cursor: pointer;
|
||||||
|
background-color: var(--secondary-opaque);
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-boolean * {
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import InputBoolean from "./InputBoolean";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Inputs/InputBoolean',
|
||||||
|
component: InputBoolean,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
} as ComponentMeta<typeof InputBoolean>;
|
||||||
|
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof InputBoolean> = args => {
|
||||||
|
const [state, onChange] = useState(args.value)
|
||||||
|
return <div className="page">
|
||||||
|
<InputBoolean {...args} value={state} onChange={v => {
|
||||||
|
args.onChange(v)
|
||||||
|
onChange(v)
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const SimpleText = Template.bind({})
|
||||||
|
SimpleText.args = {
|
||||||
|
label: "Template",
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import "./InputBoolean.css";
|
||||||
import InputWrapper from "./InputWrapper";
|
import InputWrapper from "./InputWrapper";
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
@@ -10,12 +11,8 @@ export default function InputBoolean({
|
|||||||
value = false,
|
value = false,
|
||||||
onChange,
|
onChange,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
return <InputWrapper label={label}>
|
return <div className="input-boolean" onClick={() => onChange(!value)}>
|
||||||
<span className="checkbox" onClick={e => {
|
<input type="checkbox" checked={value} onChange={() => { }} />
|
||||||
e.preventDefault()
|
<label>{label}</label>
|
||||||
onChange(!value)
|
</div>
|
||||||
}}>
|
|
||||||
{value ? '✔️' : ' '}
|
|
||||||
</span>
|
|
||||||
</InputWrapper>
|
|
||||||
}
|
}
|
||||||
Loaded 100 of 158 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user