Compare commits

...
63 Commits
Author SHA1 Message Date
ari b342088b96 fixed up tsc error 2022-05-16 19:37:32 -04:00
ari c0c0d3181c v0.1.5 2022-05-16 19:27:03 -04:00
ari cf013cc342 fixed up styles 2022-05-16 19:27:03 -04:00
Ari Sosnovsky 23b869d43e Update README.md 2022-05-16 19:07:14 -04:00
Ari Sosnovsky e333e80ea3 Update README.md 2022-05-16 16:03:45 -04:00
Ari Sosnovsky 996e23038f Update README.md 2022-05-16 16:01:46 -04:00
ari 0be03b1536 updating api routing 2022-05-16 15:38:13 -04:00
ari dc726ff184 consolidated 2022-05-16 12:58:39 -04:00
ari 7e5885a34d added manual 2022-05-16 12:46:14 -04:00
ari 38396c4d98 added manual 2022-05-16 12:45:31 -04:00
ari ea832884f1 fixed deploy 2022-05-16 12:45:02 -04:00
ari ea14cd4239 trying autogenerated release 2022-05-16 12:44:25 -04:00
ari 4e19bdf4c4 changed up paths 2022-05-16 12:43:12 -04:00
Ari Sosnovsky 75c5870e00 Update config.yaml 2022-05-16 12:03:26 -04:00
Ari Sosnovsky 4b75ac9199 Update README.md 2022-05-16 11:14:11 -04:00
Ari Sosnovsky fd3780f5bc Update CHANGELOG.md 2022-05-16 11:13:49 -04:00
ari 035ac0c898 prepping 0.1.2 2022-05-16 11:05:17 -04:00
ari b331e4c5a0 using setup python instead of container 2022-05-16 11:03:56 -04:00
ari b9fb49fd32 updated test ci 2022-05-16 11:02:27 -04:00
ari a33a18c102 updated tests 2022-05-16 10:58:54 -04:00
ari defa0ce787 updated test yaml 2022-05-16 10:52:56 -04:00
ari b17e4c75b3 ran linters 2022-05-16 10:42:47 -04:00
ari ef5e66a8f1 fixed test cases 2022-05-16 10:29:05 -04:00
ari edc65da14b added cancel last run 2022-05-15 17:12:58 -04:00
ari 1ee34b234d new version 2022-05-15 17:11:38 -04:00
ari cf178e23d0 updated version 2022-05-15 17:09:34 -04:00
ari 7caac74d2d updated latest 2022-05-15 17:08:33 -04:00
ari 8b9d400a4d names 2022-05-15 16:47:43 -04:00
ari c830f35ee4 correct version 2022-05-15 16:45:08 -04:00
ari 7ac92fb98e neater job names in actions 2022-05-15 16:42:43 -04:00
ari 88ad07aabc cleaned up workflow names 2022-05-15 16:39:49 -04:00
ari 80e98d4a28 cleaned up actions 2022-05-15 16:39:20 -04:00
ari 1a2a78b1e8 setting init to false 2022-05-15 16:38:01 -04:00
ari 5c99308fa6 trying build 2022-05-15 16:24:37 -04:00
ari 0e63bb5b25 updated config 2022-05-15 16:21:29 -04:00
ari b0dd9dfddc trying ha builder 2022-05-15 16:15:03 -04:00
ari 33eae5e027 trying ha builder 2022-05-15 16:13:03 -04:00
ari 6372ec77f7 trying ha builder 2022-05-15 16:08:42 -04:00
ari c9e6bb78da build main when push 2022-05-15 16:03:57 -04:00
ari a7ec4da5cd more correct commands for deploy 2022-05-15 16:03:36 -04:00
ari 0d29642703 redoing deploy 2022-05-15 15:54:50 -04:00
ari 80121c9ee8 extracting the version correctly 2022-05-14 17:26:16 -04:00
ari 1c5bff7c47 building v0.0.15 2022-05-14 17:22:40 -04:00
ari 2af528db36 gh workflow 2022-05-14 17:19:41 -04:00
ari 9dc4c9c59f gh workflow 2022-05-14 17:05:27 -04:00
ari e2c669dcf2 gh workflow 2022-05-14 17:04:45 -04:00
ari d33df7f532 gh workflow 2022-05-14 17:04:23 -04:00
ari 48cb1207b2 gh workflow 2022-05-14 17:04:00 -04:00
ari 36cfcd625b gh workflow 2022-05-14 17:03:05 -04:00
ari 56d5ca3d08 github workflow 2022-05-14 17:01:57 -04:00
ari 06eb6e27b7 github workflow 2022-05-14 17:01:17 -04:00
ari b1a86f3bf0 0.0.14 2022-05-13 17:26:44 -04:00
ari a626a89ed3 cleand up webapp for building 2022-05-13 17:26:44 -04:00
ari 3526fbd9ee updated api 2022-05-13 17:26:44 -04:00
ari 4cfc429980 cleaned up styling for editor 2022-05-13 17:26:44 -04:00
ari bfc95db6f6 cleaned up multinode stlying 2022-05-13 17:26:44 -04:00
ari 8d804add13 cleaned up styling 2022-05-13 17:26:44 -04:00
ari 2db116ad9b fixed test 2022-05-13 17:26:44 -04:00
ari 6981eddb49 Added Gear Icon 2022-05-13 17:26:44 -04:00
ari c118ccc99b no more $smType in webapp 2022-05-13 17:26:44 -04:00
ari 429dfd5b50 removed $smType for conditions and trigger 2022-05-13 17:26:44 -04:00
ari 49fea3fabd cleaned up types 2022-05-13 17:26:44 -04:00
Ari Sosnovsky 38b0aecffa Update README.md 2022-05-05 17:23:48 -04:00
137 changed files with 2253 additions and 2199 deletions

No files matched your search

+5
View File
@@ -37,6 +37,11 @@ jobs:
# Learn more about CodeQL language support at https://git.io/codeql-language-support
steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.9.1
with:
access_token: ${{ github.token }}
- name: Checkout repository
uses: actions/checkout@v3
+78
View File
@@ -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,
});
+77
View File
@@ -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
+1
View File
@@ -0,0 +1 @@
.vscode/*.log
+3 -26
View File
@@ -1,27 +1,4 @@
# Changelog
# Changelog -- v0.1.5
## [0.0.13] - Better Styling with react-flow
- Fixed up styling (using react-flow)
- cleaned up some button styles
## [0.0.12] - Tags
- 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).
- Fixed up arrow styles due to typos
- Added selection color
+7 -1
View File
@@ -1,7 +1,13 @@
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
local_run:
build:
$(DC) build
push:
$(DC) push
local_run:
$(MAKE) build
$(DC) up -d
sleep 1
$(DC) ps
+20 -2
View File
@@ -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!
![image](https://user-images.githubusercontent.com/7451445/168672575-fb19997d-fe9b-4192-96b0-733b62519797.png)
![image](https://user-images.githubusercontent.com/7451445/168672840-71ceaa8a-2bee-443e-9150-5b0f03b05d08.png)
![image](https://user-images.githubusercontent.com/7451445/165433007-371cc1f1-39cf-4857-8bba-331d4048750e.png)
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).
## 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`
+17
View File
@@ -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
View File
@@ -10,7 +10,7 @@ setup:
$(PIP) install .[dev]
lint:
$(VENV_BIN)/vulture --exclude src
$(VENV_BIN)/vulture src .vulture_whitelist
$(MAKE) lint-project
$(MAKE) lint-tests
+12
View File
@@ -29,3 +29,15 @@ exclude = '''
[tool.coverage.run]
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
View File
@@ -14,7 +14,7 @@ setuptools.setup(
"dev": [
"mypy==0.910",
"mypy-extensions==0.4.3",
"black==21.7b0",
"black==22.3.0",
"bandit==1.7.0",
"isort==5.9.3",
"coverage==5.5",
+5 -4
View File
@@ -1,10 +1,11 @@
from sys import prefix
from fastapi import FastAPI
from fastapi.staticfiles import StaticFiles
from fastapi.middleware.cors import CORSMiddleware
from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager
from src.env import ROOT_FOLDER, ORIGIN
from .routes import ping, automations, details
from src.env import ORIGIN, ROOT_FOLDER
from .routes import automations, details, ping
def make_app(automation_mgr: AutomationManager) -> FastAPI:
+4 -3
View File
@@ -1,5 +1,5 @@
from fastapi import APIRouter, HTTPException
from src.automations.manager import AutomationManager
from src.api.types import (
DeleteAutoRequest,
ListData,
@@ -7,6 +7,7 @@ from src.api.types import (
UpdateAutoRequest,
)
from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager
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):
automations.update(body.index, body.data)
@router.delete("")
@router.delete("/item")
def delete_auto(body: DeleteAutoRequest):
try:
automations.delete(body.index)
+4 -4
View File
@@ -1,9 +1,9 @@
from fastapi import APIRouter
from datetime import datetime
from src.hass_config import HassConfig
from src.env import BUILD_VERSION
from fastapi import APIRouter
from src.env import BUILD_VERSION
from src.hass_config import HassConfig
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(),
}
return router
return router
+2 -1
View File
@@ -1,6 +1,7 @@
from fastapi import APIRouter
from datetime import datetime
from fastapi import APIRouter
from src.env import BUILD_VERSION
router = APIRouter()
+2
View File
@@ -1,7 +1,9 @@
from typing import Generic, List, TypeVar
from pydantic import BaseModel
from pydantic.fields import Field
from pydantic.generics import GenericModel
from src.automations.types import ExtenededAutomationData
DataT = TypeVar("DataT")
+1 -1
View File
@@ -1,6 +1,6 @@
from src.api.app import make_app
from src.automations.manager import AutomationManager
from src.hass_config import find_hass_config
from src.api.app import make_app
hass_config = find_hass_config()
app = make_app(AutomationManager(hass_config))
+25 -14
View File
@@ -1,11 +1,12 @@
from itertools import chain
from typing import Iterable, Iterator
from typing import Iterator, Union
from pydantic.error_wrappers import ValidationError
from src.automations.tags import TagManager
from src.json_serializer import normalize_obj
from .types import AutomationData, AutomationMetdata, ExtenededAutomationData
from .parsers import _parse_actions
from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData
# Single loader
def load_automation(
@@ -25,16 +26,26 @@ def load_automation(
try:
yield ExtenededAutomationData(
metadata=AutomationMetdata.parse_obj(auto_raw),
sequence=list(
_parse_actions(
chain(
auto_raw.get("condition", []),
auto_raw.get("action", []),
)
)
),
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])],
condition=load_conditions(auto_raw.get("condition", [])),
sequence=load_conditions(auto_raw.get("action", [])),
trigger=normalize_obj(auto_raw.get("trigger", [])),
tags=tags,
)
except ValidationError as 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}")
+3 -1
View File
@@ -1,7 +1,9 @@
from typing import Iterator, List, Optional
from src.automations.errors import FailedDeletion
from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig
from .loader import load_automation
@@ -45,7 +47,7 @@ class AutomationManager:
tags[index] = automation.tags
self.hass_config.save_automations(automations)
self.hass_config.save_tags(tags)
def delete(self, index: int):
automations: List[dict] = []
deleted = False
-88
View File
@@ -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),
)
+5 -6
View File
@@ -1,15 +1,14 @@
from pathlib import Path
from typing import Dict
from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[int, Dict[str, str]]):
def save(self, path: Path):
path.write_text(dump_yaml(dict(self)))
@classmethod
def load(cls, path: Path):
with path.open('r') as fp:
return cls(load_yaml(fp))
with path.open("r") as fp:
return cls(load_yaml(fp))
+9 -27
View File
@@ -1,27 +1,7 @@
from typing import Dict, List, Literal, Optional, Union
from pydantic.fields import Field
from pydantic import BaseModel
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
from pydantic.fields import Field
class AutomationMetdata(BaseModel):
@@ -35,15 +15,17 @@ class AutomationMetdata(BaseModel):
class AutomationData(BaseModel):
metadata: AutomationMetdata
trigger: List[dict] = []
sequence: List[Union[AutomationConditionNode, AutomationActionNode]] = []
condition: List[dict] = []
sequence: List[dict] = []
def to_primitive(self):
return {
**self.metadata.dict(),
**self.metadata.dict(exclude_unset=True, exclude_none=True),
"trigger": self.trigger,
"condition": [],
"action": [action.to_primitive() for action in self.sequence],
"condition": self.condition,
"action": self.sequence,
}
class ExtenededAutomationData(AutomationData):
tags: Dict[str, str] = Field(default_factory=dict)
tags: Dict[str, str] = Field(default_factory=dict)
+2 -3
View File
@@ -1,9 +1,8 @@
from email.policy import default
from decouple import config, Csv
from pathlib import Path
from decouple import Csv, config
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
LOG_LEVEL = config("LOG_LEVEL", "INFO")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
+9 -5
View File
@@ -1,7 +1,8 @@
import os
from typing import cast
from decouple import config
from pathlib import Path
from decouple import config
from .loader import HassConfig
@@ -11,10 +12,13 @@ def find_hass_config() -> HassConfig:
print("using USE_EXAMPLE_REPO")
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:
return HassConfig(Path("/config"))
config_dir = Path("/config")
if config_dir.is_dir():
return HassConfig(config_dir)
"""Put together the default configuration directory based on the OS."""
data_dir = Path(config("APPDATA", None) if os.name == "nt" else os.path.expanduser("~"))
+5 -5
View File
@@ -1,9 +1,10 @@
from pathlib import Path
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 .errors import MissingFile
@@ -25,7 +26,7 @@ class HassConfig:
except FileNotFoundError as err:
raise MissingFile("automations.yaml") from err
return self.configurations["automation"]
@property
def automation_tags(self) -> TagManager:
tag_path = self.get_automation_tags_path()
@@ -35,7 +36,6 @@ class HassConfig:
else:
return TagManager.load(tag_path)
def get_automation_tags_path(self) -> Path:
return self.root_path / ".shortumations" / "tags.yaml"
@@ -66,4 +66,4 @@ class HassConfig:
)
def save_tags(self, tags: TagManager):
tags.save(self.get_automation_tags_path())
tags.save(self.get_automation_tags_path())
+2 -1
View File
@@ -1,5 +1,5 @@
import json
from typing import Any
from typing import Any, List
def json_dumps(obj: Any) -> str:
@@ -34,6 +34,7 @@ def normalize_obj(obj: Any) -> Any:
or isinstance(obj, int)
or isinstance(obj, float)
or isinstance(obj, bool)
or obj is None
):
return obj
else:
+2 -1
View File
@@ -1,5 +1,6 @@
import io
from typing import Any, Union, TextIO
from typing import Any, TextIO, Union
from src.yaml_serializer.base_yaml import yaml
+6 -1
View File
@@ -1,5 +1,10 @@
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.register_class(IncludedYaml)
+1
View File
@@ -1,4 +1,5 @@
from typing import NamedTuple
from ruamel.yaml.nodes import Node
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
+219 -9
View File
@@ -1,8 +1,15 @@
from unittest import TestCase
from fastapi.testclient import TestClient
from ruamel.yaml import YAML
from src.api.app import make_app
from src.automations.types import AutomationData, AutomationMetdata, ExtenededAutomationData
from tests.utils import get_example_automation_loader
from src.automations.types import (
AutomationData,
AutomationMetdata,
ExtenededAutomationData,
)
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
class BaseTestCase(TestCase):
@@ -16,6 +23,9 @@ class BaseTestCase(TestCase):
class automation_list_tests(BaseTestCase):
test_params = {"total": 28, "subtest2_found_items": 3, "subtest1_found_items": 10}
def test_get_list_of_everything(self):
data = self.client.post(
"/automations/list",
@@ -33,8 +43,8 @@ class automation_list_tests(BaseTestCase):
"limit": 50,
},
)
self.assertEqual(d["totalItems"], 28)
self.assertEqual(len(d["data"]), 28)
self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), self.test_params["total"])
def test_subset1(self):
data = self.client.post(
@@ -53,8 +63,8 @@ class automation_list_tests(BaseTestCase):
"limit": 10,
},
)
self.assertEqual(d["totalItems"], 28)
self.assertEqual(len(d["data"]), 10)
self.assertEqual(d["totalItems"], self.test_params["total"])
self.assertEqual(len(d["data"]), self.test_params["subtest1_found_items"])
def test_subset2(self):
data = self.client.post(
@@ -73,8 +83,24 @@ class automation_list_tests(BaseTestCase):
"limit": 10,
},
)
self.assertEqual(d["totalItems"], 28)
self.assertEqual(len(d["data"]), 3)
self.assertEqual(d["totalItems"], self.test_params["total"])
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):
@@ -108,7 +134,191 @@ class automation_update_tests(BaseTestCase):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
new_auto = resp.json()["data"][0]
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):
+19 -27
View File
@@ -1,15 +1,8 @@
from unittest import TestCase
from src.automations.types import (
AutomationActionNode,
AutomationConditionNode,
AutomationMetdata,
ExtenededAutomationData,
)
from src.automations.loader import load_automation
from src.yaml_serializer.types import (
SecretValue,
NOT_IMPLEMENTED_SV_MSG,
)
from src.automations.types import AutomationMetdata, ExtenededAutomationData
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
class loader_tests(TestCase):
@@ -33,7 +26,7 @@ class loader_tests(TestCase):
],
"mode": "single",
},
{}
{},
)
)
self.assertEqual(
@@ -46,22 +39,21 @@ class loader_tests(TestCase):
mode="single",
),
trigger=[{"platform": "homeassistant", "event": "shutdown"}],
sequence=[
AutomationConditionNode(
condition="template",
condition_data={"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...",
},
),
condition=[
{
"condition": "template",
"value_template": "states(time.time) >= '10:00:00'",
}
],
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 src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationMetdata, ExtenededAutomationData
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)
+5 -6
View File
@@ -1,18 +1,17 @@
from pathlib import Path
from tempfile import mktemp
from unittest import TestCase
from src.automations.tags import TagManager
class tag_tests(TestCase):
class tag_tests(TestCase):
def test_load_and_save(self):
tmp_file = Path(mktemp()).with_suffix('.yml')
tmp_file = Path(mktemp()).with_suffix(".yml")
tags = TagManager()
tags[0] = {'Room': "Kitchen", "Type": 'Lights'}
tags[0] = {"Room": "Kitchen", "Type": "Lights"}
tags[1] = {}
tags.save(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 src.automations.types import AutomationData, AutomationMetdata
from src.hass_config.errors import MissingFile
from src.hass_config.loader import HassConfig
+5 -3
View File
@@ -1,11 +1,13 @@
import json
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.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.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
class json_serializer_tests(TestCase):
+4 -5
View File
@@ -1,14 +1,13 @@
import io
from unittest import TestCase
from src.yaml_serializer import (
dump_yaml,
load_yaml,
)
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer.types import (
IncludedYaml,
SecretValue,
IncludedYamlDir,
SecretValue,
)
from tests.utils import SAMPLES_FOLDER
class dumping_yamls_tests(TestCase):
+9 -6
View File
@@ -1,32 +1,35 @@
from pathlib import Path
from shutil import copytree
from tempfile import mkdtemp
from pathlib import Path
from typing import List, Literal, Optional, Tuple
from src.automations.manager import AutomationManager
from src.automations.types import AutomationData
from src.hass_config.loader import HassConfig
from src.yaml_serializer import dump_yaml
from src.yaml_serializer.types import IncludedYaml
THIS_FOLDER = Path(__file__).parent
SAMPLES_FOLDER = THIS_FOLDER / "samples"
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
Returns:
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)
automation_loader = AutomationManager(hass_config)
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
Returns:
@@ -34,7 +37,7 @@ def create_copy_of_example_config() -> Path:
"""
root_folder = Path(mkdtemp())
root_folder.rmdir()
copytree(HA_CONFIG_EXAMPLE, root_folder)
copytree(config_to_copy, root_folder)
return root_folder
+5 -3
View File
@@ -1,16 +1,18 @@
name: Shortumation
version: 0.0.13
version: 0.1.5
slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
description: "A homeassitant addon which provides better UI for automations & scripts."
arch:
- armhf
- armv7
- aarch64
- amd64
- armhf
- armv7
- i386
startup: application
boot: auto
init: false
ingress: true
ingress_port: 8000
ingress_entry: "web/"
+1 -1
View File
@@ -1,7 +1,7 @@
version: '3'
services:
addon:
image: "asosnovsky/shortumation:${ARCH:-amd64}-${BUILD_TAG:-latest}"
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
build:
context: "./"
dockerfile: "./Dockerfile"
+6 -2
View File
@@ -40,13 +40,17 @@
- id: shortu-2
alias: Neat trick
description: ''
trigger_variables:
mode: queued
trigger: []
condition: []
action:
- alias: Choose
default: []
default:
- condition: and
alias: ''
conditions:
- condition: or
conditions: []
choose: []
- service: lights.turn_on
target:
+2 -2
View File
@@ -8,7 +8,6 @@
"@types/node": "^12.0.0",
"@types/react": "^17.0.0",
"@types/react-dom": "^17.0.0",
"chroma-js": "^2.1.2",
"jss": "^10.8.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
@@ -24,6 +23,7 @@
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
"test": "react-scripts test",
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
"eject": "react-scripts eject",
@@ -78,4 +78,4 @@
"node_modules",
"src"
]
}
}
+5 -5
View File
@@ -1,7 +1,7 @@
import { AutomationData } from "types/automations";
import { API } from "./base";
import { ListData, ListParams } from "./types";
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
export const makeAutomationAPI = (api: API) => ({
@@ -14,19 +14,19 @@ export const makeAutomationAPI = (api: API) => ({
});
return data;
},
async update({index, auto}: {index: number, auto: AutomationData}) {
async update({ index, auto }: { index: number, auto: AutomationData }) {
return await api.makeCall({
path: AUTOMTAION_ROOT,
path: AUTOMTAION_ITEM,
data: {
index,
data: auto
},
})
},
async remove({index}: {index: number}) {
async remove({ index }: { index: number }) {
return await api.makeCall({
method: "DELETE",
path: AUTOMTAION_ROOT,
path: AUTOMTAION_ITEM,
data: {
index,
}
+3 -3
View File
@@ -1,7 +1,7 @@
import { useRef } from 'react';
import { AutomationData } from 'types/automations';
import { API } from './base';
import { AUTOMTAION_LIST, AUTOMTAION_ROOT } from './paths';
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
export const useMockAPI = (
@@ -26,7 +26,7 @@ export const useMockAPI = (
}))
} as any
}
if (path === AUTOMTAION_ROOT) {
if (path === AUTOMTAION_ITEM) {
if (method === 'POST') {
const { index, data: auto } = data as any;
if (index >= automationsRef.current.length) {
@@ -37,7 +37,7 @@ export const useMockAPI = (
auto,
...automationsRef.current.slice(index + 1)
];
}
}
return {
ok: true,
data: {}
+1
View File
@@ -2,3 +2,4 @@
export const AUTOMTAION_ROOT = '/' 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 {
min-width: 25em;
min-width: 20em;
}
.automation-editor--info-box.hide {
@@ -1,6 +1,6 @@
import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations";
import InputList from "components/Inputs/InputList";
import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText";
import InputTextArea from "components/Inputs/InputTextArea";
import { FC, useRef, useState } from 'react';
@@ -10,16 +10,7 @@ export default {
component: AutomationEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof AutomationEditor>
@@ -43,6 +34,7 @@ export const Simple = Template.bind({})
Simple.args = {
...Simple.args,
automation: {
condition: [],
tags: {
"Room": "Bathroom",
"For": "Toliet",
@@ -60,53 +52,38 @@ Simple.args = {
},
trigger: [
{
"$smType": undefined,
"platform": "numeric_state",
"entity_id": "test",
},
{
"$smType": undefined,
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
$smType: "condition",
condition: 'and',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature_kitchen',
below: '15',
}
},
{
$smType: "condition",
condition: 'template',
condition_data: {
value_template: 'states(switch.kitchen_light) == "on"'
}
}
]
}
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
},
{
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
},
{
$smType: "action",
action: "service",
action_data: {
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",
}
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",
}
}
]
@@ -118,6 +95,7 @@ export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
automation: {
condition: [],
tags: {},
metadata: {
id: "random",
@@ -25,6 +25,7 @@ export const AutomationEditor: FC<Props> = ({
updateSequence,
updateTrigger,
updateMetadata,
updateCondition,
save,
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
@@ -64,8 +65,10 @@ export const AutomationEditor: FC<Props> = ({
className="automation-editor--flow-wrapper--flow"
sequence={state.data.sequence}
trigger={state.data.trigger}
condition={state.data.condition}
onSequenceUpdate={updateSequence}
onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition}
dims={dims}
/>
</div>
@@ -18,7 +18,6 @@ export const useAutomatioEditorState = (
const [state, update] = useState<EditorState>({
status: "loading",
});
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
data: D
) => state.status !== 'loading' && update({
@@ -41,6 +40,7 @@ export const useAutomatioEditorState = (
return {
updateTrigger: makeUpdate('trigger'),
updateSequence: makeUpdate('sequence'),
updateCondition: makeUpdate('condition'),
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
if (state.status !== 'loading') {
update({
@@ -80,6 +80,7 @@ const genEditorData = (automation: AutomationData) => {
metadata,
trigger,
sequence,
condition,
} = automation;
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]);
@@ -88,6 +89,7 @@ const genEditorData = (automation: AutomationData) => {
metadata,
trigger,
sequence,
condition,
tags,
}
}
@@ -10,16 +10,7 @@ export default {
component: AutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof AutomationList>;
@@ -10,10 +10,12 @@
flex: 1;
user-select: none;
}
.automation-list-box--body > * {
.automation-list-box--body>* {
padding-top: 0.5em;
padding-bottom: 0.5em;
}
.automation-list-box--body--group {
display: flex;
flex-direction: column;
@@ -21,33 +23,37 @@
border-radius: 10px;
padding-bottom: 0.5em;
border-width: 1px;
border-bottom-style: solid ;
border-bottom-style: solid;
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;
margin-left: 0.75em;
padding-left: 0.5em;
}
.automation-list-box--body--group > b {
.automation-list-box--body--group>b {
width: 100%;
cursor: pointer;
padding: 0.1em;
}
.automation-list-box--body--group > b:hover {
.automation-list-box--body--group>b:hover {
background-color: var(--secondary-accent);
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);
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);
}
.automation-list-box--body--item {
padding-left: 1em;
cursor: pointer;
@@ -57,25 +63,31 @@
gap: 1em;
flex-wrap: wrap;
}
.automation-list-box--body--item::before {
content: "⊚ ";
}
.automation-list-box--body--item--title {
display: flex;
flex-direction: column;
padding-left: 0.25em;
flex: 1;
}
.automation-list-box--body--item--title > b {
.automation-list-box--body--item--title>b {
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;
}
.automation-list-box--body--item > button {
.automation-list-box--body--item>button {
padding: 0.25em !important;
margin: 0.5em !important;
}
.automation-list-box--body--item--tags {
flex: 1;
display: flex;
@@ -87,13 +99,15 @@
max-height: 100%;
gap: 0.25em;
}
.automation-list-box--body--item--tags > span {
.automation-list-box--body--item--tags>span {
border-color: var(--primary-accent);
border-style: solid;
border-width: 1px;
border-radius: 0.5em;
padding: 0.1em 0.5em;
}
.automation-list-box--bottom {
margin-top: 0.5em;
margin-bottom: 0.5em;
@@ -102,7 +116,8 @@
justify-content: space-around;
align-items: center;
}
.automation-list-box--bottom > button {
.automation-list-box--bottom>button {
background-color: #070;
color: var(--primary-accent);
padding: 0.5em 2em;
@@ -13,10 +13,12 @@ export default {
const Template: ComponentStory<typeof AutomationListBox> = args => {
const [autos, setAutos] = useState(args.automations)
console.log({ args })
const [selected, setSelected] = useState(args.selected)
return <div className="page">
<AutomationListBox {...args} automations={autos} />
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
setSelected(i)
args.onSelectAutomation(i)
}} />
</div>
}
@@ -5,6 +5,7 @@ import { createMockAuto } from 'utils/mocks';
test('group automations', () => {
const automations: AutomationData[] = [
{
condition: [],
metadata: {
id: '1',
alias: '',
@@ -19,6 +20,7 @@ test('group automations', () => {
trigger: [],
},
{
condition: [],
metadata: {
id: '2',
alias: '',
@@ -33,6 +35,7 @@ test('group automations', () => {
trigger: [],
},
{
condition: [],
metadata: {
id: '3',
alias: '',
@@ -9,6 +9,7 @@ import { TrashIcon } from "components/Icons";
export type Props = {
automations: AutomationData[];
selected: number;
onSelectAutomation: (i: number) => void;
onRemove: (i: number) => void;
onAdd: () => void;
@@ -16,6 +17,7 @@ export type Props = {
export const AutomationListBox: FC<Props> = ({
automations,
selected,
onSelectAutomation,
onAdd,
onRemove,
@@ -23,9 +25,9 @@ export const AutomationListBox: FC<Props> = ({
const tags = getTagList(automations);
const [searchText, setSearchText] = useState('');
const [selected, setSelected] = useState<number[]>([]);
const filteredAutomations = filterAutomations(automations, searchText, selected, tags);
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selected, tags);
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
return <div className="automation-list-box">
<div className="automation-list-box--nav">
@@ -36,14 +38,14 @@ export const AutomationListBox: FC<Props> = ({
/>
<InputMultiSelect
label="Tags"
selected={selected}
onChange={setSelected}
selected={selectedTagIdx}
onChange={setSelectedTagIdx}
options={tags}
max={3}
/>
</div>
<div className="automation-list-box--body">
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)}
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
</div>
<div className="automation-list-box--bottom">
<Button onClick={onAdd}>Add</Button>
@@ -123,13 +125,14 @@ const convertGroupsToItems = (
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void,
selected: number,
) => {
if (Array.isArray(groups)) {
return groups.map(i => {
const [auto, autoIndex] = autos[i];
return <div
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}`}
onClick={() => onSelectAutomation(autoIndex)}
>
@@ -158,6 +161,7 @@ const convertGroupsToItems = (
autos={autos}
onSelectAutomation={onSelectAutomation}
onRemove={onRemove}
selected={selected}
/>
})
}
@@ -170,16 +174,18 @@ const AutomationListBoxGroup: FC<{
autos: Array<[AutomationData, number]>,
onSelectAutomation: (i: number) => void,
onRemove: (i: number) => void;
selected: number,
}> = ({
groupName,
groups,
autos,
onSelectAutomation,
onRemove,
selected,
}) => {
const [open, setOpen] = useState(false);
return <div className="automation-list-box--body--group">
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove)}
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
</div>
}
@@ -2,23 +2,14 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
import { ConnectedAutomationList } from ".";
import { createMockAuto } from "utils/mocks";
import { useMockApiService } from "apiService";
import * as dgconst from 'components/DAGSvgs/constants';
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants';
export default {
title: 'App/AutomationList/Connected',
component: ConnectedAutomationList,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
},
dims: DEFAULT_DIMS,
initialAutomations: [],
}
} as ComponentMeta<typeof ConnectedAutomationList>;
@@ -9,7 +9,6 @@
.automation-list--list {
flex: 1;
min-width: 400px;
max-width: 400px;
position: relative;
}
@@ -42,6 +42,7 @@ export const AutomationList: FC<AutomationListParams> = ({
setCurrent(automations.length)
}}
onSelectAutomation={setCurrent}
selected={current}
onRemove={onRemove}
/>
<ButtonIcon
@@ -12,48 +12,32 @@ export default {
export const Basic: ComponentStory<typeof ConditionEditor> = args => {
const [state, setState] = useState<AutomationCondition>({
"$smType": "condition",
"condition": "or",
"condition_data": {
"conditions": [
{
"$smType": "condition",
"condition": "and",
"condition_data": {
"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": {
"conditions": [
{
"condition": "and",
"conditions": [
{
"condition": "numeric_state",
"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 (
<div className="page">
@@ -3,7 +3,7 @@ import { FC, useState, useEffect } from 'react';
import { getConditionDefaultValues } from "utils/defaults";
import { AutomationCondition } from "types/automations/conditions";
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 { getEditor } from "./editorRender";
import { useStyles } from "./style";
@@ -51,17 +51,10 @@ export const ConditionNode: FC<{
) {
onUpdate({
...condition,
$smType: 'condition',
condition_data: {
...condition.condition_data,
conditions: condition.condition_data.conditions.concat({
$smType: 'condition',
condition: 'or',
condition_data: {
conditions: []
}
})
}
conditions: condition.conditions.concat({
condition: 'or',
conditions: []
})
})
}
}
@@ -69,20 +62,10 @@ export const ConditionNode: FC<{
let childrenConditions: JSX.Element;
if (effectiveDM) {
const Viewer = getViewer(condition);
childrenConditions = <Viewer condition={condition} onChange={data => {
onUpdate({
...data,
$smType: 'condition',
})
}} />
childrenConditions = <Viewer condition={condition} onChange={onUpdate} />
} else {
const Editor = getEditor(condition);
childrenConditions = <Editor condition={condition} onChange={data => {
onUpdate({
...data,
$smType: 'condition',
})
}} />
childrenConditions = <Editor condition={condition} onChange={onUpdate} />
}
// styles
let hasChildren = false;
@@ -115,13 +98,10 @@ export const ConditionNode: FC<{
'trigger',
'zone',
]}
onChange={n => onUpdate({
$smType: 'condition',
onChange={(n: any) => onUpdate({
...getConditionDefaultValues(n),
...condition,
condition: n,
condition_data: {
...getConditionDefaultValues(n),
...condition.condition_data,
}
} as any)}
/>
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
@@ -134,11 +114,8 @@ export const ConditionNode: FC<{
<div className={classes.children}>
{yamlMode && <InputYaml
label=""
value={condition.condition_data}
onChange={update => onUpdate({
...condition,
condition_data: update as any
})}
value={condition}
onChange={update => onUpdate(update as any)}
resizable
/>}
{!yamlMode && childrenConditions}
@@ -46,19 +46,13 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
condition,
}) => {
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_data: {
...condition.condition_data,
alias
}
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_data: {
...condition.condition_data,
value_template
}
value_template
})} resizable />
</div>
}
@@ -69,58 +63,40 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
condition,
}) => {
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_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputEntity
value={condition.condition_data.entity_id}
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
condition_data: {
...condition.condition_data,
entity_id
}
entity_id
})}
/>
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
condition_data: {
...condition.condition_data,
attribute
}
attribute
})} />
<InputNumber
label="Above"
value={condition.condition_data.above ? Number(condition.condition_data.above) : undefined}
value={condition.above ? Number(condition.above) : undefined}
onChange={above => onChange({
...condition,
condition_data: {
...condition.condition_data,
above: above ? String(above) : undefined,
}
above: above ? String(above) : undefined,
})}
/>
<InputNumber
label="Below"
value={condition.condition_data.below ? Number(condition.condition_data.below) : undefined}
value={condition.below ? Number(condition.below) : undefined}
onChange={below => onChange({
...condition,
condition_data: {
...condition.condition_data,
below: below ? String(below) : undefined,
}
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_data: {
...condition.condition_data,
value_template
}
value_template
})} resizable />
</div>
}
@@ -132,7 +108,7 @@ export const LogicViewer: Editor<LogicCondition> = ({
}) => {
return <>
{condition.condition_data.conditions.map((c, i) => {
{condition.conditions.map((c, i) => {
return <ConditionNode
key={i}
condition={c}
@@ -151,50 +127,35 @@ export const StateEditor: Editor<StateCondition> = ({
condition,
}) => {
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_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputEntity
value={condition.condition_data.entity_id}
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
condition_data: {
...condition.condition_data,
entity_id
}
entity_id
})}
/>
<InputText label="Attribute" value={condition.condition_data.attribute ?? ""} onChange={attribute => onChange({
<InputText label="Attribute" value={condition.attribute ?? ""} onChange={attribute => onChange({
...condition,
condition_data: {
...condition.condition_data,
attribute
}
attribute
})} />
<InputText
label="State"
value={String(condition.condition_data.state)}
value={String(condition.state)}
onChange={state => onChange({
...condition,
condition_data: {
...condition.condition_data,
state,
}
state,
})}
/>
<InputTime
label="For"
value={condition.condition_data.for}
value={condition.for}
onChange={_for => onChange({
...condition,
condition_data: {
...condition.condition_data,
for: _for,
}
for: _for,
})}
/>
</div>
@@ -205,36 +166,27 @@ export const TimeEditor: Editor<TimeCondition> = ({
condition,
}) => {
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_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputTime
label="After"
value={condition.condition_data.after}
value={condition.after}
onChange={after => onChange({
...condition,
condition_data: {
...condition.condition_data,
after,
}
after,
})}
/>
<InputTime
label="Before"
value={condition.condition_data.before}
value={condition.before}
onChange={before => onChange({
...condition,
condition_data: {
...condition.condition_data,
before,
}
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>
}
@@ -243,19 +195,13 @@ export const TriggerEditor: Editor<TriggerCondition> = ({
condition,
}) => {
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_data: {
...condition.condition_data,
alias
}
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_data: {
...condition.condition_data,
id
}
id
})} />
</div>
}
@@ -265,39 +211,27 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
condition,
}) => {
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_data: {
...condition.condition_data,
alias
}
alias
})} />
<InputText label="Zone" value={condition.condition_data.zone} onChange={zone => onChange({
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
...condition,
condition_data: {
...condition.condition_data,
zone
}
zone
})} />
<InputEntity
value={condition.condition_data.entity_id}
value={condition.entity_id}
onChange={entity_id => onChange({
...condition,
condition_data: {
...condition.condition_data,
entity_id
}
entity_id
})}
/>
<InputText
label="State"
value={String(condition.condition_data.state)}
value={String(condition.state)}
onChange={state => onChange({
...condition,
condition_data: {
...condition.condition_data,
state,
}
state,
})}
/>
</div>
@@ -27,11 +27,8 @@ const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }
export const TemplateViewer = Template.bind({})
TemplateViewer.args = {
condition: {
$smType: 'condition',
condition: 'template',
condition_data: {
value_template: "states('switch.light_kitchen') == 'on'"
}
value_template: "states('switch.light_kitchen') == 'on'"
} as AutomationCondition,
}
@@ -39,63 +36,42 @@ TemplateViewer.args = {
export const NumericStateViewer = Template.bind({})
NumericStateViewer.args = {
condition: {
$smType: 'condition',
condition: "numeric_state",
condition_data: {
entity_id: "sensor.humidity_kitchen",
above: "10",
}
entity_id: "sensor.humidity_kitchen",
above: "10",
} as AutomationCondition,
}
export const LogicCondition = Template.bind({})
LogicCondition.args = {
condition: {
$smType: 'condition',
condition: 'or',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.humidity_kitchen',
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.humidity_kitchen',
above: '60'
},
{
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'
}
},
{
$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,
}
@@ -2,30 +2,24 @@ import { AutomationCondition, LogicCondition } from "types/automations/condition
export const genUpdateMethods = (
condition: LogicCondition,
onChange: (c: LogicCondition) => void
condition: LogicCondition,
onChange: (c: LogicCondition) => void
) => (i: number) => ({
onUpdate: (update: AutomationCondition) => onChange({
...condition,
condition_data: {
...condition.condition_data,
conditions: [
...condition.condition_data.conditions.slice(0, i),
update,
...condition.condition_data.conditions.slice(i+1)
]
}
conditions: [
...condition.conditions.slice(0, i),
update,
...condition.conditions.slice(i + 1)
]
}),
onDelete: (which: 'root' | number) => {
if (which === 'root') {
onChange({
...condition,
condition_data: {
...condition.condition_data,
conditions: condition.condition_data.conditions.slice(0, i).concat(
condition.condition_data.conditions.slice(i+1)
)
}
conditions: condition.conditions.slice(0, i).concat(
condition.conditions.slice(i + 1)
)
})
} else {
throw new Error("Not Implemented")
+16 -18
View File
@@ -1,5 +1,4 @@
import { Styles } from "jss";
import Color from 'chroma-js';
import { createAppUseStyles } from "styles/theme";
export const useStyles = createAppUseStyles<{
@@ -26,9 +25,9 @@ export const useStyles = createAppUseStyles<{
padding: 0,
position: 'relative',
display: 'flex',
flexDirection: hasChildren? 'column' : 'row',
flexDirection: hasChildren ? 'column' : 'row',
}),
title: ({hasChildren}) => ({
title: ({ hasChildren }) => ({
display: 'flex',
border: hasChildren ? `1px solid ${theme.primaryAccent}` : 'none',
borderRadius: 10,
@@ -36,7 +35,7 @@ export const useStyles = createAppUseStyles<{
borderBottomLeftRadius: 0,
height: '100%',
}),
titleText: ({hasChildren}) => ({
titleText: ({ hasChildren }) => ({
background: theme.condition.primaryColor,
border: `1px solid ${theme.primaryAccent}`,
borderRadius: 10,
@@ -44,7 +43,6 @@ export const useStyles = createAppUseStyles<{
borderBottomRightRadius: 0,
borderBottomLeftRadius: hasChildren ? 0 : 10,
padding: 10,
maxWidth: 120,
minWidth: 30,
textOverflow: 'ellipsis',
textAlign: 'center',
@@ -57,9 +55,10 @@ export const useStyles = createAppUseStyles<{
left: -35,
top: 10,
},
modifyBtn: ({hasChildren}) => ({
modifyBtn: ({ hasChildren }) => ({
// styling
backgroundColor: theme.primary,
backgroundColor: theme.green,
color: theme.primary,
fill: theme.primaryAccent,
borderColor: theme.primaryAccent,
borderWidth: 1,
@@ -67,20 +66,19 @@ export const useStyles = createAppUseStyles<{
borderTopLeftRadius: 0,
borderBottomLeftRadius: 0,
cursor: 'pointer',
// positioning
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
padding: '0px 10px',
// position: hasChildren ? 'absolute' : 'block',
right: 1,
top: 10,
// on hover
"&:hover": {
backgroundColor: Color(theme.primary).brighten().hex(),
fill: Color(theme.primaryAccent).brighten().hex(),
backgroundColor: theme.greenLight,
fill: theme.primaryAccentLight,
},
"&:hover $icon": {
transform: "rotate(90deg)"
@@ -88,14 +86,14 @@ export const useStyles = createAppUseStyles<{
}),
icon: {},
deleteBtn,
children: ({hasChildren}) => ({
children: ({ hasChildren }) => ({
flex: 1,
paddingLeft: hasChildren ? 50 : 10,
paddingRight: hasChildren ? 0 : 10,
display: 'flex',
flexDirection: 'column',
justifyContent: 'center',
border: `1px solid ${theme.primaryAccent}`,
justifyContent: 'center',
border: `1px solid ${theme.secondaryAccent}`,
borderBottomRightRadius: hasChildren ? 10 : 0,
borderBottomLeftRadius: hasChildren ? 10 : 0,
minHeight: hasChildren ? undefined : '100%'
@@ -114,8 +112,8 @@ export const useStyles = createAppUseStyles<{
paddingRight: 20,
cursor: 'pointer',
"&:hover": {
backgroundColor: Color(theme.primary).brighten().hex(),
fill: Color(theme.primaryAccent).brighten().hex(),
backgroundColor: theme.primaryLight,
fill: theme.primaryAccentLight,
},
},
addBtn: {
@@ -131,8 +129,8 @@ export const useStyles = createAppUseStyles<{
paddingRight: 20,
cursor: 'pointer',
"&:hover": {
backgroundColor: Color(theme.primary).brighten().hex(),
fill: Color(theme.primaryAccent).brighten().hex(),
backgroundColor: theme.primaryLight,
fill: theme.primaryAccentLight,
},
}
}
@@ -34,7 +34,7 @@ export const LogicViewer: Viewer<LogicCondition> = ({
onChange,
}) => {
return <>
{condition.condition_data.conditions.map((c, i) => {
{condition.conditions.map((c, i) => {
return <ConditionNode key={i} condition={c} displayMode
{...genUpdateMethods(condition, onChange)(i)}
/>
+6 -13
View File
@@ -6,7 +6,6 @@ import { Handle, Position, XYPosition } from 'react-flow-renderer';
export interface DAGCircleProps {
onEdit?: () => void;
onAdd?: () => void;
onRemove?: () => void;
size: number,
@@ -28,7 +27,6 @@ export const makeFlowCircle = (
export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
data: {
size,
onEdit,
onAdd,
onRemove,
backgroundColor,
@@ -38,7 +36,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
}) => {
const { classes } = useCircleStyles({
size,
hasOnFunction: !!onEdit || !!onAdd,
hasOnFunction: !!onRemove || !!onAdd,
hasRemoveFunction: !!onRemove,
backgroundColor,
});
@@ -47,18 +45,13 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
{!disableTarget && <Handle type="target" position={Position.Left} />}
<div className={classes.root}>
{
onEdit ?
<PencilIcon
onAdd ?
<AddIcon
size={70} units="%"
className={classes.icon}
onClick={onEdit}
/> : onAdd ?
<AddIcon
size={70} units="%"
className={classes.icon}
onClick={onAdd}
/>
: backgroundColor ? "" : "else"
onClick={onAdd}
/>
: (backgroundColor || onRemove) ? "" : "else"
}
{onRemove ? <TrashIcon className={classes.trashIcon} onClick={onRemove} /> : <></>}
</div>
+6 -4
View File
@@ -1,4 +1,3 @@
import Color from "chroma-js";
import { PencilIcon } from "components/Icons"
import { NodeColor } from "types/graphs";
import { useNodeStyles } from "./styles";
@@ -14,22 +13,25 @@ export interface DAGNodeProps {
color: NodeColor;
label: string;
hasInput?: boolean;
accentBackground?: boolean;
}
export const DAGNode: FC<{ data: DAGNodeProps }> = ({
data: {
label,
height,
width,
onXClick = () => { },
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} />}
@@ -37,7 +39,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
<div className={classes.root}>
<div className={classes.inner}>
<div className={classes.leftEdge} onClick={onXClick}>
<button className={classes.buttonDelete}>X</button>
{!!onXClick && <button className={classes.buttonDelete}>X</button>}
</div>
<div className={classes.textWrap}>
<span className={classes.text} title={label}>
@@ -48,7 +50,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
console.log('editing me', label, onEditClick, onEditClick())
}}>
<button className={classes.buttonEdit}>
<PencilIcon size={1.1} color={Color(theme.primary).set('rgb.g', 200).hex()} />
<PencilIcon size={1.1} color={theme.green} />
</button>
</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,
}
})
+116 -193
View File
@@ -12,16 +12,7 @@ export default {
component: DAGAutomationFlow,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
dims: {
nodeHeight: dgconst.NODE_HEIGHT,
nodeWidth: dgconst.NODE_WIDTH,
distanceFactor: dgconst.DISTANCE_FACTOR,
circleSize: dgconst.CIRCLE_SIZE,
padding: {
x: dgconst.PADDING,
y: dgconst.PADDING,
},
}
dims: dgconst.DEFAULT_DIMS
}
} as ComponentMeta<typeof DAGAutomationFlow>
@@ -29,8 +20,8 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
const [state, setState] = useState({
trigger: args.trigger,
sequence: args.sequence,
condition: args.condition,
})
console.log(state)
return <div className="page">
<DAGAutomationFlow
{...args}
@@ -40,6 +31,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
setState({ ...state, trigger })
}}
onSequenceUpdate={sequence => setState({ ...state, sequence })}
onConditionUpdate={condition => setState({ ...state, condition })}
/>
</div>
}
@@ -47,55 +39,41 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
export const Simple = Template.bind({})
Simple.args = {
...Simple.args,
condition: [],
trigger: [
{
"$smType": undefined,
"platform": "numeric_state",
"entity_id": "test",
},
{
"$smType": undefined,
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
$smType: "condition",
condition: 'and',
condition_data: {
conditions: [
{
$smType: 'condition',
condition: 'numeric_state',
condition_data: {
entity_id: 'sensor.temperature_kitchen',
below: '15',
}
},
{
$smType: "condition",
condition: 'template',
condition_data: {
value_template: 'states(switch.kitchen_light) == "on"'
}
}
]
}
conditions: [
{
condition: 'numeric_state',
entity_id: 'sensor.temperature_kitchen',
below: '15',
},
{
condition: 'template',
value_template: 'states(switch.kitchen_light) == "on"'
}
]
},
{
$smType: "action",
action: "service",
action_data: {
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",
}
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",
}
}
]
@@ -105,178 +83,123 @@ Simple.args = {
export const Complex = Template.bind({})
Complex.args = {
...Complex.args,
condition: [],
trigger: [
{
"$smType": undefined,
"platform": "numeric_state",
"entity_id": "test",
},
{
"$smType": undefined,
"platform": "homeassistant",
"event": "start",
}
],
sequence: [
{
"$smType": "condition",
"condition": "and",
"condition_data": {
"conditions": [
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"entity_id": "sensor.temperature_kitchen",
"below": "15"
}
},
{
"$smType": "condition",
"condition": "template",
"condition_data": {
"value_template": "states(switch.kitchen_light) == \"on\""
}
}
]
}
},
{
"$smType": "action",
"action": "service",
"action_data": {
"alias": "Start Music In Kitchen",
"service": "media_player.play_media",
"target": {
"entity_id": "media_player.kitchen_dot"
"conditions": [
{
"condition": "numeric_state",
"entity_id": "sensor.temperature_kitchen",
"below": "15"
},
"data": {
"media_content_id": "Good Morning",
"media_content_type": "SPOTIFY"
{
"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"
}
},
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [
{
"conditions": [
{
"$smType": "condition",
"condition": "state",
"condition_data": {
"entity_id": "lights.bathroom",
"state": "off",
}
}
],
"sequence": [
{
"$smType": "action",
"action": "service",
"action_data": {
"service": "light.turn_on",
"target": {
"entity_id": "lights.bathroom"
},
"data": {}
}
},
{
"$smType": "action",
"action": "service",
"action_data": {
"alias": "Turn off bedroom",
"service": "light.turn_off",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
}
}
]
},
{
"conditions": [
{
"$smType": "condition",
"condition": "state",
"condition_data": {
"entity_id": "lights.bedroom",
"state": "off",
}
}
],
"sequence": [
{
"$smType": "action",
"action": "service",
"action_data": {
"alias": "Turn on bedroom",
"service": "light.turn_on",
"target": {
"entity_id": "lights.bedroom"
},
"data": {}
}
},
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [
{
"conditions": [],
"sequence": [
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [],
"default": [],
}
}
]
}
],
"default": [
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [],
"default": [],
}
}
],
}
}
]
}
],
"default": [
{
"$smType": "action",
"action": "service",
"action_data": {
"service": "light.turn_off",
"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": {}
}
]
},
{
"$smType": "condition",
"condition": "and",
"condition_data": {
"conditions": []
}
"conditions": []
}
]
}
@@ -284,7 +207,7 @@ Complex.args = {
export const EmptyStart = Template.bind({})
EmptyStart.args = {
...EmptyStart.args,
trigger: [
],
condition: [],
trigger: [],
sequence: []
}
+34 -25
View File
@@ -5,13 +5,15 @@ import { AutomationSequenceNode } from "types/automations";
import { AutomationTrigger } from 'types/automations/triggers';
import { triggerToFlow } from "./triggerConvertor";
import { DAGNode } from "./DAGNode";
import { DAGAutomationFlowDims, FlowData, ModalState } from './types';
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,
@@ -20,19 +22,23 @@ const nodeTypes = {
interface Props {
className?: string;
sequence: AutomationSequenceNode[];
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,
sequence,
trigger,
condition,
sequence,
onTriggerUpdate,
onSequenceUpdate,
onConditionUpdate,
dims,
}) => {
// state
@@ -53,17 +59,21 @@ export const DAGAutomationFlow: FC<Props> = ({
modalBody = <MultiNodeEditor
sequence={modalState.node}
onClose={() => setModalState(null)}
onSave={(n) => {
modalState.update(n as any);
setModalState(null);
}}
onSave={(n) => modalState.update(n as any)}
allowedTypes={['condition']}
/>
}
}
// convert automation to flow data
const condPoint = makeConditionPoint(dims);
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: [],
@@ -72,8 +82,7 @@ export const DAGAutomationFlow: FC<Props> = ({
onAdd: () => onTriggerUpdate([
...trigger, {
platform: 'event',
$smType: 'trigger',
event_type: 'test',
event_type: '',
}
]),
onDelete: i => onTriggerUpdate([
@@ -95,7 +104,12 @@ export const DAGAutomationFlow: FC<Props> = ({
flowData,
sequence,
condPoint.id,
dims,
{
...dims, padding: {
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
y: dims.padding.y,
}
},
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
);
@@ -119,18 +133,13 @@ export const DAGAutomationFlow: FC<Props> = ({
</>;
}
const makeConditionPoint = ({
padding,
nodeWidth,
nodeHeight,
circleSize,
}: DAGAutomationFlowDims) => ({
id: `c`,
type: 'dagcircle',
position: { x: padding.x + nodeWidth * 2, y: padding.y + nodeHeight * 0.25 },
data: {
size: circleSize,
backgroundColor: 'blue',
}
const makeOnEditAutomationConditions = (
conditions: AutomationCondition[],
updateConditions: (c: AutomationCondition[]) => void,
openModal: UpdateModalState,
) => () => openModal({
single: false,
node: conditions,
allowedTypes: ['condition'],
update: c => updateConditions(c as any),
})
@@ -5,6 +5,8 @@ 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 = (
@@ -34,8 +36,8 @@ export const sequenceToFlow = (
};
}
// draw node
if (node.$smType === 'action') {
if (node.action === 'choose') {
if (getNodeType(node) === 'action') {
if ('choose' in node) {
position = addChooseNode(flowData, node, position, nodeId, dims, updater, i)
} else {
addSingleNode(flowData, node, position, nodeId, dims, {
@@ -55,13 +57,19 @@ export const sequenceToFlow = (
lasPos = position;
}
// add button
const addCircle = makeFlowCircle(
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 / 2
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
},
{ onAdd: updater.addNode, size: dims.circleSize, disableSource: true, }
dims,
updater.addNode,
false,
)
flowData.nodes.push(addCircle)
addEdge(flowData, lastPointId, addCircle.id, false)
@@ -102,7 +110,7 @@ const addSingleNode = (
label: getDescriptionFromAutomationNode(node),
height: nodeHeight,
width: nodeWidth,
color: node.$smType === 'action' ? 'green' : 'blue',
color: getNodeType(node) === 'action' ? 'green' : 'blue',
hasInput: true,
...opts,
},
@@ -126,15 +134,14 @@ const addChooseNode = (
});
let lastPos: XYPosition = position;
// conditions
node.action_data.choose.forEach(({ sequence, conditions }, j) => {
node.choose.forEach(({ sequence, conditions }, j) => {
const sequenceId = `${nodeId}.${j}`;
// edit/delete circle
const circle = makeFlowCircle(`${sequenceId}>cond`, {
const circle = makeFlowCircle(`${sequenceId}>delete`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
}, {
size: dims.circleSize * dims.distanceFactor,
onEdit: updater.makeOnEditConditionsForChooseNode(i, j),
size: dims.circleSize,
onRemove: createOnRemoveForChooseNode(
node,
d => updater.updateNode(i, d),
@@ -143,12 +150,25 @@ const addChooseNode = (
})
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, circle.id, {
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
y: circle.position.y,
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
y: condNode.position.y - dims.conditionHeight / 2,
},
}, updater.makeChildUpdaterForChooseAction(i, j), `${sequenceId}.`);
if (lastPoint.position) {
@@ -157,47 +177,43 @@ const addChooseNode = (
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
}
})
const totalChildren = node.action_data.choose.length;
const totalChildren = node.choose.length;
// add button
const addCirlce = makeFlowCircle(
`${nodeId}>add`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
const addCirlce = makeAddButton(
`${nodeId}>add`,
{
size: dims.circleSize * dims.distanceFactor,
onAdd: () => updater.updateNode(i, {
...node,
action_data: {
...node.action_data,
choose: [
...node.action_data.choose,
{
sequence: [],
conditions: [],
}
]
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
},
dims,
() => updater.updateNode(i, {
...node,
choose: [
...node.choose,
{
sequence: [],
conditions: [],
}
}),
disableSource: true,
}
]
}),
false,
);
flowData.nodes.push(addCirlce)
addEdge(flowData, nodeId, addCirlce.id, true)
// default
// else
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
x: position.x + dims.nodeWidth * dims.distanceFactor,
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
}, { size: dims.circleSize * dims.distanceFactor })
}, { size: dims.circleSize })
flowData.nodes.push(elseCircle)
addEdge(flowData, nodeId, elseCircle.id, true)
const lastPoint = sequenceToFlow(flowData, node.action_data.default, elseCircle.id, {
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
...dims,
padding: {
x: position.x - dims.nodeWidth,
y: elseCircle.position.y,
y: elseCircle.position.y - dims.circleSize / 4,
},
}, updater.makeChildUpdaterForChooseAction(i, null), `${nodeId}.${totalChildren}.`)
if (lastPoint.position) {
+14 -22
View File
@@ -1,12 +1,12 @@
import { Styles } from "jss";
import Color from 'chroma-js';
import { createAppUseStyles } from "styles/theme";
import { Node } from "types/graphs";
import { NodeColor } from "types/graphs";
export const useNodeStyles = createAppUseStyles<{
color: Node['color'],
color: NodeColor,
nodeHeight: number,
nodeWidth: number,
accentBackground: boolean,
}>(theme => {
const edgeStyle: Styles = {
flex: '1',
@@ -41,11 +41,12 @@ export const useNodeStyles = createAppUseStyles<{
width: nodeWidth,
fontSize: 10,
}),
inner: ({ color }) => ({
inner: ({ color, accentBackground }) => ({
position: 'relative',
display: 'flex',
flexDirection: 'row',
backgroundColor: theme.secondary,
backgroundColor: !accentBackground ? theme.secondary :
color === 'lblue' ? theme.condition.primaryColorOpaque : 'none',
borderRadius: '1em',
flex: 1,
height: `100%`,
@@ -57,10 +58,11 @@ export const useNodeStyles = createAppUseStyles<{
borderTopStyle: 'solid',
borderTopLeftRadius: '10px',
borderTopRightRadius: '10px',
borderTopColor: color === 'red' ? Color(theme.secondary).set('rgb.r', 125).hex() :
color === 'blue' ? Color(theme.secondary).set('rgb.b', 125).hex() :
color === 'green' ? Color(theme.secondary).set('rgb.g', 125).hex() :
'none'
borderTopColor: color === 'red' ? theme.redAccent :
color === 'blue' ? theme.condition.primaryColor :
color === 'green' ? theme.green :
color === 'lblue' ? theme.condition.primaryAccent :
'none'
}),
textWrap: {
display: 'flex',
@@ -112,13 +114,14 @@ export const useCircleStyles = createAppUseStyles<{
backgroundColor?: string,
}>(theme => ({
root: ({ size, hasOnFunction, hasRemoveFunction, backgroundColor }) => {
const baseColor = backgroundColor ? backgroundColor : Color(theme.primary).set('rgb.g', 100).hex();
const hoverColor = (hasOnFunction && !hasRemoveFunction) ? Color(theme.primary).set('rgb.g', 150).hex() : baseColor
const baseColor = backgroundColor ? backgroundColor : theme.green;
const hoverColor = hasOnFunction ? theme.greenOpaque : baseColor
return {
backgroundColor: baseColor,
borderRadius: hasRemoveFunction ? 10 : 500,
height: size,
width: size,
color: theme.primary,
cursor: hasOnFunction ? "pointer" : 'default',
"&:hover": {
backgroundColor: hoverColor,
@@ -129,18 +132,7 @@ export const useCircleStyles = createAppUseStyles<{
alignItems: 'center',
}
},
icon: {
"&:hover": {
borderRadius: 500,
background: Color(theme.primary).set('rgb.g', 150).hex(),
}
},
trashIcon: {
padding: 1,
"&:hover": {
borderRadius: 500,
background: Color(theme.primary).set('rgb.g', 150).hex(),
cursor: 'pointer',
}
}
}))
@@ -1,20 +1,23 @@
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,
}: DAGAutomationFlowDims,
opts: TriggerMakerOptions,
) => {
conditionHeight,
} = dims;
// convert all triggers to dag nodes
trigger.forEach((t, i) => {
const flowId = `t-${i}`;
@@ -39,19 +42,13 @@ export const triggerToFlow = (
});
// create a 'add button'
flowData.nodes.push(makeFlowCircle(
flowData.nodes.push(makeAddButton(
'trigger-add',
{
x: padding.x + nodeWidth * 0.4,
y: padding.y + nodeHeight * distanceFactor * trigger.length,
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
},
{
size: circleSize,
backgroundColor: 'green',
onAdd: opts.onAdd,
disableSource: true,
disableTarget: true,
}
dims,
opts.onAdd
))
}
+3 -1
View File
@@ -3,13 +3,15 @@ import { AutomationSequenceNode } from 'types/automations';
import { DAGCircleProps } from './DAGCircle';
import { DAGNodeProps } from './DAGNode';
import { AutomationTrigger } from 'types/automations/triggers';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors';
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
export type DAGAutomationFlowDims = {
padding: XYPosition;
nodeHeight: number;
nodeWidth: number;
conditionWidth: number;
conditionHeight: number;
circleSize: number;
distanceFactor: number;
}
+21 -35
View File
@@ -27,44 +27,33 @@ const mockSequenceUpdater = (defaultState: AutomationSequenceNode[] = []) => {
test("sequence updater updates nodes", () => {
const mock = mockSequenceUpdater([
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
]);
expect(mock.state.length).toBe(1)
expect((mock.state[0] as ChooseAction).action_data.alias).toBe(undefined)
expect((mock.state[0] as ChooseAction).alias).toBe(undefined)
mock.updater.updateNode(0, {
...mock.state[0],
action_data: {
...(mock.state[0] as ChooseAction).action_data,
alias: "Hello"
}
} as any)
expect((mock.state[0] as ChooseAction).action_data.alias).toBe("Hello")
alias: "Hello"
})
expect(mock.state[0].alias).toBe("Hello")
})
test('update conditions for node', () => {
const mock = mockSequenceUpdater([
{
"$smType": "action",
"action": "choose",
"action_data": {
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
"choose": [
{
"conditions": [],
"sequence": [],
}
],
"default": [],
}
]);
mock.updater.makeOnEditConditionsForChooseNode(0, 0)();
@@ -73,13 +62,10 @@ test('update conditions for node', () => {
expect((mock.modalStates[0].node as AutomationSequenceNode[]).length).toBe(0)
mock.modalStates[0].update([
{
"$smType": "condition",
"condition": "and",
"condition_data": {
"conditions": [],
}
"conditions": [],
}
] as any)
expect((mock.state[0] as ChooseAction).action_data.choose[0].conditions.length).toBe(1)
expect((mock.state[0] as ChooseAction).action_data.choose[0].conditions[0].condition).toBe("and")
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")
})
+30 -46
View File
@@ -23,12 +23,8 @@ export const makeSequenceUpdater = (
single: true,
saveBtnCreateText: true,
node: {
$smType: 'action',
action: 'choose',
action_data: {
choose: [],
default: [],
}
choose: [],
default: [],
},
update: n => onChange([
...sequence,
@@ -44,44 +40,38 @@ export const makeSequenceUpdater = (
...sequence.slice(i + 1),
])
},
updateChooseActionData(i: number, data: ChooseAction['action_data']) {
updateChooseActionData(i: number, data: ChooseAction) {
const node = sequence[i] as ChooseAction;
return this.updateNode(i, {
...node,
action_data: data,
...data,
})
},
makeChildUpdaterForChooseAction(i: number, j: number | null) {
const node = sequence[i];
if ((node.$smType === 'action') && (node.action === 'choose')) {
if ('choose' in node) {
if (j !== null) {
return makeSequenceUpdater(
node.action_data.choose[j].sequence,
node.choose[j].sequence,
seq => this.updateNode(i, {
...node,
action_data: {
...node.action_data,
choose: [
...node.action_data.choose.slice(0, j),
{
...node.action_data.choose[j],
sequence: seq,
},
...node.action_data.choose.slice(j + 1),
]
}
choose: [
...node.choose.slice(0, j),
{
...node.choose[j],
sequence: seq,
},
...node.choose.slice(j + 1),
]
}),
openModal,
)
} else {
return makeSequenceUpdater(
node.action_data.default,
node.default,
seq => this.updateNode(i, {
...node,
action_data: {
...node.action_data,
default: seq
}
default: seq
}),
openModal,
)
@@ -108,25 +98,22 @@ export const makeSequenceUpdater = (
const node = sequence[i] as ChooseAction;
return openModal({
single: false,
node: node.action_data.choose[j].conditions,
node: node.choose[j].conditions,
allowedTypes: ['condition'],
update: conditions => this.updateNode(i, {
...node,
action_data: {
...node.action_data,
choose: [
...node.action_data.choose.slice(0, j),
{
sequence: node.action_data.choose[j].sequence,
conditions: conditions as AutomationCondition[],
},
...node.action_data.choose.slice(j + 1),
]
}
choose: [
...node.choose.slice(0, j),
{
sequence: node.choose[j].sequence,
conditions: conditions as AutomationCondition[],
},
...node.choose.slice(j + 1),
]
}),
})
}
}
},
});
@@ -136,11 +123,8 @@ export const createOnRemoveForChooseNode = (
j: number
) => () => update({
...action,
action_data: {
...action.action_data,
choose: [
...action.action_data.choose.slice(0, j),
...action.action_data.choose.slice(j + 1),
]
}
choose: [
...action.choose.slice(0, j),
...action.choose.slice(j + 1),
]
})
+8 -4
View File
@@ -1,18 +1,22 @@
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
export const NODE_WIDTH = 150 as const;
export const NODE_HEIGHT = 60 as const;
export const ADD_HEIGHT = 10 as const;
export const ADD_WIDTH = 10 as const;
export const CIRCLE_SIZE = 30 as const;
export const CONDITION_HEIGHT = 30 as const;
export const CONDITION_WIDTH = 120 as const;
export const CIRCLE_SIZE = 40 as const;
export const DISTANCE_FACTOR = 1.5 as const;
export const PADDING = 50 as const;
export const DEFAULT_DIMS = {
nodeHeight: NODE_HEIGHT,
nodeWidth: NODE_WIDTH,
conditionHeight: CONDITION_HEIGHT,
conditionWidth: CONDITION_WIDTH,
distanceFactor: DISTANCE_FACTOR,
circleSize: CIRCLE_SIZE,
padding: {
x: PADDING,
y: PADDING,
},
}
} as DAGAutomationFlowDims
@@ -1,7 +1,7 @@
import { ComponentStory } from "@storybook/react";
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";
export default {
@@ -19,6 +19,7 @@ export const IconList: ComponentStory<typeof IconBase> = (args) => {
<TrashIcon {...args} />
<InfoIcon {...args} />
<ZoomIcon {...args} />
<GearIcon {...args} />
</div>
}
IconList.args = {
+13
View File
@@ -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" />
</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>
@@ -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";
export interface Props {
@@ -10,12 +11,8 @@ export default function InputBoolean({
value = false,
onChange,
}: Props) {
return <InputWrapper label={label}>
<span className="checkbox" onClick={e => {
e.preventDefault()
onChange(!value)
}}>
{value ? '✔️' : ' '}
</span>
</InputWrapper>
return <div className="input-boolean" onClick={() => onChange(!value)}>
<input type="checkbox" checked={value} onChange={() => { }} />
<label>{label}</label>
</div>
}
@@ -1,7 +1,7 @@
import { ComponentMeta, ComponentStory } from "@storybook/react";
import { useState } from "react";
import { useState, useEffect } from 'react';
import InputList from "./InputList";
import { InputList } from "./InputList";
export default {
title: 'Inputs/InputList',
@@ -12,7 +12,12 @@ export default {
const Template: ComponentStory<typeof InputList> = args => {
const [value, setValue] = useState('')
const [value, setValue] = useState(args.current);
useEffect(() => {
if (value !== args.current) {
setValue(args.current)
}
}, [args.current])
return <div className="page">
<InputList {...args} current={value} onChange={setValue} />
</div>
@@ -27,3 +32,15 @@ SimpleText.args = {
"Toots"
]
}
export const InvalidSelection = Template.bind({})
InvalidSelection.args = {
current: "Derek",
label: "Entity ID",
options: [
'Bob',
'Martin',
"Toots"
]
}
+23 -6
View File
@@ -1,3 +1,4 @@
import { FC } from "react";
import InputWrapper from "./InputWrapper";
import { useInputListStyles } from "./styles";
@@ -10,21 +11,37 @@ export interface Props<T extends string> {
className?: string;
label: string;
}
export default function InputList<T extends string>({
export const InputList: FC<Props<any>> = ({
current, options, onChange, label,
...selattr
}: Props<T>) {
const { classes } = useInputListStyles({});
return <InputWrapper label={label} labelSize={'small'} noMargin>
}) => {
const invalidCurrent = !options.includes(current);
const { classes } = useInputListStyles({
invalidCurrent
});
return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}>
<select
title={invalidCurrent ? "Invalid Selection" : ""}
className={classes.input}
{...selattr} value={current}
onChange={e => {
e.preventDefault();
onChange(e.currentTarget.value as any);
console.log(e.currentTarget.id)
console.log(e.currentTarget.value)
console.log(e.currentTarget.innerHTML)
if (e.currentTarget.id === 'invalid') {
onChange(options[0])
} else {
onChange(e.currentTarget.value as any);
}
}}
>
{options.map((t, i) => <option id={String(i)} key={i}>{t}</option>)}
{options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
{invalidCurrent ? <option
id={'invalid'}
value={current}
style={{ display: 'none' }}
>!{current}!</option> : <></>}
</select>
</InputWrapper>
}
@@ -9,6 +9,7 @@ export interface Props {
value: string;
onChange: (v: string) => void;
additionalTooltipFilters?: Record<string, string>;
error?: string;
resizable?: boolean;
}
export default function InputTextArea({
@@ -16,13 +17,14 @@ export default function InputTextArea({
textBoxFor,
value = "",
onChange,
error,
additionalTooltipFilters = {},
resizable = false,
}: Props) {
const { classes } = useInputTextAreaStyles({ resizable });
const tooltip = useToolTip();
const [isFocused, setIsFocused] = useState(false)
return <InputWrapper label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
return <InputWrapper error={error} label={label} labelSize={(value === '') && !isFocused ? 'normal' : 'small'}>
<textarea
className={classes.input}
value={value}
@@ -7,12 +7,14 @@ export interface Props {
labelSize?: 'normal' | 'small';
noMargin?: boolean;
className?: string;
error?: string;
}
const InputWrapper: FC<Props> = ({ label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
const { classes } = useInputWrapperStyles({ labelSize, noMargin })
const InputWrapper: FC<Props> = ({ error, label, children, labelSize = 'normal', noMargin = false, className = "" }) => {
const { classes } = useInputWrapperStyles({ labelSize, noMargin, hasError: !!error })
return <div className={[classes.wrapper, className].join(" ")}>
<label className={classes.label}>{label}</label>
{children}
<span className={classes.error}>{error}</span>
</div>
}
export default InputWrapper;
+28 -15
View File
@@ -1,6 +1,7 @@
import * as yaml from "js-yaml";
import { useEffect, useRef, useState } from "react";
import { useState } from "react";
import InputTextArea from "./InputTextArea";
import { useDelayedFunction, useDelayEffect } from 'utils/useDelay';
export interface Props<T extends {}> {
label: string;
@@ -14,25 +15,37 @@ export default function InputYaml<T>({
onChange,
resizable,
}: Props<T>) {
const [text, setText] = useState("");
useEffect(() => {
setText(yaml.dump(value));
}, [value]);
const delayId = useRef<null | number>(null);
const delayedUpdate = (update: string) => {
setText(update)
if (delayId.current) {
window.clearTimeout(delayId.current);
delayId.current = null;
const [{ text, error }, setState] = useState<{
text: string,
error: undefined | string,
}>({
text: yaml.dump(value),
error: undefined
});
const setText = (t: string) => {
try {
console.log(yaml.dump(yaml.load(t)));
setState({ text: t, error: undefined })
} catch (_) {
setState({ text: t, error: "! Invalid Yaml !" })
}
delayId.current = window.setTimeout(() => {
onChange(yaml.load(update) as any)
}, 1000);
}
useDelayEffect(() => {
if (!error && (yaml.dump(value) !== text)) {
if (text) {
onChange(yaml.load(text) as any)
} else if (Array.isArray(value)) {
onChange([] as any)
} else {
onChange({} as any)
}
}
}, [text], 1000)
return <InputTextArea
error={error}
label={label}
value={text}
onChange={delayedUpdate}
onChange={setText}
resizable={resizable}
/>
}
+24 -11
View File
@@ -1,5 +1,4 @@
import { createAppUseStyles, AppTheme } from "styles/theme";
import Color from 'chroma-js';
const commonInputStyle = (theme: AppTheme) => ({
input: {
@@ -36,6 +35,7 @@ export const useButtonStyles = createAppUseStyles<{}>(theme => ({
export const useInputWrapperStyles = createAppUseStyles<{
labelSize: 'normal' | 'small',
noMargin: boolean,
hasError: boolean,
}>(theme => {
return {
wrapper: ({ noMargin }) => ({
@@ -52,7 +52,16 @@ export const useInputWrapperStyles = createAppUseStyles<{
top: labelSize === 'normal' ? '0.5em' : '0.25em',
fontWeight: 'bold',
color: theme.primaryAccent,
})
}),
error: ({ hasError }) => (hasError ? {
textAlign: 'center',
color: theme.red,
padding: '0.25em',
border: `1px solid ${theme.red}`,
borderTop: 'none',
borderBottomRightRadius: 5,
borderBottomLeftRadius: 5,
} : {})
}
})
@@ -112,13 +121,17 @@ export const useInputNumberStyles = createAppUseStyles<{}>(theme => {
}
});
export const useInputListStyles = createAppUseStyles<{}>(theme => {
export const useInputListStyles = createAppUseStyles<{
invalidCurrent: boolean;
}>(theme => {
const styles = commonInputStyle(theme);
return {
input: {
input: ({ invalidCurrent }) => ({
...styles.input,
cursor: 'pointer'
}
cursor: 'pointer',
borderColor: invalidCurrent ? theme.redAccent : styles.input.borderColor,
color: invalidCurrent ? theme.redLight : styles.input.color,
}),
}
});
@@ -251,8 +264,8 @@ export const useInputBubblesStyles = createAppUseStyles<{}>(theme => ({
position: 'relative',
border: `1px solid ${theme.primaryAccent}`,
borderRadius: 10,
backgroundColor: Color(theme.primary).set('rgb.g', 150).alpha(0.35).hex(),
color: Color(theme.primary).brighten(5).hex(),
backgroundColor: theme.greenOpaque,
color: theme.primaryLight,
fontSize: 16,
marginLeft: 1,
@@ -262,8 +275,8 @@ export const useInputBubblesStyles = createAppUseStyles<{}>(theme => ({
cursor: 'pointer',
"&:hover": {
backgroundColor: Color(theme.primary).set('rgb.r', 150).alpha(0.35).hex(),
color: Color(theme.primary).brighten(5).alpha(0.35).hex(),
backgroundColor: theme.redOpaque,
color: theme.primaryLightOpaque,
},
"&:hover $deleteIcon": {
@@ -291,7 +304,7 @@ export const useInputBubblesStyles = createAppUseStyles<{}>(theme => ({
padding: "3px 7px",
"&:hover": {
borderRadius: 100,
backgroundColor: Color(theme.primary).set('rgb.g', 150).alpha(0.35).hex(),
backgroundColor: theme.greenOpaque,
borderColor: theme.secondaryAccent,
},
}
+1 -2
View File
@@ -1,6 +1,5 @@
import { FC } from "react";
import { createAppUseStyles } from "styles/theme";
import Color from 'chroma-js';
export interface ModalStyleProps {
open: boolean;
@@ -26,7 +25,7 @@ const useModalStyle = createAppUseStyles<ModalStyleProps>(theme => ({
width: '100vw',
top: 0,
left: 0,
backgroundColor: Color(theme.secondary).alpha(0.5).hex(),
backgroundColor: theme.secondaryOpaque,
},
inner: {
zIndex: 10,
@@ -0,0 +1,19 @@
.multinode-editor {
max-width: 80vw;
}
.multinode-editor--navbar {
display: flex;
flex-direction: row;
justify-content: space-evenly;
align-items: center;
min-width: 20vw;
}
.multinode-editor.modded>.multinode-editor--navbar * {
border-color: var(--green-light);
}
.multinode-editor.modded .multinode-editor--total {
color: var(--green-light)
}
@@ -10,39 +10,41 @@ export default {
component: MultiNodeEditor,
parameters: { actions: { argTypesRegex: '^on.*' } },
args: {
allowedTypes: ['action', 'condition', 'trigger'],
sequence: [
{
"$smType": "condition",
"condition": "numeric_state",
"condition_data": {
"entity_id": [
"sensor.kitchen_humidity"
],
"conditions": [],
"above": "40"
}
"entity_id": [
"sensor.kitchen_humidity"
],
"conditions": [],
"above": "40"
},
{
"$smType": "condition",
"condition": "template",
"condition_data": {
"value_template": "states('switch.kitchen') == 'on'"
}
"value_template": "states('switch.kitchen') == 'on'"
}
]
}
} as ComponentMeta<typeof MultiNodeEditor>
export const Simple: ComponentStory<typeof MultiNodeEditor> = args => {
const [state, setState] = useState(args.sequence);
return <div className="page">
<MultiNodeEditor {...args} />
<div className="center column" style={{ paddingTop: "1em" }}>
<MultiNodeEditor {...args} sequence={state} onSave={s => {
args.onSave && args.onSave(s)
setState(s)
}} />
</div>
</div>
}
export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
const [open, setOpen] = useState(false);
const [state, setState] = useState(props.sequence);
console.log({ state })
return <div className="page">
<Button onClick={() => setOpen(!open)}>Open Editor</Button>
<Modal open={open}>
@@ -50,8 +52,19 @@ export const InAModal: ComponentStory<typeof MultiNodeEditor> = props => {
{...props}
sequence={state}
onClose={() => setOpen(!open)}
onSave={setState}
onSave={s => {
props.onSave && props.onSave(s)
setState(s)
}}
/>
</Modal>
</div>
};
export const EmptyConditionEditor = Simple.bind({})
EmptyConditionEditor.args = {
...EmptyConditionEditor.args,
allowedTypes: ['condition'],
sequence: [],
}
+23 -136
View File
@@ -1,117 +1,22 @@
import { FC, useState } from 'react';
import { AutomationNode, AutomationNodeMapping } from 'types/automations';
import "./index.css";
import { FC } from 'react';
import { NodeEditor } from 'components/NodeEditor';
import { Button } from 'components/Inputs/Button';
import { AutomationTriggerDevice } from 'types/automations/triggers';
import { useMultiNodeEditorState } from "./state";
import { MultiNodeEditorProps } from "./types";
const makeDefault = (nodeType: keyof AutomationNodeMapping): AutomationNode => {
switch (nodeType) {
case 'action':
return {
$smType: 'action',
action: "service",
action_data: {
'data': {},
'service': '',
'target': {},
}
}
case 'condition':
return {
$smType: 'condition',
condition: 'and',
condition_data: {
conditions: []
}
}
default:
return {
platform: 'device',
device_id: '',
domain: '',
type: '',
subtype: '',
} as AutomationTriggerDevice
}
}
export interface MultiNodeEditorProps {
sequence: AutomationNode[];
allowedTypes?: Array<keyof AutomationNodeMapping>;
onClose?: () => void;
onSave?: (n: AutomationNode[]) => void;
}
export const MultiNodeEditor: FC<MultiNodeEditorProps> = ({
sequence: initialState,
allowedTypes = ['action', 'condition'],
onClose = () => { },
onSave = () => { },
}) => {
export const MultiNodeEditor: FC<MultiNodeEditorProps> = props => {
// state
const [{ slide, state, isNodeModified, isModified, isReady }, setState] = useState({
slide: 0,
state: initialState,
isModified: false,
isNodeModified: false,
isReady: true,
})
// alias
const areYouSureItsModified = () => isNodeModified ?
window.confirm("You've made changes, by pressing this you will lose them!") :
true
const areYouSureItsNotReady = () => !isReady ?
window.confirm("The node is not ready, are you sure you want to move?") :
true
const onAdd = () => setState({
slide: state.length,
state: [...state, makeDefault(allowedTypes[0])],
isNodeModified: false,
isReady,
isModified: true,
});
const onRemove = () => setState({
slide: slide > 0 ? slide - 1 : 0,
state: [...state.slice(0, slide), ...state.slice(slide + 1)],
isNodeModified: false,
isReady,
isModified: true,
});
const onNodeSave = (n: AutomationNode) => setState({
slide,
state: [...state.slice(0, slide), n, ...state.slice(slide + 1)],
isNodeModified: false,
isReady,
isModified: true,
});
const onSaveAll = () => isNodeModified ?
window.alert("Please save the node data first!") :
onSave(state)
const onNextOrAdd = () => {
if (!areYouSureItsModified()) {
return
}
if (!areYouSureItsNotReady()) {
return
}
if (slide >= state.length - 1) {
onAdd()
} else {
setState({ slide: slide + 1, state, isNodeModified, isReady, isModified, })
}
}
const onBack = () => areYouSureItsModified() &&
areYouSureItsNotReady() &&
setState({ slide: slide - 1, state, isNodeModified, isReady, isModified, })
const state = useMultiNodeEditorState(props)
// components
const nextOrAddBtn = <Button
onClick={onNextOrAdd}
onClick={state.moveForward}
>
{(slide < state.length - 1) ? ">>" : "+"}
{!state.isLast ? ">>" : "+"}
</Button>;
// branch
if (state.length === 0) {
if (state.isEmpty) {
return <div className='column center' style={{
minWidth: '20vw',
}}>
@@ -124,44 +29,26 @@ export const MultiNodeEditor: FC<MultiNodeEditorProps> = ({
{nextOrAddBtn}
</div>
<div className='column center' style={{ marginTop: '1em' }}>
<Button onClick={() => areYouSureItsModified() && onClose()}>Close</Button>
<Button onClick={state.onClose}>Close</Button>
</div>
</div>
}
return <>
<div style={{
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-evenly',
alignItems: 'center',
minWidth: '20vw',
}}>
<Button onClick={onBack} disabled={slide === 0}>{"<<"}</Button>
<Button
onClick={onRemove}
>
Delete
</Button>
return <div className={["multinode-editor", state.isModified ? "modded" : ''].join(' ')}>
<div className="multinode-editor--navbar">
<Button onClick={state.moveBack} disabled={state.currentSlideNumber === 0}>{"<<"}</Button>
<Button onClick={state.onRemove}> Delete</Button>
{nextOrAddBtn}
</div>
<NodeEditor
key={slide}
node={state[slide]}
allowedTypes={allowedTypes}
onClose={onClose}
onSave={onNodeSave}
onFlags={
(ir, inm) => ((inm !== isNodeModified) || (ir !== isReady)) &&
setState({ slide, state, isNodeModified: inm, isReady: ir, isModified })
}
>
<Button onClick={onSaveAll} style={{
borderColor: isModified ? "var(--change)" : undefined,
color: isModified ? "var(--change)" : undefined,
}}>Save All</Button>
</NodeEditor>
key={state.currentSlideNumber}
node={state.currentSlide}
allowedTypes={props.allowedTypes}
onClose={state.onClose}
onSave={state.onSave}
onFlags={state.updateInternalNode}
/>
<div className='column center'>
<span>{slide + 1}/{state.length}</span>
<span>{state.currentSlideNumber + 1}/<u className="multinode-editor--total">{state.totalSlides}</u></span>
</div>
</>
</div>
}
@@ -0,0 +1,154 @@
import { MultiNodeEditorProps } from "./types";
import { useState, useRef } from 'react';
import { AutomationNode } from '../../types/automations/index';
import { makeDefault } from "utils/automations";
export type MultiNodeEditorInternalState = {
slides: AutomationNode[];
slide: number;
multiNode: {
isModified: boolean,
isSaved: boolean,
},
internalNodeModified: boolean,
};
export const useMultiNodeEditorState = (props: MultiNodeEditorProps) => {
const [state, _setState] = useState(makeInitialState({
slides: props.sequence
}))
const justSaved = useRef(false);
const {
slide,
slides,
multiNode,
internalNodeModified,
} = state;
const setState = (a: MultiNodeEditorInternalState) => {
console.log('setting state', a)
_setState(a)
}
return {
get totalSlides() {
return slides.length
},
get currentSlideNumber() {
return slide
},
get currentSlide() {
return slides[slide]
},
get isLast() {
return slide >= slides.length - 1
},
get isEmpty() {
return slides.length === 0
},
get isModified() {
return (internalNodeModified || multiNode.isModified) && !multiNode.isSaved
},
moveBack() {
if (slide <= 0) {
return
}
if (internalNodeModified && !multiNode.isSaved) {
if (!window.confirm("Moving back without saving will cause you to lose the work, are you sure you want to do that?")) {
return
}
}
setState({ ...state, slide: slide - 1, internalNodeModified: false, })
},
moveForward() {
const createNew = slide >= slides.length - 1;
if (internalNodeModified && !multiNode.isSaved) {
const action = createNew ? 'Creating a new new node' : 'Moving forward'
if (!window.confirm(`${action} without saving will cause you to lose the work, are you sure you want to do that?`)) {
return
}
}
if (createNew) {
setState({
...state,
slide: slides.length,
slides: slides.concat([makeDefault(props.allowedTypes[0])]),
internalNodeModified: false,
multiNode: {
isModified: true,
isSaved: false,
}
})
} else {
setState({ ...state, slide: slide + 1, internalNodeModified: false, })
}
},
updateInternalNode(isReady: boolean, isModified: boolean) {
if (!isReady || isModified) {
if (!state.multiNode.isModified || state.multiNode.isSaved) {
if (justSaved.current) {
justSaved.current = false
} else {
setState({
...state,
multiNode: { isModified: true, isSaved: false, },
internalNodeModified: true,
})
}
}
}
},
onRemove() {
setState({
...state,
slide: Math.max(slide - 1, 0),
slides: slides
.slice(0, slide)
.concat(
slides.slice(slide + 1)
),
multiNode: {
isModified: multiNode.isModified,
isSaved: false,
}
})
},
onSave(node: AutomationNode) {
justSaved.current = true
setState({
...state,
slides: slides
.slice(0, slide)
.concat([node])
.concat(
slides.slice(slide + 1)
),
multiNode: {
isModified: multiNode.isModified,
isSaved: true,
},
internalNodeModified: false,
})
},
onClose() {
if (!multiNode.isSaved) {
if (!window.confirm("You haven't saved your work, are you ok with losing it?")) {
return
}
}
props.onSave && props.onSave(slides)
props.onClose && props.onClose()
}
}
}
const makeInitialState = (props: Partial<MultiNodeEditorInternalState>): MultiNodeEditorInternalState => ({
slides: [],
slide: 0,
multiNode: {
isModified: false,
isSaved: false,
},
internalNodeModified: false,
...props,
})
@@ -0,0 +1,8 @@
import { AutomationNode, AutomationNodeMapping } from "types/automations";
export interface MultiNodeEditorProps {
sequence: AutomationNode[];
allowedTypes: Array<keyof AutomationNodeMapping>;
onClose?: () => void;
onSave?: (n: AutomationNode[]) => void;
}
@@ -5,15 +5,11 @@ import { OptionManager, updateActionData } from './OptionManager';
export const ActionChooseState: OptionManager<ChooseAction> = {
defaultState: () => ({
$smType: 'action',
action: 'choose',
action_data: {
alias: "Choose",
default: [],
choose: [],
}
alias: "",
default: [],
choose: [],
}),
isReady: ({ action_data: { alias } }) => {
isReady: ({ alias }) => {
return alias !== ''
},
renderOptionList: (state, setState) => {
@@ -21,7 +17,7 @@ export const ActionChooseState: OptionManager<ChooseAction> = {
return <>
<InputText
label="Description"
value={state.action_data.alias ?? ""}
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
</>
@@ -5,24 +5,18 @@ import { OptionManager, updateActionData } from './OptionManager';
export const ActionDeviceState: OptionManager<DeviceAction> = {
defaultState: () => ({
$smType: 'action',
action: 'device',
action_data: {
alias: "Device",
type: "",
entity_id: "",
device_id: "",
domain: "",
}
alias: "",
type: "",
entity_id: "",
device_id: "",
domain: "",
}),
isReady: ({
action_data: {
alias,
type,
entity_id,
device_id,
domain,
}
alias,
type,
entity_id,
device_id,
domain,
}) => (
alias !== '' &&
type !== "" &&
@@ -35,25 +29,25 @@ export const ActionDeviceState: OptionManager<DeviceAction> = {
return <>
<InputText
label="Description"
value={state.action_data.alias ?? ""}
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputText
textBoxFor="device_id"
label="Device"
value={state.action_data.device_id}
value={state.device_id}
onChange={device_id => update({ device_id })}
/>
<InputText
textBoxFor="type"
label="Action"
value={state.action_data.type}
value={state.type}
onChange={type => update({ type })}
/>
<InputText
textBoxFor="entity_id"
label="Entity ID"
value={state.action_data.entity_id ?? ""}
value={state.entity_id ?? ""}
onChange={entity_id => update({ entity_id, domain: entity_id.split('.')[0] })}
/>
</>
@@ -6,15 +6,11 @@ import { OptionManager, updateActionData } from "./OptionManager";
export const ActionEventState: OptionManager<FireEventAction> = {
defaultState: () => ({
$smType: "action",
action: 'event',
action_data: {
alias: "Fire Event",
event: "",
event_data: {},
}
alias: "Fire Event",
event: "",
event_data: {},
}),
isReady: ({ action_data: { alias, event } }) => (
isReady: ({ alias, event }) => (
alias !== '' &&
event !== ""
),
@@ -23,18 +19,18 @@ export const ActionEventState: OptionManager<FireEventAction> = {
return <>
<InputText
label="Description"
value={state.action_data.alias ?? ""}
value={state.alias ?? ""}
onChange={alias => update({ alias })}
/>
<InputText
textBoxFor="event"
label="Event"
value={state.action_data.event}
value={state.event}
onChange={event => update({ event })}
/>
<InputYaml
label="Event Data"
value={state.action_data.event_data}
value={state.event_data}
onChange={event_data => update({ event_data })}
/>
</>
Loaded 100 of 137 files, more files were not shown because too many files have changed in this diff. Show more