Compare commits

...
47 Commits
Author SHA1 Message Date
ari f8f6d74d6a elipses 2022-08-18 11:21:51 -04:00
ari 819a76f8e3 minor ui tweaks 2022-08-18 11:01:45 -04:00
ari a391eae7c5 sync'd up 2022-08-18 10:50:11 -04:00
ari 7cb1a5d907 additional api refactor 2022-08-18 10:19:17 -04:00
ari 8792ed6ed8 displaying source file 2022-08-16 21:14:10 -04:00
ari 9bafbf4e8c removed upsert 2022-08-16 20:48:13 -04:00
ari c67d1bd32f - refactor for multi-config suport done
- added better errror captures
2022-08-16 11:40:30 -04:00
ari 55ea1e23a4 backend modified 2022-08-15 21:56:48 -04:00
ari d96c1fb953 tags 2022-08-15 21:23:51 -04:00
ari f8b59c6b17 tags 2022-08-15 19:50:24 -04:00
ari 02cbacabe0 clean up 2022-08-15 15:46:58 -04:00
ari b0d924f63a using sync process 2022-08-15 15:43:18 -04:00
ari 7aadfbc175 initial manager work 2022-08-14 16:50:58 -04:00
ari 08af01dd11 config watcher 2022-08-14 15:31:42 -04:00
ari 586f52ba56 rapid changes 2022-08-14 01:26:11 -04:00
ari e11f4deab5 watching folders 2022-08-14 01:07:19 -04:00
ari 579017d9ec automation path loader 2022-08-14 01:00:19 -04:00
ari a746c4db3a testing loader 2022-08-14 00:41:05 -04:00
ari 3a89fe5efc v2 initial work 2022-08-14 00:24:44 -04:00
ari 2bc7e11bb1 clean up 2022-08-08 21:24:24 -04:00
ari e6a835a5f3 minor clean up 2022-08-08 20:53:31 -04:00
ari 107def4fac fixed up calednar 2022-08-07 21:45:11 -04:00
ari 6b21734041 added scene support 2022-08-06 22:43:56 -04:00
ari 754cc2ef98 added more support for trigger types 2022-08-06 22:37:26 -04:00
ari 1cb40288b1 remove state for zone 2022-08-06 20:41:02 -04:00
ari 129ba28ff5 v0.5.3 2022-08-06 20:28:09 -04:00
Ari Sosnovsky 44e246f79b Update README.md 2022-08-06 20:22:34 -04:00
ari 8bcbcaa801 added a redirect 2022-08-06 20:03:10 -04:00
ari b479476833 fixed up invalid node issue 2022-08-06 15:29:41 -04:00
Przemysław Adam Sowa baa31ab649 Don't use network host mode in the example docker-compose.yaml (#128) 2022-08-06 14:20:27 -04:00
Ari Sosnovsky dc7c6273e4 Update README.md 2022-08-06 13:16:34 -04:00
Ari Sosnovsky 2942b6173b Update README.md 2022-08-05 23:41:46 -04:00
ari bcfc648011 controls 2022-08-05 23:35:47 -04:00
ari 084d86ad7a fixed up build 2022-08-05 23:12:48 -04:00
ari ea6be4a8f3 infinte undo 2022-08-05 23:08:00 -04:00
ari 14649ac1fd added dial 2022-08-05 22:54:17 -04:00
ari f1b99cad1c trigger automation in metadata 2022-08-05 22:22:28 -04:00
ari ab7f50d4aa fixed trigger device validation 2022-08-05 22:04:31 -04:00
ari d22bba8c4d moving things around 2022-08-05 22:04:31 -04:00
ari 549f52655b refactor inputs 2022-08-05 22:04:31 -04:00
renovate[bot] 2c5d64ab86 Update dependency jss to v10.9.2 (#119)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-02 15:09:24 -04:00
renovate[bot] 7c50c345ec Update dependency react-jss to v10.9.2 (#120)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2022-08-02 15:09:13 -04:00
ari f4261f9701 better tag edit viz 2022-08-02 12:51:22 -04:00
ari 34826acb97 v0.5.1 2022-07-31 23:34:11 -04:00
ari cd1b4e8e2b ensuring scroll 2022-07-31 22:22:21 -04:00
ari 2b4c64c94b added ignore 2022-07-29 21:43:27 -04:00
ari 067f5fa642 added delay to save 2022-07-29 21:42:50 -04:00
196 changed files with 4505 additions and 2485 deletions

No files matched your search

+25
View File
@@ -1,5 +1,30 @@
# Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) # Changelog ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge)
## [0.5.3] - Bug Fixes
- Redirecting `/` to `/web` to resolve container install strangeness reported in https://github.com/asosnovsky/Shortumation/issues/125
- Fixed missing flag that caused the automation to explode in https://github.com/asosnovsky/Shortumation/issues/124
## [0.5.2] - Better Controls
- Add automation trigger
- Speed dial on the bottom
<img src="https://user-images.githubusercontent.com/7451445/183231968-9891bbb4-5c7c-4e05-b804-36978c809a5c.png" width="200px"/>
- Infinite undos <img src="https://user-images.githubusercontent.com/7451445/183231977-ed000017-2886-4a57-b5fb-c7e527bf3894.png" width="200px"/>
## [0.5.1] - Sidebar!
- completely redesigned the sidebar!
- Disable/enable automatons
- See 'bad state' automatons
- Delete automatons from registry (in cases where references are stale)
- Refactored sidebar UX to match MUI standards
- Cleaned up editing tags in sidebar
<img src="https://user-images.githubusercontent.com/7451445/182066721-07a93651-2f83-44d5-8420-15093caa52df.png" width="400px"/>
- Websockets now live-refresh when updates occur
## [0.4.0] - Depedency update ## [0.4.0] - Depedency update
- Core dependency updates - Core dependency updates
+8 -4
View File
@@ -1,4 +1,4 @@
# Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic) # <img src="logo.png" height="40x"/> Shortumation ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=platsic)
[![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml) [![Test](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [![Build](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml/badge.svg)](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
@@ -6,7 +6,9 @@
| ------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------- | | ------- | ------------------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------- |
| Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge) | | Version | ![GitHub release (latest by date)](https://img.shields.io/github/v/release/asosnovsky/Shortumation?label=&style=for-the-badge) | ![Docker Image Version (latest semver)](https://img.shields.io/docker/v/asosnovsky/shortumation-amd64?&sort=date&label=&style=for-the-badge) |
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing and writing your automations. We provide a way to visualize your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/). A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing and writing your automations. We provide a way to visualize your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
<img src="./assets/comparisons.png">
## Features ## Features
@@ -46,12 +48,14 @@ Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage ad
It should now appear in your `Add-on Store` and you should be able to install it! It should now appear in your `Add-on Store` and you should be able to install it!
**Please note that you may need to enable advance mode in your settings first!**
### Containerized or HA Core ### Containerized or HA Core
Please note that this way of using Shortumation is **not future proof**.
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml), or read the [extended guide here](https://github.com/asosnovsky/Shortumation/wiki/Installation#containerized--ha-core). If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml), or read the [extended guide here](https://github.com/asosnovsky/Shortumation/wiki/Installation#containerized--ha-core).
In general, if you want to help provide this to more home-assistant fans please join on the conversation here https://github.com/asosnovsky/Shortumation/issues/102 or help contribute :)
## FAQ ## FAQ
**How is this different from Node-Red?** **How is this different from Node-Red?**
-3
View File
@@ -1,3 +0,0 @@
LOG_LEVEL=DEBUG
SUPERVISOR_TOKEN=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiI2ZjJiYzM2MjkyOWM0OGM1Yjg1NzgxNDEzNTRkNDk0NSIsImlhdCI6MTY1OTExMTExMCwiZXhwIjoxOTc0NDcxMTEwfQ.Q5Ei1a9BXyB4-whrPGoko6CKavOOloFC1fbP-jAYBpU
HASSIO_WS=ws://homeassistant:8123/api/websocket
+5 -10
View File
@@ -1,12 +1,7 @@
{ {
"python.formatting.provider": "black", "python.formatting.provider": "black",
"python.testing.unittestArgs": [ "python.testing.unittestArgs": ["-v", "-s", "./tests", "-p", "*test_*.py"],
"-v", "python.testing.pytestEnabled": false,
"-s", "python.testing.unittestEnabled": true,
"./tests", "python.envFile": "${workspaceFolder}/development_config/.env"
"-p",
"*test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true
} }
+19 -14
View File
@@ -1,14 +1,19 @@
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17) get_index # unused function (src/api/app.py:43)
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28) list_autos # unused function (src/api/routes/automations.py:12)
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32) upsert_auto # unused function (src/api/routes/automations.py:24)
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10) delete_auto # unused function (src/api/routes/automations.py:32)
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10) read_details # unused function (src/api/routes/details.py:10)
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9) read_ping # unused function (src/api/routes/ping.py:10)
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18) websocket_endpoint # unused function (src/api/routes/socket.py:13)
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19) params # unused variable (src/api/types.py:16)
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8) total_items # unused variable (src/api/types.py:17)
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9) data # unused variable (src/api/types.py:18)
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10) trigger_variables # unused variable (src/automations/types.py:13)
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11) trigger # unused variable (src/automations/types.py:15)
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12) condition # unused variable (src/automations/types.py:16)
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5) action # unused variable (src/automations/types.py:17)
_.to_json # unused method (src/automations/types.py:38)
_.automation_tags # unused property (src/hass_config/loader.py:18)
_.save_automations # unused method (src/hass_config/loader.py:48)
_.save_tags # unused method (src/hass_config/loader.py:56)
json_dumps # unused function (src/json_serializer.py:5)
+4 -1
View File
@@ -45,4 +45,7 @@ start-docker:
tar -xvf ../development_config.tar.gz -C ./ tar -xvf ../development_config.tar.gz -C ./
cp ./development_config/.env .env.api cp ./development_config/.env .env.api
docker-compose down docker-compose down
docker-compose up docker-compose up
update-vulture-whitelist:
$(VENV_BIN)/vulture --make-whitelist src > .vulture_whitelist
+11 -1
View File
@@ -1,5 +1,6 @@
from fastapi import FastAPI from fastapi import FastAPI
from fastapi.middleware.cors import CORSMiddleware from fastapi.middleware.cors import CORSMiddleware
from fastapi.responses import RedirectResponse
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
@@ -10,7 +11,8 @@ from .routes import automations, details, ping, socket
def make_app(automation_mgr: AutomationManager) -> FastAPI: def make_app(automation_mgr: AutomationManager) -> FastAPI:
app = FastAPI() app = FastAPI()
if (ROOT_FOLDER / "web").exists(): has_web_folder = (ROOT_FOLDER / "web").exists()
if has_web_folder:
app.mount( app.mount(
f"{API_PREFIX}/web", f"{API_PREFIX}/web",
StaticFiles( StaticFiles(
@@ -19,6 +21,7 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
), ),
name="web", name="web",
) )
else: else:
print("WARN: could not find web folder") print("WARN: could not find web folder")
app.add_middleware( app.add_middleware(
@@ -36,4 +39,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details" details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
) )
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket") app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
@app.get("/")
def get_index():
if has_web_folder:
return RedirectResponse("/web")
return RedirectResponse("/details")
return app return app
+15 -15
View File
@@ -1,43 +1,43 @@
from ctypes import Union
from fastapi import APIRouter, HTTPException from fastapi import APIRouter, HTTPException
from src.api.types import ( from src.api.types import ListData, ListParams, UpdateTags
DeleteAutoRequest,
ListData,
ListParams,
UpdateAutoRequest,
UpdateTags,
)
from src.automations.errors import FailedDeletion from src.automations.errors import FailedDeletion
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.automations.types import AutomationData from src.automations.types import Automation, ExtenededAutomation
def make_automation_router(automations: AutomationManager) -> APIRouter: def make_automation_router(automations: AutomationManager) -> APIRouter:
router = APIRouter() router = APIRouter()
@router.post("/list") @router.post("/list")
def list_autos(body: ListParams) -> ListData[AutomationData]: def list_autos(body: ListParams) -> ListData[ExtenededAutomation]:
automations.reload()
return ListData( return ListData(
params=body, params=body,
totalItems=automations.get_total_items(), totalItems=automations.count(),
data=automations.find( data=automations.list(
offset=body.offset, offset=body.offset,
limit=body.limit, limit=body.limit,
), ),
) )
@router.post("/item") @router.post("/item")
def upsert_auto(body: UpdateAutoRequest): def insert_auto(body: Automation):
automations.update(body.index, body.data) automations.create(body)
@router.put("/item")
def update_auto(body: ExtenededAutomation):
automations.update(body)
@router.post("/item/tags") @router.post("/item/tags")
def update_tags(body: UpdateTags): def update_tags(body: UpdateTags):
automations.update_tags(body.automation_id, body.tags) automations.update_tags(body.automation_id, body.tags)
@router.delete("/item") @router.delete("/item")
def delete_auto(body: DeleteAutoRequest): def delete_auto(body: ExtenededAutomation):
try: try:
automations.delete(body.index) automations.delete(body)
except FailedDeletion as err: except FailedDeletion as err:
return HTTPException( return HTTPException(
status_code=400, status_code=400,
+5 -1
View File
@@ -2,6 +2,7 @@ from fastapi import APIRouter
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
from src.hass_config import HassConfig from src.hass_config import HassConfig
from src.automations.loader import extract_automation_paths
def make_details_router(hass_config: HassConfig) -> APIRouter: def make_details_router(hass_config: HassConfig) -> APIRouter:
@@ -15,7 +16,10 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
"hassio_url": HASSIO_WS, "hassio_url": HASSIO_WS,
"config": hass_config.get_configuration_path(), "config": hass_config.get_configuration_path(),
"tags": hass_config.get_automation_tags_path(), "tags": hass_config.get_automation_tags_path(),
"autos": hass_config.get_automation_path(), "autos": {
config_key: auto_file
for config_key, auto_file in extract_automation_paths(hass_config)
},
} }
return router return router
-11
View File
@@ -4,8 +4,6 @@ from pydantic import BaseModel
from pydantic.fields import Field from pydantic.fields import Field
from pydantic.generics import GenericModel from pydantic.generics import GenericModel
from src.automations.types import ExtenededAutomationData
DataT = TypeVar("DataT") DataT = TypeVar("DataT")
@@ -20,15 +18,6 @@ class ListData(GenericModel, Generic[DataT]):
data: List[DataT] data: List[DataT]
class UpdateAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update")
data: ExtenededAutomationData
class UpdateTags(BaseModel): class UpdateTags(BaseModel):
automation_id: str = Field(description="Automation Id to update") automation_id: str = Field(description="Automation Id to update")
tags: Dict[str, str] tags: Dict[str, str]
class DeleteAutoRequest(BaseModel):
index: int = Field(description="Index of the automation to update")
+113
View File
@@ -0,0 +1,113 @@
import base64
import json
import sqlite3
from contextlib import contextmanager
from pathlib import Path
from typing import Iterable, Iterator, List, Optional
from src.logger import get_logger
from .errors import DBDataError, DBError, DBNoAutomationFound
from .types import ExtenededAutomation
logger = get_logger(__file__)
automations_tbl = "autos"
def encode_auto(auto: ExtenededAutomation) -> str:
return base64.b64encode(
json.dumps(auto.to_primitive(include_tags=True)).encode("utf-8")
).decode("utf-8")
def decode_auto(
auto_str: str, source_file: str, source_file_type: str, configuration_key: str
) -> ExtenededAutomation:
return ExtenededAutomation(
source_file=source_file,
source_file_type=source_file_type,
configuration_key=configuration_key,
**json.loads(base64.b64decode(auto_str.encode("utf-8")).decode("utf-8")),
)
class AutomationDBConnection:
def __init__(self, db_file: Path) -> None:
self.db_file = db_file
def reset(self):
self.db_file.unlink(missing_ok=True)
self.create_db()
@contextmanager
def get_cur(self) -> Iterator[sqlite3.Cursor]:
conn = sqlite3.connect(self.db_file)
cur = conn.cursor()
try:
yield cur
conn.commit()
except sqlite3.IntegrityError as err:
raise DBDataError(*err.args) from err
except sqlite3.DatabaseError as err:
raise DBError(*err.args) from err
finally:
cur.close()
conn.close()
def create_db(self):
with self.get_cur() as cur:
cur.execute(
f"""
CREATE TABLE IF NOT EXISTS {automations_tbl} (
id TEXT NOT NULL PRIMARY KEY,
alias TEXT,
description TEXT,
mode TEXT NOT NULL,
source_file TEXT NOT NULL,
source_file_type TEXT NOT NULL,
configuration_key TEXT NOT NULL,
rest BLOB NOT NULL
);
"""
)
def insert_automations(self, automations: List[ExtenededAutomation]):
with self.get_cur() as cur:
for automation in automations:
cur.execute(
f"""
INSERT INTO {automations_tbl} VALUES (
"{automation.id}",
"{automation.alias}",
"{automation.description}",
"{automation.mode}",
"{automation.source_file}",
"{automation.source_file_type}",
"{automation.configuration_key}",
"{encode_auto(automation)}"
);
""",
)
def get_automation(self, automation_id: str) -> ExtenededAutomation:
with self.get_cur() as cur:
cur.execute(
f'SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} WHERE id = "{automation_id}"'
)
objs = cur.fetchone()
if objs is None:
raise DBNoAutomationFound(automation_id)
[rest, source_file, source_file_type, configuration_key] = objs
return decode_auto(rest, source_file, source_file_type, configuration_key)
def list_automations(self, offset: int, limit: int) -> Iterable[ExtenededAutomation]:
with self.get_cur() as cur:
for [rest, source_file, source_file_type, configuration_key] in cur.execute(
f"SELECT rest, source_file, source_file_type, configuration_key FROM {automations_tbl} LIMIT {limit} OFFSET {offset}"
):
yield decode_auto(rest, source_file, source_file_type, configuration_key)
def count_automations(self) -> int:
with self.get_cur() as cur:
return cur.execute(f"SELECT count(id) FROM {automations_tbl}").fetchone()[0]
+16
View File
@@ -5,9 +5,25 @@ class AutomationLoaderException(Exception):
) )
class AttemptingToOverwriteAnIncompatibleFileError(AutomationLoaderException):
pass
class InvalidAutomationFile(AutomationLoaderException): class InvalidAutomationFile(AutomationLoaderException):
pass pass
class FailedDeletion(AutomationLoaderException): class FailedDeletion(AutomationLoaderException):
pass pass
class DBError(Exception):
pass
class DBDataError(DBError):
pass
class DBNoAutomationFound(DBError):
pass
+135 -23
View File
@@ -1,38 +1,150 @@
from typing import Any, Iterator, Union from pathlib import Path
from typing import Any, Iterator, Tuple, Union
from pydantic.error_wrappers import ValidationError
from src.json_serializer import normalize_obj from src.json_serializer import normalize_obj
from src.logger import get_logger
from src.utils import extract_files
from src.yaml_serializer import dump_yaml, load_yaml
from src.yaml_serializer.types import IncludedYaml, IncludedYamlDir
from ..hass_config.loader import HassConfig
from .errors import InvalidAutomationFile from .errors import InvalidAutomationFile
from .types import AutomationMetdata, ExtenededAutomationData from .tags import TagManager
from .types import ExtenededAutomation
logger = get_logger(__file__)
AUTOMATION_CONFIGURATION_KEY = "automation shortumation"
# Single loader def extract_automation_paths(
def load_automation( hass_config: HassConfig,
auto_raw: dict, ) -> Iterator[Tuple[str, str]]:
tags: dict, found = False
) -> Iterator[ExtenededAutomationData]: for key, value in extract_automation_keys(hass_config):
"""Converts an automation dictionary loaded directly from the config into logger.info(f"Loading automations from '{key}'")
several python typed objects found = True
if isinstance(value, IncludedYaml):
yield key, value.path_str
elif isinstance(value, IncludedYamlDir):
yield key, value.name
else:
logger.warning(f"found an invalid type in {key}!")
if not found:
yield "", "automations.yaml"
def get_base_automation_key(hass_config: HassConfig):
found_any = False
for key, value in extract_automation_keys(hass_config):
found_any = True
if isinstance(value, IncludedYaml):
return key, value.path_str
configurations = hass_config.configurations
if found_any:
out_path = hass_config.get_backup_automation_file_path()
else:
out_path = hass_config.get_default_automation_path()
out_file = str(out_path.relative_to(hass_config.root_path))
configurations[AUTOMATION_CONFIGURATION_KEY] = IncludedYaml(out_file)
out_path.touch(exist_ok=True)
with hass_config.get_configuration_path().open("w") as fp:
fp.write(dump_yaml(configurations))
return AUTOMATION_CONFIGURATION_KEY, out_file
def extract_automation_keys(
hass_config: HassConfig,
) -> Iterator[Tuple[str, Union[IncludedYaml, IncludedYamlDir]]]:
for key, value in hass_config.configurations.items():
if str(key).startswith("automation"):
if isinstance(value, dict) or isinstance(value, list):
raise NotImplementedError(
"No support for automations baked into configuration.yaml! Please extract these into a seperate file"
)
elif isinstance(value, IncludedYaml) or isinstance(value, IncludedYamlDir):
yield key, value
else:
logger.warning(f"found an invalid type in {key}!")
def load_automation_path(
root_path: Path,
automation_path: Path,
configuration_key: str,
tag_manager: TagManager,
) -> Iterator[ExtenededAutomation]:
"""
Args: Args:
automations_raw_data (Iterable[dict]) automation_path (Path)
configuration_key (str)
Returns: Returns:
Iterator[ExtenededAutomationData] Iterator[ExtenededAutomation]
""" """
try: if not automation_path.exists():
yield ExtenededAutomationData( logger.warning(f"the file {automation_path} does not exists")
metadata=AutomationMetdata.parse_obj(auto_raw), return
condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))), if automation_path.is_dir():
sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))), for f in extract_files(automation_path):
trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))), yield from load_automation_path(root_path, f, configuration_key, tag_manager)
tags=tags, else:
) try:
except ValidationError as err: with automation_path.open("r") as fp:
raise InvalidAutomationFile from err automations = load_yaml(fp)
except Exception as err:
raise InvalidAutomationFile(
when="loading yaml",
automation_path=automation_path,
error=err,
) from err
if isinstance(automations, dict):
try:
yield ExtenededAutomation(
**clean_automation(automations),
tags=tag_manager.get(automations["id"], {}),
configuration_key=configuration_key,
source_file=str(automation_path.relative_to(root_path)),
source_file_type="obj",
)
except Exception as err:
raise InvalidAutomationFile(
when="reading file contents",
automation_path=automation_path,
error=err,
) from err
else:
if automations is None:
logger.warning(f"the file {automation_path} is empty")
return
for automation in automations:
try:
yield ExtenededAutomation(
**clean_automation(automation),
tags=tag_manager.get(automation["id"], {}),
configuration_key=configuration_key,
source_file=str(automation_path.relative_to(root_path)),
source_file_type="list",
)
except Exception as err:
raise InvalidAutomationFile(
when="reading file contents",
automation_path=automation_path,
error=err,
automation=automation,
) from err
def clean_automation(auto_raw: dict):
return {
**auto_raw,
"condition": ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
"action": ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
"trigger": ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
}
def ifempty_or_null_then_list(obj: Any): def ifempty_or_null_then_list(obj: Any):
+146 -64
View File
@@ -1,76 +1,158 @@
from typing import Dict, Iterator, List, Optional from enum import auto
from pathlib import Path
from tempfile import mktemp
from typing import Dict, Optional, Union
from src.automations.errors import FailedDeletion, InvalidAutomationFile
from src.automations.types import AutomationData, ExtenededAutomationData
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
from src.yaml_serializer import dump_yaml, load_yaml
from .loader import load_automation from ..errors import ErrorSet
from ..logger import get_logger
from .db import AutomationDBConnection
from .errors import (
AttemptingToOverwriteAnIncompatibleFileError,
DBError,
InvalidAutomationFile,
)
from .loader import extract_automation_paths, get_base_automation_key, load_automation_path
from .tags import TagManager
from .types import Automation, ExtenededAutomation
logger = get_logger(__file__)
class AutomationManager: class AutomationManager:
def __init__(self, hass_config: HassConfig) -> None: def __init__(
self.hass_config = hass_config
def find(
self, self,
offset: int = 0, hass_config: HassConfig,
limit: int = 10, db_path: Optional[Path] = None,
) -> Iterator[AutomationData]: ) -> None:
tags = self.hass_config.automation_tags if db_path is None:
for i, auto in enumerate(self.hass_config.automations): db_path = Path(mktemp())
if i < offset: self.hass_config = hass_config
continue self.db = AutomationDBConnection(db_path)
if i >= offset + limit: self.tag_path = hass_config.get_automation_tags_path()
break self.tag_manager = TagManager()
yield from load_automation(auto, tags.get(auto.get("id", ""), {})) self.reload_tags()
def get(self, index: int) -> Optional[ExtenededAutomationData]: def reload_tags(self):
tags = self.hass_config.automation_tags if self.tag_path.exists():
if index >= 0: self.tag_manager = TagManager.load(self.tag_path)
for i, auto in enumerate(self.hass_config.automations):
if not isinstance(auto, dict):
raise InvalidAutomationFile(automation_index=i)
if i == index:
return next(load_automation(auto, tags.get(auto.get("id", ""), {})))
return None
def update(self, index: int, automation: ExtenededAutomationData): def reload(self):
tags = self.hass_config.automation_tags self.db.reset()
automations: List[dict] = [] self.reload_tags()
updated_index: Optional[int] = None errors = []
for i, orig_auto in enumerate(self.hass_config.automations): for config_key, p in extract_automation_paths(self.hass_config):
if i == index: try:
automations.append(automation.to_primitive()) automations = list(
updated_index = i load_automation_path(
else: self.hass_config.root_path,
automations.append(orig_auto) self.hass_config.root_path / p,
if updated_index is None: config_key,
automations.append(automation.to_primitive()) self.tag_manager,
updated_index = len(automations) - 1 )
tags[automation.metadata.id] = automation.tags )
self.hass_config.save_automations(automations) self.db.insert_automations(automations)
self.hass_config.save_tags(tags) except InvalidAutomationFile as e:
logger.warning(e)
errors.append(e)
except DBError as e:
logger.warning(e)
errors.append(e)
if len(errors) > 0:
raise ErrorSet(*errors)
def update_tags(self, auto_id: str, tags: Dict[str, str]): def list(self, offset: int, limit: int):
autos_tags = self.hass_config.automation_tags return self.db.list_automations(offset=offset, limit=limit)
autos_tags[auto_id] = tags
self.hass_config.save_tags(autos_tags)
def delete(self, index: int): def count(self):
automations: List[dict] = [] return self.db.count_automations()
deleted = False
for i, orig_auto in enumerate(self.hass_config.automations):
if i == index:
deleted = True
else:
automations.append(orig_auto)
if not deleted:
raise FailedDeletion("No such automation found")
self.hass_config.save_automations(automations)
# TODO: improve on this without keeping things in memory def get(self, auto_id: str):
def get_total_items(self) -> int: return self.db.get_automation(auto_id)
count = 0
for i, _ in enumerate(self.hass_config.automations): def create(self, automation: Automation):
count = i config_key, config_path = get_base_automation_key(self.hass_config)
return count + 1 return self.update(
ExtenededAutomation(
**automation.dict(),
configuration_key=config_key,
source_file=config_path,
source_file_type="list",
),
create_if_not_found=True,
)
def update(self, automation: ExtenededAutomation, create_if_not_found: bool = False):
automation_path = self.hass_config.root_path / automation.source_file
if not automation_path.parent.exists():
automation_path.parent.mkdir(parents=True)
objs: Optional[Union[list, dict]] = None
if automation_path.exists():
with automation_path.open("r") as fp:
objs = load_yaml(fp)
if automation.source_file_type == "obj":
if isinstance(objs, list):
raise AttemptingToOverwriteAnIncompatibleFileError(
f"{automation_path} is a list, but expected a obj for {automation}"
)
raw_auto = automation.to_primitive(include_tags=False)
automation_path.write_text(dump_yaml(raw_auto))
else:
if isinstance(objs, dict):
raise AttemptingToOverwriteAnIncompatibleFileError(
f"{automation_path} is a list, but expected a obj for {automation}"
)
elif objs is None:
objs = []
if not isinstance(objs, list):
raise AssertionError(
f"Attemption to save automation to {automation_path} but encountering an invalid list yaml file. Did you modify this file prior to saving?\n{automation}"
)
found = False
for i, obj in enumerate(objs):
if obj["id"] == automation.id:
objs[i] = automation.to_primitive(include_tags=False)
found = True
break
if not found:
if create_if_not_found:
objs.append(automation.to_primitive(include_tags=False))
else:
raise InvalidAutomationFile(
"Could not update automations, not found in source file."
)
automation_path.write_text(dump_yaml(objs))
self.update_tags(automation.id, automation.tags)
def update_tags(self, automation_id: str, tags: Dict[str, str]):
self.reload_tags()
self.tag_manager[automation_id] = tags
self.tag_manager.save(self.tag_path)
def delete_tags(self, automation_id: str):
self.reload_tags()
if automation_id in self.tag_manager:
del self.tag_manager[automation_id]
self.tag_manager.save(self.tag_path)
def delete(self, automation: ExtenededAutomation):
automation_path = self.hass_config.root_path / automation.source_file
if automation.source_file_type == "obj":
automation_path.unlink(missing_ok=True)
else:
with automation_path.open("r") as fp:
objs = load_yaml(fp)
if not isinstance(objs, list):
raise AssertionError(
f"Attemption to save automation to {automation_path} but encountering an invalid list yaml file. Did you modify this file prior to saving?\n{automation}"
)
kept = []
for i, obj in enumerate(objs):
if obj["id"] != automation.id:
kept.append(obj)
automation_path.write_text(dump_yaml(kept))
self.delete_tags(automation.id)
+2
View File
@@ -6,6 +6,8 @@ from src.yaml_serializer import dump_yaml, load_yaml
class TagManager(Dict[str, Dict[str, str]]): class TagManager(Dict[str, Dict[str, str]]):
def save(self, path: Path): def save(self, path: Path):
if not path.parent.exists():
path.parent.mkdir(parents=True)
path.write_text(dump_yaml(dict(self))) path.write_text(dump_yaml(dict(self)))
@classmethod @classmethod
+29 -14
View File
@@ -1,31 +1,46 @@
from typing import Dict, List, Optional, Union import json
from pathlib import Path
from typing import Dict, List, Literal, Optional, Union
from pydantic import BaseModel from pydantic import BaseModel
from pydantic.fields import Field from pydantic.fields import Field
class AutomationMetdata(BaseModel): class BaseAutomation(BaseModel):
id: str id: str
alias: Optional[str] = None alias: Optional[str] = None
description: Optional[str] = None description: Optional[str] = None
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
mode: str = "single" mode: str = "single"
class AutomationData(BaseModel):
metadata: AutomationMetdata
trigger: List[dict] = [] trigger: List[dict] = []
condition: List[dict] = [] condition: List[dict] = []
sequence: List[dict] = [] action: List[dict] = []
def to_primitive(self): def to_primitive(self):
return { return self.dict(exclude_unset=True, exclude_none=True)
**self.metadata.dict(exclude_unset=True, exclude_none=True),
"trigger": self.trigger,
"condition": self.condition,
"action": self.sequence,
}
class ExtenededAutomationData(AutomationData): class Automation(BaseAutomation):
tags: Dict[str, str] = Field(default_factory=dict) tags: Dict[str, str] = Field(default_factory=dict)
def to_primitive(self, include_tags: bool = False):
out = super().to_primitive()
if not include_tags and out.get("tags", None) is not None:
del out["tags"]
return out
class ExtenededAutomation(Automation):
source_file: str
source_file_type: Literal["list", "obj"]
configuration_key: str
def to_primitive(self, include_tags: bool = False):
out = super().to_primitive(include_tags=include_tags)
del out["source_file"]
del out["source_file_type"]
del out["configuration_key"]
return out
def to_json(self):
return json.loads(self.json())
+12
View File
@@ -0,0 +1,12 @@
class ErrorSet(Exception):
"""An exception collection exception"""
def __init__(self, *errors: Exception) -> None:
self.errors = errors
super().__init__(self.gen_message())
def gen_message(self):
if len(self.errors) > 1:
return "Encountered multiple errors:\n >" + "\n >".join(map(repr, self.errors))
else:
return str(self.errors[0].args)
-6
View File
@@ -1,6 +0,0 @@
class HassConfigError(Exception):
pass
class MissingFile(HassConfigError):
pass
+14 -26
View File
@@ -5,8 +5,6 @@ from src.automations.tags import TagManager
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 from src.yaml_serializer.types import IncludedYaml
from .errors import MissingFile
class HassConfig: class HassConfig:
def __init__(self, root_path: Path) -> None: def __init__(self, root_path: Path) -> None:
@@ -17,32 +15,18 @@ class HassConfig:
with self.get_configuration_path().open("r") as f: with self.get_configuration_path().open("r") as f:
return dict(load_yaml(f)) # type: ignore return dict(load_yaml(f)) # type: ignore
@property
def automations(self) -> List[dict]:
if automation_path := self.get_automation_path():
try:
with automation_path.open("r") as f:
return load_yaml(f) # type: ignore
except FileNotFoundError as err:
raise MissingFile("automations.yaml") from err
return self.configurations["automation"]
@property @property
def automation_tags(self) -> TagManager: def automation_tags(self) -> TagManager:
tag_path = self.get_automation_tags_path() tag_path = self.get_automation_tags_path()
if not tag_path.exists(): if not tag_path.exists():
tag_path.parent.mkdir(parents=True, exist_ok=True)
return TagManager() return TagManager()
else: else:
return TagManager.load(tag_path) return TagManager.load(tag_path)
def get_automation_tags_path(self) -> Path: def get_backup_automation_file_path(self) -> Path:
return self.root_path / ".shortumations" / "tags.yaml" return self.get_shortumations_path() / "automations.yaml"
def get_configuration_path(self) -> Path: def get_default_automation_path(self) -> Optional[Path]:
return self.root_path / "configuration.yaml"
def get_automation_path(self) -> Optional[Path]:
"""Get Automation Path (if not included in configuration.yaml, in this case the return value is None) """Get Automation Path (if not included in configuration.yaml, in this case the return value is None)
Returns: Returns:
@@ -57,13 +41,17 @@ class HassConfig:
return None return None
return self.root_path / "automations.yaml" return self.root_path / "automations.yaml"
def save_automations(self, automations: List[dict]): def get_shortumations_path(self) -> Path:
if automation_path := self.get_automation_path(): shortumations_path = self.root_path / ".shortumations"
automation_path.write_text(dump_yaml(automations)) if not shortumations_path.exists():
else: shortumations_path.mkdir(parents=True, exist_ok=True)
self.get_configuration_path().write_text( return shortumations_path
dump_yaml({**self.configurations, "automation": automations})
) def get_automation_tags_path(self) -> Path:
return self.get_shortumations_path() / "tags.yaml"
def get_configuration_path(self) -> Path:
return self.root_path / "configuration.yaml"
def save_tags(self, tags: TagManager): def save_tags(self, tags: TagManager):
tags.save(self.get_automation_tags_path()) tags.save(self.get_automation_tags_path())
+5 -11
View File
@@ -2,17 +2,11 @@ import logging
from src.env import LOG_LEVEL from src.env import LOG_LEVEL
if LOG_LEVEL == "DEBUG": logging.basicConfig(
logging.basicConfig(level=logging.DEBUG) format="%(asctime)s|%(levelname)-4s[%(pathname)s:%(lineno)d@%(funcName)s] %(message)s",
elif LOG_LEVEL == "INFO": datefmt="%Y-%m-%d:%H:%M:%S",
logging.basicConfig(level=logging.INFO) level=logging._nameToLevel.get(LOG_LEVEL, logging.INFO),
elif LOG_LEVEL == "WARN": )
logging.basicConfig(level=logging.WARN)
elif LOG_LEVEL == "ERROR":
logging.basicConfig(level=logging.ERROR)
else:
logging.basicConfig(level=logging.NOTSET)
logger = logging.getLogger() logger = logging.getLogger()
+20
View File
@@ -0,0 +1,20 @@
from pathlib import Path
from typing import Iterator
def extract_files(p: Path) -> Iterator[Path]:
"""Extracts all files in folder and it's subfolders
Args:
p (Path):
Yields:
Iterator[Path]
"""
if not p.exists():
return
if p.is_dir():
for c in p.iterdir():
yield from extract_files(c)
else:
yield p
+1 -1
View File
@@ -6,7 +6,7 @@ from websockets.client import WebSocketClientProtocol, connect
from websockets.exceptions import ConnectionClosedOK from websockets.exceptions import ConnectionClosedOK
from src.env import HASSIO_TOKEN, HASSIO_WS from src.env import HASSIO_TOKEN, HASSIO_WS
from src.logger import get_logger, logger from src.logger import get_logger
OnMessage = Callable[[str], Coroutine] OnMessage = Callable[[str], Coroutine]
logger = get_logger(__name__) logger = get_logger(__name__)
+1 -1
View File
@@ -36,6 +36,6 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
yaml_stream (io.StringIO) yaml_stream (io.StringIO)
Returns: Returns:
List[dict, list] Union[dict, list]
""" """
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
@@ -0,0 +1,14 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -0,0 +1,13 @@
id: "1659114647066"
alias: On Home Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,13 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,4 @@
# Loads default set of integrations. Do not remove.
default_config:
automation: !include_dir_list ./automations
@@ -0,0 +1,14 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -0,0 +1,13 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,13 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,7 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: '165911464702444'
alias: In File
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: '1660439437914'
alias: NEW
description: ''
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,12 @@
# Loads default set of integrations. Do not remove.
default_config:
# Text to speech
tts:
- platform: google_translate
automation manual: !include_dir_list ./automations/include_dir_list
automation ui: !include automations/ui.yaml
automation cools: !include_dir_merge_list automations/include_dir_merge_list
script: !include scripts.yaml
scene: !include scenes.yaml
@@ -0,0 +1,7 @@
- id: "1660439557193"
alias: SHOULD NOT BE LOADED!
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: "base1"
alias: BASE
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "base2"
alias: base 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
id: "1659114822642"
alias: On Home Down
description: Example
mode: single
trigger:
- platform: homeassistant
event: shutdown
condition: []
action:
- service: counter.increment
target:
entity_id:
- counter.up_times
data: {}
@@ -0,0 +1,13 @@
id: "1659114647066"
alias: HA Up
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,13 @@
id: "1659114647067"
alias: Notify Washer
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
@@ -0,0 +1,7 @@
- id: "mlist1"
alias: Merged List 1
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,14 @@
- id: "mlist2"
alias: Merged List 2
description: ""
trigger: []
condition: []
action: []
mode: single
- id: "mlist3"
alias: Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,18 @@
- id: "sublist3-mlist2"
alias: Sublist 3 - Merged List 2
description: "That was correct!"
trigger: []
condition: []
action:
- service: "switch.turn_off"
target:
entity_id: "switch.bathroom"
data:
mode: single
- id: "sublist3-mlist3"
alias: Sublist 3 - Merged List 3
description: ""
trigger: []
condition: []
action: []
mode: single
@@ -0,0 +1,23 @@
- id: "ui1"
alias: UI 1
description: Example
mode: single
trigger:
- platform: homeassistant
event: start
condition: []
action:
- service: counter.increment
data: {}
target:
entity_id: counter.up_times
- id: "ui2"
alias: UI 2
description: ""
trigger:
- platform: sun
event: sunrise
offset: 0
condition: []
action: []
mode: single
@@ -0,0 +1,13 @@
# Loads default set of integrations. Do not remove.
default_config:
# Text to speech
tts:
- platform: google_translate
automation manual: !include_dir_list ./automations/include_dir_list
automation ui: !include automations/ui.yaml
automation: !include automations/base.yaml
automation cools: !include_dir_merge_list automations/include_dir_merge_list
script: !include scripts.yaml
scene: !include scenes.yaml
+265 -205
View File
@@ -1,15 +1,12 @@
from pathlib import Path
from unittest import TestCase from unittest import TestCase
import yaml import yaml
from fastapi.testclient import TestClient from fastapi.testclient import TestClient
from src.api.app import make_app from src.api.app import make_app
from src.automations.types import ( from src.automations.types import Automation, ExtenededAutomation
AutomationData, from tests.utils import HA_CONFIG2_EXAMPLE, HA_CONFIG6_EXAMPLE, get_example_automation_loader
AutomationMetdata,
ExtenededAutomationData,
)
from tests.utils import HA_CONFIG2_EXAMPLE, get_example_automation_loader
class BaseTestCase(TestCase): class BaseTestCase(TestCase):
@@ -22,7 +19,7 @@ class BaseTestCase(TestCase):
self.client = TestClient(make_app(self.automation_loader)) self.client = TestClient(make_app(self.automation_loader))
class automation_list_tests(BaseTestCase): class automation_pagination_tests(BaseTestCase):
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10} test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
@@ -87,7 +84,7 @@ class automation_list_tests(BaseTestCase):
self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"]) self.assertEqual(len(d["data"]), self.test_params["subtest2_found_items"])
class automation2_lists_tests(automation_list_tests): class automation_pagination_tests_2(automation_pagination_tests):
test_params = { test_params = {
"total": 1, "total": 1,
"subtest2_found_items": 0, "subtest2_found_items": 0,
@@ -104,232 +101,295 @@ class automation2_lists_tests(automation_list_tests):
class automation_update_tests(BaseTestCase): class automation_update_tests(BaseTestCase):
test_params = {
"total": 32,
"modify_item": 20,
"consitency_tests": {
1: {
"offset": 15,
"file_offset": 15,
"expected_change": {
"metadata": {
"id": "1629422438707",
"alias": "I CHANGED!",
"description": "",
"mode": "single",
},
"trigger": [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}],
"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",
},
],
"action": [
{
"service": "light.turn_on",
"target": {
"entity_id": "light.bulb_staircase",
"area_id": "living_room",
},
"data": {"brightness_pct": 40, "transition": 15},
}
],
},
},
2: {
"offset": 27,
"file_offset": 27,
"expected_change": {
"metadata": {
"id": "1649947692702",
"alias": "I CHANGED!",
"description": "",
"mode": "single",
},
"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",
},
],
"condition": [],
"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": [],
}
],
},
},
},
}
def test_insert_new(self): def test_insert_new(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post(
self.assertEqual(resp.json()["totalItems"], 32) "/automations/list", json={"limit": self.test_params["total"] + 1, "offset": 0}
)
autos = resp.json()["data"]
self.assertEqual(resp.json()["totalItems"], self.test_params["total"])
self.assertNotIn("i am new", set([a["id"] for a in autos]))
resp = self.client.post( resp = self.client.post(
"/automations/item", "/automations/item",
json={ json=Automation(
"index": 33, id="i am new",
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(), ).dict(),
},
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32}) resp = self.client.post(
"/automations/list", json={"limit": self.test_params["total"] + 1, "offset": 0}
)
data = resp.json() data = resp.json()
self.assertEqual(data["totalItems"], 33) self.assertEqual(data["totalItems"], self.test_params["total"] + 1)
self.assertEqual(data["data"][0]["metadata"]["id"], "testme") self.assertIn("i am new", set([a["id"] for a in data["data"]]))
def test_update_some(self): def test_update_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
original_auto = resp.json()["data"][0]
resp = self.client.post( resp = self.client.post(
"/automations/list", json={"limit": 1, "offset": self.test_params["modify_item"]}
)
original_auto = resp.json()["data"][0]
changed_to = ExtenededAutomation(
id=original_auto["id"],
alias="I have been modified",
configuration_key=original_auto["configuration_key"],
source_file_type=original_auto["source_file_type"],
source_file=original_auto["source_file"],
)
resp = self.client.put(
"/automations/item", "/automations/item",
json={ json=changed_to.to_json(),
"index": 20,
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
},
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20}) resp = self.client.post(
"/automations/list", json={"limit": 1, "offset": self.test_params["modify_item"]}
)
new_auto = resp.json()["data"][0] new_auto = resp.json()["data"][0]
self.assertNotEqual(original_auto, new_auto) self.assertNotEqual(original_auto, new_auto)
self.assertEqual( self.assertEqual(
ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto changed_to.to_json(),
new_auto,
) )
def test_consistent_standard_1(self): def test_consistent_standard_1(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 15}) for test_id, test_params in self.test_params["consitency_tests"].items():
original_auto = resp.json()["data"][0] with self.subTest(test_id=test_id):
original_auto["metadata"]["alias"] = "I CHANGED!" resp = self.client.post(
resp = self.client.post( "/automations/list",
"/automations/item", json={"limit": 1, "offset": test_params["offset"]},
json={ )
"index": 15, original_auto = resp.json()["data"][0]
"data": original_auto, original_auto["alias"] = "I CHANGED!"
}, resp = self.client.post(
) "/automations/item",
self.assertEqual(resp.status_code, 200) json=original_auto,
with (self.config_folder / "automations.yaml").open("r") as fp: )
disk_data = dict(yaml.safe_load(fp)[15]) self.assertEqual(resp.status_code, 200)
trigger = list(map(dict, disk_data.pop("trigger"))) with (self.config_folder / original_auto["source_file"]).open("r") as fp:
condition = disk_data.pop("condition") disk_data = dict(yaml.safe_load(fp)[test_params["file_offset"]])
action = list(map(dict, disk_data.pop("action"))) trigger = list(map(dict, disk_data.pop("trigger")))
self.assertDictEqual( condition = disk_data.pop("condition")
disk_data, action = list(map(dict, disk_data.pop("action")))
{"id": "1629422438707", "alias": "I CHANGED!", "description": "", "mode": "single"}, self.assertDictEqual(
) disk_data,
self.assertListEqual( test_params["expected_change"]["metadata"],
trigger, [{"platform": "time", "at": "input_datetime.vita_night_pump_time"}] )
) self.assertListEqual(
self.assertListEqual( trigger,
condition, test_params["expected_change"]["trigger"],
[ )
{ self.assertListEqual(
"conditions": [ condition,
{ test_params["expected_change"]["condition"],
"condition": "time", )
"after": "input_datetime.vita_night_pump_time", self.assertListEqual(
"before": "00:00:00", action,
}, test_params["expected_change"]["action"],
{"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}) class automation_update_split_config_tests(automation_update_tests):
original_auto = resp.json()["data"][0] test_params = {
original_auto["metadata"]["alias"] = "I CHANGED!" "total": 12,
resp = self.client.post( "modify_item": 3,
"/automations/item", "consitency_tests": {
json={ 1: {
"index": 27, "offset": 3,
"data": original_auto, "file_offset": 0,
}, "expected_change": {
) "metadata": {
self.assertEqual(resp.status_code, 200) "alias": "I CHANGED!",
with (self.config_folder / "automations.yaml").open("r") as fp: "description": "Example",
disk_data = dict(yaml.safe_load(fp)[27]) "id": "ui1",
trigger = list(map(dict, disk_data.pop("trigger"))) "mode": "single",
condition = disk_data.pop("condition") },
action = list(map(dict, disk_data.pop("action"))) "trigger": [{"platform": "homeassistant", "event": "start"}],
self.assertDictEqual( "condition": [],
disk_data, "action": [
{"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"}], "service": "counter.increment",
"sequence": [ "data": {},
{ "target": {"entity_id": "counter.up_times"},
"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": [], },
} },
], },
) }
def setUp(self) -> None:
(
self.config_folder,
self.hass_config,
self.automation_loader,
) = get_example_automation_loader(HA_CONFIG6_EXAMPLE)
self.client = TestClient(make_app(self.automation_loader))
class automation_delete_tests(BaseTestCase): class automation_delete_tests(BaseTestCase):
def test_delete_some(self): def test_delete_some(self):
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
autos = resp.json()["data"]
self.assertEqual(resp.json()["totalItems"], 32) self.assertEqual(resp.json()["totalItems"], 32)
resp = self.client.delete( resp = self.client.delete(
"/automations/item", "/automations/item",
json={ json=autos[0],
"index": 20,
},
) )
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0}) resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
@@ -0,0 +1,66 @@
from pathlib import Path
from src.automations.types import ExtenededAutomation
from src.automations.errors import DBDataError
from .utils import TestWithDB
class db_tests(TestWithDB):
def test_db_creation(self):
with self.db.get_cur() as cur:
cur.execute("SELECT name FROM sqlite_schema WHERE type ='table'")
tables = cur.fetchall()
self.assertListEqual(tables, [("autos",)])
self.db.create_db()
with self.db.get_cur() as cur:
cur.execute("SELECT name FROM sqlite_schema WHERE type ='table'")
tables = cur.fetchall()
self.assertListEqual(tables, [("autos",)])
def test_insert_automations(self):
originals = [
ExtenededAutomation(
id="test",
alias="test",
source_file="automation.yaml",
source_file_type="obj",
configuration_key="automation",
),
ExtenededAutomation(
id="test2",
alias="test",
source_file="automation.yaml",
source_file_type="obj",
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
configuration_key="automation",
),
]
self.db.insert_automations(originals)
for original in originals:
with self.subTest(original=original):
self.assertEqual(self.db.get_automation(original.id), original)
autos = list(self.db.list_automations(0, 10))
self.assertEqual(len(autos), 2)
def test_insert_repeat_automations(self):
originals = [
ExtenededAutomation(
id="test",
alias="test",
source_file="automation.yaml",
source_file_type="obj",
configuration_key="automation",
),
ExtenededAutomation(
id="test",
alias="test",
source_file="automation.yaml",
source_file_type="obj",
action=[{"event": {"nice": "one"}, "event_type": "custom"}],
configuration_key="automation",
),
]
with self.assertRaises(DBDataError):
self.db.insert_automations(originals)
autos = list(self.db.list_automations(0, 10))
self.assertEqual(len(autos), 0)
+127 -43
View File
@@ -1,59 +1,143 @@
from pathlib import Path
from tempfile import mktemp
from unittest import TestCase from unittest import TestCase
from src.automations.loader import load_automation from src.automations.loader import (
from src.automations.types import AutomationMetdata, ExtenededAutomationData extract_automation_paths,
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue load_automation_path,
)
from src.automations.tags import TagManager
from src.automations.types import ExtenededAutomation
from src.hass_config.loader import HassConfig
from tests.utils import (
HA_CONFIG2_EXAMPLE,
HA_CONFIG3_EXAMPLE,
HA_CONFIG4_EXAMPLE,
HA_CONFIG5_EXAMPLE,
HA_CONFIG6_EXAMPLE,
HA_CONFIG_EXAMPLE,
)
class loader_tests(TestCase): class loader_tests(TestCase):
def test_load_automation_runs(self): def test_load_automation_list_file(self):
auto = list( automations = list(
load_automation( load_automation_path(
{ HA_CONFIG2_EXAMPLE,
"id": "1616887975473", HA_CONFIG2_EXAMPLE / "automations.yaml",
"alias": "Home Assistant Off", configuration_key="automation",
"description": "", tag_manager=TagManager({"1652069225859": {"type": "routine"}}),
"trigger": [{"platform": "homeassistant", "event": "shutdown"}],
"condition": ["states(time.time) >= '10:00:00'"],
"action": [
{
"device_id": SecretValue("my_mobile_phone", "..."),
"domain": "mobile_app",
"type": "notify",
"title": "Hassio Status",
"message": "Hassio Is turning off...",
}
],
"mode": "single",
},
{},
) )
) )
self.assertEqual(len(automations), 1)
self.assertEqual( self.assertEqual(
auto[0], automations[0],
ExtenededAutomationData( ExtenededAutomation(
metadata=AutomationMetdata( id="1652069225859",
id="1616887975473", source_file="automations.yaml",
alias="Home Assistant Off", source_file_type="list",
description="", configuration_key="automation",
mode="single", alias="Climate - Pref temperature ",
), description="",
trigger=[{"platform": "homeassistant", "event": "shutdown"}], mode="single",
condition=[ tags={"type": "routine"},
trigger=[
{ {
"condition": "template", "platform": "state",
"value_template": "states(time.time) >= '10:00:00'", "entity_id": "input_number.preferred_temperature",
} }
], ],
sequence=[ condition=[],
action=[
{ {
"device_id": NOT_IMPLEMENTED_SV_MSG, "service": "climate.set_temperature",
"domain": "mobile_app", "data": {
"type": "notify", "temperature": {
"title": "Hassio Status", "[object Object]": None,
"message": "Hassio Is turning off...", }
},
"target": {
"entity_id": "climate.main_floor",
},
} }
], ],
tags={},
), ),
) )
def test_load_automation_obj_file(self):
automations = list(
load_automation_path(
HA_CONFIG4_EXAMPLE,
HA_CONFIG4_EXAMPLE / "automations" / "notify_washer.yaml",
configuration_key="automation base",
tag_manager=TagManager({"1659114647067": {"room": "laundry"}}),
)
)
self.assertEqual(len(automations), 1)
self.assertEqual(
automations[0],
ExtenededAutomation(
id="1659114647067",
source_file="automations/notify_washer.yaml",
source_file_type="obj",
configuration_key="automation base",
alias="Notify Washer",
description="Example",
mode="single",
tags={"room": "laundry"},
trigger=[
{
"platform": "homeassistant",
"event": "start",
}
],
condition=[],
action=[
{
"service": "counter.increment",
"data": {},
"target": {"entity_id": "counter.up_times"},
}
],
),
)
def test_load_automation_empty_file(self):
file_path = Path(mktemp())
file_path.touch()
automations = list(
load_automation_path(
file_path.parent,
file_path,
configuration_key="automation ui",
tag_manager=TagManager(),
)
)
self.assertEqual(len(automations), 0)
def test_load_automation_none_existing_file(self):
file_path = Path(mktemp())
file_path.unlink(missing_ok=True)
automations = list(
load_automation_path(
file_path.parent,
file_path,
configuration_key="automation manual",
tag_manager=TagManager(),
)
)
self.assertEqual(len(automations), 0)
def test_extract_all_automation_files(self):
for ha_path, expected in [
(HA_CONFIG_EXAMPLE, 1),
(HA_CONFIG2_EXAMPLE, 1),
(HA_CONFIG3_EXAMPLE, 1),
(HA_CONFIG4_EXAMPLE, 1),
(HA_CONFIG5_EXAMPLE, 3),
(HA_CONFIG6_EXAMPLE, 4),
]:
with self.subTest(ha_path=ha_path, expected=expected):
hass_config = HassConfig(ha_path)
paths = list(extract_automation_paths(hass_config))
self.assertEqual(len(paths), expected)
+307 -95
View File
@@ -1,115 +1,327 @@
from unittest import TestCase from pathlib import Path
from src.automations.errors import FailedDeletion, InvalidAutomationFile from src import yaml_serializer
from src.automations.types import AutomationMetdata, ExtenededAutomationData from src.automations.errors import (
AttemptingToOverwriteAnIncompatibleFileError,
DBNoAutomationFound,
InvalidAutomationFile,
)
from src.automations.manager import AutomationManager
from src.automations.types import ExtenededAutomation
from src.errors import ErrorSet
from src.hass_config.loader import HassConfig
from tests.utils import ( from tests.utils import (
get_dummy_automation_loader, HA_CONFIG6_EXAMPLE,
get_example_automation_loader, HA_CONFIG_EXAMPLE,
create_copy_of_example_config,
) )
from .utils import TestWithDB
class manager_tests(TestCase):
def test_find_limit_and_get(self):
_, _, loader = get_example_automation_loader()
first_auto_with_find = list(loader.find(limit=1))
first_auto_with_get = loader.get(0)
self.assertEqual(first_auto_with_find[0], first_auto_with_get)
def test_find_at_most_with_offset(self): class manager_tests(TestWithDB):
_, _, loader = get_example_automation_loader() def get_manager(self, ha_config_example: Path):
autos = list(loader.find(limit=10, offset=10)) self.config_path = create_copy_of_example_config(ha_config_example)
self.assertTrue(len(autos), 10) self.automation_manager = AutomationManager(
HassConfig(self.config_path),
self.db_file,
)
return self.config_path, self.automation_manager
def test_load_complex_read_modify_delete(self):
_, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
self.assertEqual(automation_manager.count(), 0)
automation_manager.reload()
self.assertEqual(automation_manager.count(), 12)
automation = automation_manager.get("sublist3-mlist2")
self.assertEqual(automation.description, "That was correct!")
self.assertEqual(
automation.action,
[
{
"service": "switch.turn_off",
"target": {"entity_id": "switch.bathroom"},
"data": None,
}
],
)
self.assertEqual(automation.configuration_key, "automation cools")
automation.trigger.append(
{"platform": "zone", "entity_id": "person.thor", "zone": "zone.azguard"}
)
automation_manager.update(automation)
self.assertEqual(
automation_manager.get("sublist3-mlist2").trigger,
[],
)
automation_manager.reload()
self.assertEqual(
automation_manager.get("sublist3-mlist2").trigger,
[
{
"platform": "zone",
"entity_id": "person.thor",
"zone": "zone.azguard",
}
],
)
def test_find_invalid(self): def test_find_invalid(self):
_, _, loader = get_example_automation_loader() _, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
self.assertIsNone(loader.get(-1)) automation_manager.reload()
self.assertIsNone(loader.get(1_000)) with self.assertRaises(DBNoAutomationFound):
self.assertIsNone(loader.get(33)) automation_manager.get("invalid")
def test_length(self):
_, _, loader = get_example_automation_loader()
self.assertEqual(loader.get_total_items(), 32)
def test_bad_automations_file(self): def test_bad_automations_file(self):
folder, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
[], (config_path / "automations.yaml").write_text("bob is an uncle")
automation_in_conifguration_mode="none", with self.assertRaises(ErrorSet) as err:
) automation_manager.reload()
(folder / "automations.yaml").write_text("bob is an uncle") self.assertEqual(len(err.exception.errors), 1)
with self.assertRaises(InvalidAutomationFile): self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
manager.get(0) self.assertEqual(automation_manager.count(), 0)
def test_create_automation(self): def test_one_bad_automations_file(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[], (config_path / "automations" / "ui.yaml").write_text("bob is an uncle")
automation_in_conifguration_mode="none", with self.assertRaises(ErrorSet) as err:
) automation_manager.reload()
manager.update(1, ExtenededAutomationData(metadata=AutomationMetdata(id="test1"))) self.assertEqual(len(err.exception.errors), 1)
auto = manager.get(0) self.assertIsInstance(err.exception.errors[0], InvalidAutomationFile)
self.assertIsNotNone(auto) self.assertEqual(automation_manager.count(), 10)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
def test_create_automation_with_example_folder(self): def test_delete_automation_in_single_file(self):
_, _, manager = get_example_automation_loader() config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
self.assertEqual(manager.get_total_items(), 32) self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1"))) automation_manager.reload()
auto = manager.get(32) automation = automation_manager.get("1659114822642")
self.assertIsNotNone(auto) self.assertEqual(automation.configuration_key, "automation manual")
self.assertEqual(manager.get_total_items(), 33) automation_manager.delete(automation)
self.assertEqual(auto.metadata.id, "test1") # type: ignore automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("1659114822642")
self.assertFalse((config_path / "automations/include_dir_list/home/down.yaml").exists())
def test_update_automation(self): def test_delete_automation_in_list(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[ self.assertTrue(
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")), (config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")), )
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")), automation_manager.reload()
], automation = automation_manager.get("mlist2")
automation_in_conifguration_mode="none", self.assertEqual(automation.configuration_key, "automation cools")
automation_manager.delete(automation)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("mlist2")
self.assertTrue(
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
) )
auto = manager.get(0)
self.assertEqual(auto.metadata.id, "test1") # type: ignore
manager.update(0, ExtenededAutomationData(metadata=AutomationMetdata(id="toaster-7")))
auto = manager.get(0)
self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore
def test_delete_automation(self): def test_create_new_in_single_file(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[ automation_manager.reload()
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")), self.assertFalse((config_path / "automations/include_dir_list/home/left.yaml").exists())
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")), with self.assertRaises(DBNoAutomationFound):
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")), automation_manager.get("newlymade")
], automation_manager.update(
automation_in_conifguration_mode="none", ExtenededAutomation(
id="newlymade",
configuration_key="automation manual",
source_file="automations/include_dir_list/home/left.yaml",
source_file_type="obj",
)
)
self.assertTrue((config_path / "automations/include_dir_list/home/left.yaml").exists())
automation_manager.reload()
self.assertEqual(
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation manual",
source_file="automations/include_dir_list/home/left.yaml",
source_file_type="obj",
),
) )
self.assertEqual(manager.get_total_items(), 3)
manager.delete(1)
self.assertEqual(manager.get_total_items(), 2)
for auto in manager.find(0, 1000):
self.assertNotEqual(auto.metadata.id, "test2")
def test_failed_deletion_automation(self): def test_create_new_in_existing_list_file(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[ automation_manager.reload()
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")), self.assertTrue(
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")), (config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")), )
], with self.assertRaises(DBNoAutomationFound):
automation_in_conifguration_mode="none", automation_manager.get("newlymade")
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="list",
),
create_if_not_found=True,
)
self.assertTrue(
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
)
automation_manager.reload()
self.assertEqual(
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="list",
),
) )
self.assertEqual(manager.get_total_items(), 3)
with self.assertRaises(FailedDeletion):
manager.delete(10)
def test_save_tags(self): def test_create_new_in_new_list_file(self):
_, _, manager = get_dummy_automation_loader( config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
[ automation_manager.reload()
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")), self.assertFalse(
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")), (config_path / "automations/include_dir_merge_list/sub/list4.yaml").exists()
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")), )
], with self.assertRaises(DBNoAutomationFound):
automation_in_conifguration_mode="none", automation_manager.get("newlymade")
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list4.yaml",
source_file_type="list",
),
create_if_not_found=True,
)
self.assertTrue(
(config_path / "automations/include_dir_merge_list/sub/list4.yaml").exists()
)
automation_manager.reload()
self.assertEqual(
automation_manager.get("newlymade"),
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list4.yaml",
source_file_type="list",
),
)
def test_save_improper_types_list_to_obj(self):
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
automation_manager.reload()
self.assertTrue(
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").exists()
)
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("newlymade")
with self.assertRaises(AttemptingToOverwriteAnIncompatibleFileError):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_merge_list/sub/list2.yaml",
source_file_type="obj",
),
create_if_not_found=True,
)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("newlymade")
data = yaml_serializer.load_yaml(
(config_path / "automations/include_dir_merge_list/sub/list2.yaml").open("r")
)
self.assertIsInstance(data, list)
def test_save_improper_types_obj_to_list(self):
config_path, automation_manager = self.get_manager(HA_CONFIG6_EXAMPLE)
automation_manager.reload()
self.assertTrue((config_path / "automations/include_dir_list/home/down.yaml").exists())
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("newlymade")
with self.assertRaises(AttemptingToOverwriteAnIncompatibleFileError):
automation_manager.update(
ExtenededAutomation(
id="newlymade",
configuration_key="automation cools",
source_file="automations/include_dir_list/home/down.yaml",
source_file_type="list",
),
create_if_not_found=True,
)
automation_manager.reload()
with self.assertRaises(DBNoAutomationFound):
automation_manager.get("newlymade")
data = yaml_serializer.load_yaml(
(config_path / "automations/include_dir_list/home/down.yaml").open("r")
)
self.assertIsInstance(data, dict)
def test_update_tags_through_automation_update(self):
_, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Living",
"Type": "Button",
},
)
auto.tags["Room"] = "Bathroom"
automation_manager.update(auto)
del auto
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Bathroom",
"Type": "Button",
},
)
def test_update_tags_through_tags(self):
_, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Living",
"Type": "Button",
},
)
auto.tags["Room"] = "Bathroom"
automation_manager.update_tags(auto.id, auto.tags)
del auto
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Bathroom",
"Type": "Button",
},
)
def test_delete_tags(self):
_, automation_manager = self.get_manager(HA_CONFIG_EXAMPLE)
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{
"Room": "Living",
"Type": "Button",
},
)
automation_manager.delete_tags(auto.id)
del auto
automation_manager.reload()
auto = automation_manager.get("1619371298367")
self.assertDictEqual(
auto.tags,
{},
) )
manager.update_tags("test1", {"room": "bathroom"})
auto = manager.get(0)
assert auto.tags == {"room": "bathroom"}
+19
View File
@@ -0,0 +1,19 @@
from pathlib import Path
from tempfile import mktemp
from unittest import TestCase
from src.automations.db import AutomationDBConnection
def make_temp_db():
return AutomationDBConnection(Path(mktemp() + ".db"))
class TestWithDB(TestCase):
def setUp(self) -> None:
self.db = make_temp_db()
self.db.create_db()
self.db_file = self.db.db_file
def tearDown(self) -> None:
self.db_file.unlink()
+5 -11
View File
@@ -1,7 +1,6 @@
from unittest import TestCase from unittest import TestCase
from src.automations.types import AutomationData, AutomationMetdata from src.automations.types import BaseAutomation
from src.hass_config.errors import MissingFile
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
from tests.utils import create_dummy_config_folder from tests.utils import create_dummy_config_folder
@@ -9,41 +8,36 @@ from tests.utils import create_dummy_config_folder
class loader_tests(TestCase): class loader_tests(TestCase):
def test_load_automation_from_config_yaml(self): def test_load_automation_from_config_yaml(self):
folder = create_dummy_config_folder( folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))], [BaseAutomation(id="test")],
automation_in_conifguration_mode="inline", automation_in_conifguration_mode="inline",
) )
hass_config = HassConfig(folder) hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict) self.assertIsInstance(hass_config.configurations, dict)
self.assertTrue("automation" in hass_config.configurations) self.assertTrue("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test")
def test_load_automation_from_config_yaml_include(self): def test_load_automation_from_config_yaml_include(self):
folder = create_dummy_config_folder( folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))], [BaseAutomation(id="test")],
automation_in_conifguration_mode="include", automation_in_conifguration_mode="include",
) )
hass_config = HassConfig(folder) hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict) self.assertIsInstance(hass_config.configurations, dict)
self.assertTrue("automation" in hass_config.configurations) self.assertTrue("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test")
def test_load_automation_from_infer(self): def test_load_automation_from_infer(self):
folder = create_dummy_config_folder( folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))], [BaseAutomation(id="test")],
automation_in_conifguration_mode="none", automation_in_conifguration_mode="none",
) )
hass_config = HassConfig(folder) hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict) self.assertIsInstance(hass_config.configurations, dict)
self.assertFalse("automation" in hass_config.configurations) self.assertFalse("automation" in hass_config.configurations)
self.assertEqual(hass_config.automations[0]["id"], "test")
def test_missing_automations(self): def test_missing_automations(self):
folder = create_dummy_config_folder( folder = create_dummy_config_folder(
[AutomationData(metadata=AutomationMetdata(id="test"))], [BaseAutomation(id="test")],
automation_in_conifguration_mode="none", automation_in_conifguration_mode="none",
) )
(folder / "automations.yaml").unlink() (folder / "automations.yaml").unlink()
hass_config = HassConfig(folder) hass_config = HassConfig(folder)
self.assertIsInstance(hass_config.configurations, dict) self.assertIsInstance(hass_config.configurations, dict)
with self.assertRaises(MissingFile):
list(hass_config.automations)
+30 -2
View File
@@ -7,7 +7,6 @@ from src.yaml_serializer.types import (
IncludedYamlDir, IncludedYamlDir,
SecretValue, SecretValue,
) )
from tests.utils import SAMPLES_FOLDER
class dumping_yamls_tests(TestCase): class dumping_yamls_tests(TestCase):
@@ -25,10 +24,39 @@ class dumping_yamls_tests(TestCase):
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")}) yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
self.assertEqual(yaml, "google_password: !secret 'gpass'\n") self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
def test_dumping_stub(self): def test_dumping_include_dir_list(self):
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")}) yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n") self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
def test_dumping_include_dir_merge_list(self):
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_merge_list", "sensors/*yaml")})
self.assertEqual(yaml, "sensor: !include_dir_merge_list 'sensors/*yaml'\n")
def test_load_complex_automation_setup(self):
yaml_obj = load_yaml(
io.StringIO(
"""
automation manual: !include_dir_list ./automations/include_dir_list
automation ui: !include automations/ui.yaml
automation: !include automations/base.yaml
automation cools: !include_dir_merge_list automations/include_dir_merge_list
"""
)
)
self.assertDictEqual(
dict(yaml_obj),
{
"automation manual": IncludedYamlDir(
"include_dir_list", "./automations/include_dir_list"
),
"automation ui": IncludedYaml("automations/ui.yaml"),
"automation cools": IncludedYamlDir(
"include_dir_merge_list", "automations/include_dir_merge_list"
),
"automation": IncludedYaml("automations/base.yaml"),
},
)
def test_load_stub(self): def test_load_stub(self):
yaml_obj = load_yaml( yaml_obj = load_yaml(
io.StringIO( io.StringIO(
+8 -5
View File
@@ -4,7 +4,7 @@ from tempfile import mkdtemp
from typing import List, Literal, Optional, Tuple from typing import List, Literal, Optional, Tuple
from src.automations.manager import AutomationManager from src.automations.manager import AutomationManager
from src.automations.types import AutomationData from src.automations.types import BaseAutomation
from src.hass_config.loader import HassConfig from src.hass_config.loader import HassConfig
from src.yaml_serializer import dump_yaml from src.yaml_serializer import dump_yaml
from src.yaml_serializer.types import IncludedYaml from src.yaml_serializer.types import IncludedYaml
@@ -14,6 +14,9 @@ SAMPLES_FOLDER = THIS_FOLDER / "samples"
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config" HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2" HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3" HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
HA_CONFIG4_EXAMPLE = SAMPLES_FOLDER / "config-4"
HA_CONFIG5_EXAMPLE = SAMPLES_FOLDER / "config-5"
HA_CONFIG6_EXAMPLE = SAMPLES_FOLDER / "config-6"
def get_example_automation_loader( def get_example_automation_loader(
@@ -43,7 +46,7 @@ def create_copy_of_example_config(config_to_copy: Path = HA_CONFIG_EXAMPLE) -> P
def get_dummy_automation_loader( def get_dummy_automation_loader(
auto: List[AutomationData], auto: List[BaseAutomation],
secrets: Optional[dict] = None, secrets: Optional[dict] = None,
other_config: Optional[dict] = None, other_config: Optional[dict] = None,
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include", automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
@@ -51,7 +54,7 @@ def get_dummy_automation_loader(
"""Creates a dummy /config structure for testing and return the loader and config """Creates a dummy /config structure for testing and return the loader and config
Args: Args:
auto (List[AutomationData]): automations auto (List[BaseAutomation]): automations
secrets (Optional[dict], optional): dictionary of secrets secrets (Optional[dict], optional): dictionary of secrets
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None. other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline. automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline.
@@ -71,7 +74,7 @@ def get_dummy_automation_loader(
def create_dummy_config_folder( def create_dummy_config_folder(
auto: List[AutomationData], auto: List[BaseAutomation],
secrets: Optional[dict] = None, secrets: Optional[dict] = None,
other_config: Optional[dict] = None, other_config: Optional[dict] = None,
automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include", automation_in_conifguration_mode: Literal["include", "inline", "none"] = "include",
@@ -79,7 +82,7 @@ def create_dummy_config_folder(
"""Creates a dummy /config structure for testing """Creates a dummy /config structure for testing
Args: Args:
auto (List[AutomationData]): automations auto (List[BaseAutomation]): automations
secrets (Optional[dict], optional): dictionary of secrets secrets (Optional[dict], optional): dictionary of secrets
other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None. other_config (Optional[dict], optional): some config stuff to place into configuration.yaml. Defaults to None.
automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline. automation_in_conifguration_mode (Literal['include', 'inline', 'none'], optional): whether to !include automation as a separete file or in the configuration yaml. Defaults to inline.
BIN
View File
Binary file not shown.
-1
View File
@@ -1 +0,0 @@
../webapp/build
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 MiB

+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation name: Shortumation
version: v0.4.0 version: v0.5.3
slug: shortumation slug: shortumation
image: asosnovsky/shortumation-{arch} image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation" url: "https://github.com/asosnovsky/Shortumation"
+5 -2
View File
@@ -12,9 +12,12 @@ services:
shortumation: shortumation:
# make sure to replace the ARCH with whatever system you are running! # make sure to replace the ARCH with whatever system you are running!
image: "asosnovsky/shortumation-${ARCH:-amd64}:${SHORTUMATION_VERSION:-latest}" image: "asosnovsky/shortumation-${ARCH:-amd64}:${SHORTUMATION_VERSION:-latest}"
network_mode: host ports:
- 8000:8000
extra_hosts:
- "host.docker.internal:host-gateway"
volumes: volumes:
- ./config:/config - ./config:/config
environment: environment:
- SUPERVISOR_TOKEN=${SUPERVISOR_TOKEN} - SUPERVISOR_TOKEN=${SUPERVISOR_TOKEN}
- HASSIO_WS=ws://0.0.0.0:8123/api/websocket - HASSIO_WS=ws://host.docker.internal:8123/api/websocket
+3
View File
@@ -0,0 +1,3 @@
{
"task.allowAutomaticTasks": true
}
+6 -2
View File
@@ -2,13 +2,17 @@
"version": "2.0.0", "version": "2.0.0",
"tasks": [ "tasks": [
{ {
"icon": {
"id": "server-environment"
},
"type": "shell", "type": "shell",
"label": "Docker: Server", "label": "Docker: Start Server",
"group": "none", "group": "none",
"command": [".vscode/bin/start-docker-server.sh"], "command": [".vscode/bin/start-docker-server.sh"],
"runOptions": { "runOptions": {
"runOn": "folderOpen" "runOn": "folderOpen"
} },
"problemMatcher": []
}, },
{ {
"type": "npm", "type": "npm",
+2 -2
View File
@@ -17,7 +17,7 @@
"@uiw/react-codemirror": "4.10.4", "@uiw/react-codemirror": "4.10.4",
"autosuggest-highlight": "3.3.4", "autosuggest-highlight": "3.3.4",
"home-assistant-js-websocket": "7.1.0", "home-assistant-js-websocket": "7.1.0",
"jss": "10.9.1", "jss": "10.9.2",
"material-ui-confirm": "3.0.4", "material-ui-confirm": "3.0.4",
"notistack": "2.0.5", "notistack": "2.0.5",
"react": "18.2.0", "react": "18.2.0",
@@ -25,7 +25,7 @@
"react-dom": "18.2.0", "react-dom": "18.2.0",
"react-flow-renderer": "10.3.12", "react-flow-renderer": "10.3.12",
"react-imask": "6.4.2", "react-imask": "6.4.2",
"react-jss": "10.9.1", "react-jss": "10.9.2",
"react-router-dom": "6.3.0", "react-router-dom": "6.3.0",
"react-scripts": "5.0.1", "react-scripts": "5.0.1",
"superstruct": "0.16.0", "superstruct": "0.16.0",
+18 -7
View File
@@ -1,20 +1,31 @@
import './App.css'; import "./App.css";
import { Routes, Route, BrowserRouter } from "react-router-dom"; import { Routes, Route, BrowserRouter } from "react-router-dom";
import { AutomationRoute } from 'routes/automation'; import { AutomationRoute } from "routes/automation";
import { useConnectedApiService } from 'apiService'; import { useConnectedApiService } from "apiService";
import { ErrorBoundary } from 'components/ErrorBoundary'; import { ErrorBoundary } from "components/ErrorBoundary";
import { CookiesProvider } from "react-cookie"; import { CookiesProvider } from "react-cookie";
import { Page } from "components/Page";
const ConnectedAutomationRoute = () => {
const api = useConnectedApiService();
return <AutomationRoute api={api} />;
};
function App() { function App() {
const api = useConnectedApiService();
return ( return (
<div className="app"> <div className="app">
<ErrorBoundary> <ErrorBoundary>
<CookiesProvider> <CookiesProvider>
<BrowserRouter> <BrowserRouter>
<Routes> <Routes>
<Route path="*" element={<AutomationRoute api={api} />} /> <Route
path="*"
element={
<Page>
<ConnectedAutomationRoute />
</Page>
}
/>
</Routes> </Routes>
</BrowserRouter> </BrowserRouter>
</CookiesProvider> </CookiesProvider>
+13 -10
View File
@@ -1,4 +1,4 @@
import { AutomationData } from "types/automations"; import { AutomationData, BareAutomationData } from "types/automations";
import { API } from "./base"; import { API } from "./base";
import { ListData, ListParams } from "./types"; import { ListData, ListParams } from "./types";
import { import {
@@ -18,13 +18,18 @@ export const makeAutomationAPI = (api: API) => ({
}); });
return data; return data;
}, },
async update({ index, auto }: { index: number; auto: AutomationData }) { async update(auto: AutomationData) {
return await api.makeCall({ return await api.makeCall({
method: "PUT",
path: AUTOMTAION_ITEM, path: AUTOMTAION_ITEM,
data: { data: auto,
index, });
data: auto, },
}, async create(auto: BareAutomationData) {
return await api.makeCall({
method: "POST",
path: AUTOMTAION_ITEM,
data: auto,
}); });
}, },
async updateTags({ async updateTags({
@@ -42,13 +47,11 @@ export const makeAutomationAPI = (api: API) => ({
}, },
}); });
}, },
async remove({ index }: { index: number }) { async remove(auto: AutomationData) {
return await api.makeCall({ return await api.makeCall({
method: "DELETE", method: "DELETE",
path: AUTOMTAION_ITEM, path: AUTOMTAION_ITEM,
data: { data: auto,
index,
},
}); });
}, },
}); });
+17 -19
View File
@@ -1,22 +1,20 @@
import { APIRequest, APIResponse } from './types'; import { APIRequest, APIResponse } from "./types";
export interface API { export interface API {
makeCall: <Res = any, Req = any>(req: APIRequest<Req>) => Promise<APIResponse<Res>>; makeCall: <Res = any, Req = any>(
req: APIRequest<Req>
) => Promise<APIResponse<Res>>;
} }
export const makeRemoteAPI = (baseURL: string): API => ({ export const makeRemoteAPI = (baseURL: string): API => ({
async makeCall({ async makeCall({ path, method = "POST", data = {} }) {
path,
method = "POST",
data = {}
}) {
try { try {
const payload: RequestInit = { const payload: RequestInit = {
method, method,
headers: { headers: {
"Content-Type": "application/json" "Content-Type": "application/json",
}, },
}; };
if (method !== 'GET') { if (method !== "GET") {
payload["body"] = JSON.stringify(data); payload["body"] = JSON.stringify(data);
} }
const reply = await fetch(baseURL + path, payload); const reply = await fetch(baseURL + path, payload);
@@ -25,27 +23,27 @@ export const makeRemoteAPI = (baseURL: string): API => ({
response = { response = {
ok: true, ok: true,
data: await reply.json(), data: await reply.json(),
} };
} else { } else {
response = { response = {
ok: false, ok: false,
error: await reply.text(), error: await reply.text(),
} };
console.error(response) console.error(response);
} }
return response return response;
} catch (err) { } catch (err) {
console.error(err) console.error(err);
let error = String(err) let error = String(err);
if (err instanceof Error) { if (err instanceof Error) {
error += ` ${err.stack}` error += ` ${err.stack}`;
} }
return { return {
ok: false, ok: false,
error, error,
} };
} }
} },
}) });
+1
View File
@@ -22,6 +22,7 @@ export const useAPIService = (automationAPI: AutomationAPI) => {
state, state,
removeAutomation: wrapCall(automationAPI.remove), removeAutomation: wrapCall(automationAPI.remove),
updateAutomation: wrapCall(automationAPI.update), updateAutomation: wrapCall(automationAPI.update),
createAutomation: wrapCall(automationAPI.create),
updateTags: wrapCall(automationAPI.updateTags), updateTags: wrapCall(automationAPI.updateTags),
}; };
}; };
+9 -9
View File
@@ -24,12 +24,12 @@ test("mock api uses initial autos for initial population -- some data", async ()
test("populate mock api with some data", async () => { test("populate mock api with some data", async () => {
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any)); const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
await mockApi.update({ index: 0, auto: createMockAuto() }); await mockApi.update(createMockAuto());
let data = await mockApi.list({ limit: 10, offset: 0 }); let data = await mockApi.list({ limit: 10, offset: 0 });
expect(data.ok).toBe(true); expect(data.ok).toBe(true);
expect((data as any).data.data).toHaveLength(1); expect((data as any).data.data).toHaveLength(1);
expect((data as any).data.totalItems).toBe(1); expect((data as any).data.totalItems).toBe(1);
await mockApi.update({ index: 1, auto: createMockAuto() }); await mockApi.update(createMockAuto());
data = await mockApi.list({ limit: 10, offset: 0 }); data = await mockApi.list({ limit: 10, offset: 0 });
expect((data as any).data.data).toHaveLength(2); expect((data as any).data.data).toHaveLength(2);
expect((data as any).data.totalItems).toBe(2); expect((data as any).data.totalItems).toBe(2);
@@ -50,13 +50,13 @@ test("delete/update data from mock api", async () => {
); );
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data; let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
const toBeEdited = data[0]; const toBeEdited = data[0];
toBeEdited.metadata.alias = "Bob is my uncle"; toBeEdited.alias = "Bob is my uncle";
await mockApi.update({ index: 0, auto: toBeEdited }); await mockApi.update(toBeEdited);
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data; data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
expect(data[0].metadata.alias).toEqual("Bob is my uncle"); expect(data[0].alias).toEqual("Bob is my uncle");
await mockApi.remove({ index: 0 }); await mockApi.remove(data[0]);
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data; data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false); expect(data[0].alias === "Bob is my uncle").toEqual(false);
}); });
test("update tags from mock api", async () => { test("update tags from mock api", async () => {
@@ -74,7 +74,7 @@ test("update tags from mock api", async () => {
); );
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
.data as AutomationData[]; .data as AutomationData[];
const autoId = data[0].metadata.id; const autoId = data[0].id;
expect(data[0].tags).toStrictEqual({}); expect(data[0].tags).toStrictEqual({});
mockApi.updateTags({ mockApi.updateTags({
automation_id: autoId, automation_id: autoId,
@@ -85,7 +85,7 @@ test("update tags from mock api", async () => {
}); });
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
.data as AutomationData[]; .data as AutomationData[];
expect(data[0].metadata.id).toEqual(autoId); expect(data[0].id).toEqual(autoId);
expect(data[0].tags).toStrictEqual({ expect(data[0].tags).toStrictEqual({
room: "bathroom", room: "bathroom",
type: "popup", type: "popup",
+29 -9
View File
@@ -1,5 +1,5 @@
import { useRef } from "react"; import { useRef } from "react";
import { AutomationData } from "types/automations"; import { AutomationData, BareAutomationData } from "types/automations";
import { API } from "./base"; import { API } from "./base";
import { import {
AUTOMTAION_LIST, AUTOMTAION_LIST,
@@ -35,10 +35,16 @@ export const useMockAPI = (
} as any; } as any;
} }
if (path === AUTOMTAION_ITEM) { if (path === AUTOMTAION_ITEM) {
if (method === "POST") { if (method === "PUT") {
const { index, data: auto } = data as any; const auto = data as AutomationData;
if (index >= automationsRef.current.length) { const index = automationsRef.current.findIndex(
automationsRef.current = [...automationsRef.current, auto]; ({ id }) => auto.id === id
);
if (index < 0) {
return {
ok: false,
error: "Not Found",
};
} else { } else {
automationsRef.current = [ automationsRef.current = [
...automationsRef.current.slice(0, index), ...automationsRef.current.slice(0, index),
@@ -51,10 +57,24 @@ export const useMockAPI = (
data: {}, data: {},
}; };
} else if (method === "DELETE") { } else if (method === "DELETE") {
const { index } = data as any; const auto = data as AutomationData;
automationsRef.current = automationsRef.current.filter(
({ id }) => id !== auto.id
);
return {
ok: true,
data: {},
};
} else if (method === "POST") {
const auto = data as BareAutomationData;
automationsRef.current = [ automationsRef.current = [
...automationsRef.current.slice(0, index), ...automationsRef.current,
...automationsRef.current.slice(index + 1), {
...auto,
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
},
]; ];
return { return {
ok: true, ok: true,
@@ -67,7 +87,7 @@ export const useMockAPI = (
const { automation_id, tags } = data as any; const { automation_id, tags } = data as any;
for (let i = 0; i < automationsRef.current.length; i++) { for (let i = 0; i < automationsRef.current.length; i++) {
const auto = automationsRef.current[i]; const auto = automationsRef.current[i];
if (auto.metadata.id === automation_id) { if (auto.id === automation_id) {
automationsRef.current[i].tags = JSON.parse(JSON.stringify(tags)); automationsRef.current[i].tags = JSON.parse(JSON.stringify(tags));
break; break;
} }
+15 -12
View File
@@ -1,26 +1,29 @@
import { AutomationData } from "types/automations"; import { AutomationData } from "types/automations";
export interface ListParams { export interface ListParams {
offset: number; offset: number;
limit: number; limit: number;
} }
export type APIRequest<D> = { export type APIRequest<D> = {
path: string; path: string;
method?: "POST" | "DELETE" | "GET", method?: "POST" | "DELETE" | "GET" | "PUT";
data?: D; data?: D;
}; };
export type APIResponse<D> = { export type APIResponse<D> =
ok: true; | {
data: D; ok: true;
} | { data: D;
ok: false; }
error: string; | {
} ok: false;
export type Errorable<D> = ({ ready: true } & APIResponse<D>) | { error: string;
ready: false; };
} export type Errorable<D> =
| ({ ready: true } & APIResponse<D>)
| {
ready: false;
};
export interface ListData<D> { export interface ListData<D> {
params: ListParams; params: ListParams;
totalItems: number; totalItems: number;
+2 -2
View File
@@ -27,10 +27,10 @@ export const makeReloadAutomations = (
}); });
}; };
const wrapCall = <Call extends (a: any) => Promise<any>>(fcn: Call) => { const wrapCall = <Call extends (a: any) => Promise<any>>(fcn: Call) => {
return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => { return async (args: Parameters<Call>[0]) => {
const resp = await fcn(args); const resp = await fcn(args);
await reload(); await reload();
return resp; return resp as ReturnType<Call>;
}; };
}; };
return { return {
@@ -44,6 +44,9 @@ export const NoTags = make({
wowo: "!", wowo: "!",
}, },
mode: "single", mode: "single",
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
}, },
}); });
@@ -60,5 +63,8 @@ export const SomeTags = make({
wowo: "!", wowo: "!",
}, },
mode: "single", mode: "single",
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
}, },
}); });
@@ -1,7 +1,10 @@
import "./AutoInfoBox.css"; import "./AutoInfoBox.css";
import { AutomationMetadata } from "types/automations"; import {
AutomationMetadata,
AutomationShortumationMetadata,
} from "types/automations";
import { InputList } from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/Base/InputText";
import { FC, ReactNode, useRef, useState } from "react"; import { FC, ReactNode, useRef, useState } from "react";
import { AddIcon, TrashIcon } from "components/Icons"; import { AddIcon, TrashIcon } from "components/Icons";
import InputAutoText from "components/Inputs/InputAutoText"; import InputAutoText from "components/Inputs/InputAutoText";
@@ -9,7 +12,7 @@ import { TagDB } from "components/AutomationManager/TagDB";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
export interface AutoInfoBoxProps { export interface AutoInfoBoxProps {
metadata: AutomationMetadata; metadata: AutomationMetadata & Partial<AutomationShortumationMetadata>;
tags: Array<[string, string]>; tags: Array<[string, string]>;
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void; onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
tagDB: TagDB; tagDB: TagDB;
@@ -21,7 +21,7 @@ const Template: ComponentStory<typeof AutomationEditor> = (args) => {
<AutomationEditor <AutomationEditor
{...args} {...args}
tagDB={useTagDB( tagDB={useTagDB(
state ? [{ id: state.metadata.id, tags: state.tags }] : [], state ? [{ id: state.id, tags: state.tags }] : [],
() => {} () => {}
)} )}
automation={state} automation={state}
@@ -46,16 +46,16 @@ Simple.args = {
Type: "Smell", Type: "Smell",
Use: "Flushing", Use: "Flushing",
}, },
metadata: { id: "random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
id: alias: "Random",
"random" + String(Date.now()) + String(Date.now()) + String(Date.now()), description: "Example Metadata",
alias: "Random", trigger_variables: {
description: "Example Metadata", wowo: "!",
trigger_variables: {
wowo: "!",
},
mode: "single",
}, },
mode: "single",
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
trigger: [ trigger: [
{ {
platform: "numeric_state", platform: "numeric_state",
@@ -66,7 +66,7 @@ Simple.args = {
event: "start", event: "start",
}, },
], ],
sequence: [ action: [
{ {
condition: "and", condition: "and",
conditions: [ conditions: [
@@ -102,17 +102,18 @@ EmptyStart.args = {
automation: { automation: {
condition: [], condition: [],
tags: {}, tags: {},
metadata: { id: "random",
id: "random", alias: "Random",
alias: "Random", description: "Example Metadata",
description: "Example Metadata", source_file: "automation.yaml",
trigger_variables: { source_file_type: "list",
wowo: "!", configuration_key: "automation",
}, trigger_variables: {
mode: "single", wowo: "!",
}, },
mode: "single",
trigger: [], trigger: [],
sequence: [], action: [],
}, },
}; };
@@ -122,10 +123,9 @@ BadAutomationInvalidMetadata.args = {
automation: { automation: {
condition: [], condition: [],
tags: {}, tags: {},
metadata: {} as any,
trigger: [], trigger: [],
sequence: [], action: [],
}, } as any,
}; };
export const BadAutomationInvalidTriggers = Template.bind({}); export const BadAutomationInvalidTriggers = Template.bind({});
@@ -134,17 +134,18 @@ BadAutomationInvalidTriggers.args = {
automation: { automation: {
condition: [], condition: [],
tags: {}, tags: {},
metadata: { id: "random",
id: "random", alias: "Random",
alias: "Random", description: "Example Metadata",
description: "Example Metadata", source_file: "automation.yaml",
trigger_variables: { source_file_type: "list",
wowo: "!", configuration_key: "automation",
}, trigger_variables: {
mode: "single", wowo: "!",
}, },
mode: "single",
trigger: ["haha I am a string"] as any, trigger: ["haha I am a string"] as any,
sequence: [], action: [],
}, },
}; };
@@ -154,34 +155,32 @@ BadAutomationInvalidSequence.args = {
automation: { automation: {
condition: [], condition: [],
tags: {}, tags: {},
metadata: { alias: "Bad Choose Sequence",
id: "random", description: "Example Metadata",
alias: "Bad Choose Sequence", trigger_variables: {
description: "Example Metadata", wowo: "!",
trigger_variables: {
wowo: "!",
},
mode: "single",
}, },
mode: "single",
trigger: [], trigger: [],
sequence: [ action: [
{ {
choose: {}, choose: {},
}, },
] as any, ],
}, } as any,
}; };
export const RepeatExample = Template.bind({}); export const RepeatExample = Template.bind({});
RepeatExample.args = { RepeatExample.args = {
...RepeatExample.args, ...RepeatExample.args,
automation: { automation: {
metadata: { id: "1654976151462",
id: "1654976151462", alias: "Get out of baby room",
alias: "Get out of baby room", description: "",
description: "", mode: "single",
mode: "single", source_file: "automation.yaml",
}, source_file_type: "list",
configuration_key: "automation",
trigger: [ trigger: [
{ {
type: "opened", type: "opened",
@@ -192,7 +191,7 @@ RepeatExample.args = {
}, },
], ],
condition: [], condition: [],
sequence: [ action: [
{ {
service: "notify.mobile_app_levas_phone", service: "notify.mobile_app_levas_phone",
data: { data: {
@@ -3,35 +3,41 @@ import "./index.mobile.css";
import { FC, useState } from "react"; import { FC, useState } from "react";
import { useCookies } from "react-cookie"; import { useCookies } from "react-cookie";
import { ControlButton } from "react-flow-renderer";
import Skeleton from "@mui/material/Skeleton"; import Skeleton from "@mui/material/Skeleton";
import LinearProgress from "@mui/material/LinearProgress"; import LinearProgress from "@mui/material/LinearProgress";
import SpeedDial from "@mui/material/SpeedDial";
import SpeedDialAction from "@mui/material/SpeedDialAction";
import Edit from "@mui/icons-material/Edit"; import SpeedDialIcon from "@mui/icons-material/SettingsRounded";
import UndoIcon from "@mui/icons-material/UndoSharp";
import Icon from "@mui/material/Icon"; import Icon from "@mui/material/Icon";
import ModeEditOutlineTwoToneIcon from "@mui/icons-material/ModeEditOutlineTwoTone"; import EditIcon from "@mui/icons-material/ModeEditOutlineTwoTone";
import DeleteIcon from "@mui/icons-material/DeleteForever";
import { CheckMarkIcon } from "components/Icons"; import { CheckMarkIcon } from "components/Icons";
import RunIcon from "@mui/icons-material/RunCircleOutlined";
import { Modal } from "components/Modal"; import { Modal } from "components/Modal";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Buttons/Button";
import InputYaml from "components/Inputs/InputYaml"; import InputYaml from "components/Inputs/Base/InputYaml";
import { TagDB } from "components/AutomationManager/TagDB"; import { TagDB } from "components/AutomationManager/TagDB";
import { DAGDims } from "components/DAGGraph/elements/types"; import { DAGDims } from "components/DAGGraph/elements/types";
import { DAGAutomationGraph } from "components/DAGGraph"; import { DAGAutomationGraph } from "components/DAGGraph";
import { InputList } from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
import { InputTextView } from "components/Inputs/InputTextView"; import { InputTextView } from "components/Inputs/InputTextView";
import { AutomationData } from "types/automations"; import { AutomationData, BareAutomationData } from "types/automations";
import { MiniFailure } from "types/validators/helper"; import { MiniFailure } from "types/validators/helper";
import { AutoInfoBox } from "./AutoInfoBox"; import { AutoInfoBox } from "./AutoInfoBox";
import { useAutomatioEditorState, EditorData } from "./state"; import { useAutomatioEditorState, EditorData } from "./state";
interface Props { interface Props {
automation?: AutomationData; automation?: AutomationData | BareAutomationData;
dims: DAGDims; dims: DAGDims;
onUpdate: (auto: AutomationData) => void; onUpdate: (auto: AutomationData | BareAutomationData) => void;
onTrigger: () => void;
onDelete: () => void;
tagDB: TagDB; tagDB: TagDB;
isNew?: boolean; isNew?: boolean;
} }
@@ -39,6 +45,8 @@ export const AutomationEditor: FC<Props> = ({
dims, dims,
automation: propsAutos, automation: propsAutos,
onUpdate: propsOnUpdate, onUpdate: propsOnUpdate,
onDelete,
onTrigger,
tagDB, tagDB,
isNew, isNew,
}) => { }) => {
@@ -52,6 +60,7 @@ export const AutomationEditor: FC<Props> = ({
validate, validate,
save, save,
saveAndUpdate, saveAndUpdate,
undo,
} = useAutomatioEditorState(propsAutos, propsOnUpdate); } = useAutomatioEditorState(propsAutos, propsOnUpdate);
const [infoBoxOpen, setInfoBox] = useState(false); const [infoBoxOpen, setInfoBox] = useState(false);
const [ const [
@@ -90,7 +99,7 @@ export const AutomationEditor: FC<Props> = ({
)} )}
<Modal open={infoBoxOpen}> <Modal open={infoBoxOpen}>
<AutoInfoBox <AutoInfoBox
metadata={state.data.metadata} metadata={state.data}
tags={state.data.tags} tags={state.data.tags}
onUpdate={updateMetadata} onUpdate={updateMetadata}
tagDB={tagDB} tagDB={tagDB}
@@ -119,14 +128,14 @@ export const AutomationEditor: FC<Props> = ({
<div className="automation-editor--flow-wrapper--toolbar"> <div className="automation-editor--flow-wrapper--toolbar">
<div className="automation-editor--flow-wrapper--toolbar--title"> <div className="automation-editor--flow-wrapper--toolbar--title">
<span className="automation-editor--flow-wrapper--toolbar--title--text"> <span className="automation-editor--flow-wrapper--toolbar--title--text">
<div className="id">{state.data.metadata.id}</div> <div className="id">{state.data.id}</div>
<InputTextView <InputTextView
value={state.data.metadata.alias ?? ""} value={state.data.alias ?? ""}
placeholder="Name" placeholder="Name"
onChange={(alias) => onChange={(alias) =>
updateMetadata( updateMetadata(
{ {
...state.data.metadata, ...state.data,
alias, alias,
}, },
state.data.tags state.data.tags
@@ -139,13 +148,13 @@ export const AutomationEditor: FC<Props> = ({
label="Mode" label="Mode"
className="automation-editor--flow-wrapper--toolbar--modes" className="automation-editor--flow-wrapper--toolbar--modes"
current={{ current={{
id: state.data.metadata.mode, id: state.data.mode,
label: "", label: "",
}} }}
onChange={({ id }) => onChange={({ id }) =>
updateMetadata( updateMetadata(
{ {
...state.data.metadata, ...state.data,
mode: id, mode: id,
}, },
state.data.tags state.data.tags
@@ -176,12 +185,12 @@ export const AutomationEditor: FC<Props> = ({
/> />
<InputTextView <InputTextView
className="description" className="description"
value={state.data.metadata.description ?? ""} value={state.data.description ?? ""}
placeholder="Description" placeholder="Description"
onChange={(description) => onChange={(description) =>
updateMetadata( updateMetadata(
{ {
...state.data.metadata, ...state.data,
description, description,
}, },
state.data.tags state.data.tags
@@ -198,34 +207,65 @@ export const AutomationEditor: FC<Props> = ({
Flip Flip
</Button> </Button>
)} )}
<Button {state.status === "changed" && (
className={"automation-editor--flow-wrapper--toolbar--edit-btn"} <Button onClick={undo}>
onClick={() => setInfoBox(!infoBoxOpen)} <UndoIcon />
> </Button>
Metadata <Edit /> )}
</Button>
<Button <Button
className={"automation-editor--flow-wrapper--toolbar--save-btn"} className={"automation-editor--flow-wrapper--toolbar--save-btn"}
onClick={save} onClick={save}
disabled={state.status !== "changed" && !isNew} disabled={state.status !== "changed"}
> >
Save <CheckMarkIcon color="#bf4" /> Save <CheckMarkIcon color="#bf4" />
</Button> </Button>
</div> </div>
<DAGAutomationGraph <DAGAutomationGraph
sequence={state.data.sequence} action={state.data.action}
trigger={state.data.trigger} trigger={state.data.trigger}
condition={state.data.condition} condition={state.data.condition}
onSequenceUpdate={updateSequence} onActionUpdate={updateSequence}
onTriggerUpdate={updateTrigger} onTriggerUpdate={updateTrigger}
onConditionUpdate={updateCondition} onConditionUpdate={updateCondition}
isFlipped={flipped} isFlipped={flipped}
additionalControls={
<ControlButton onClick={() => setInfoBox(!infoBoxOpen)}>
<ModeEditOutlineTwoToneIcon />
</ControlButton>
}
/> />
<SpeedDial
ariaLabel="options label"
sx={{
position: "absolute",
bottom: 16,
right: 16,
}}
icon={<SpeedDialIcon />}
>
<SpeedDialAction
// tooltipOpen
sx={{ pointerEvents: "auto" }}
icon={<RunIcon />}
tooltipTitle={"Trigger"}
onClick={onTrigger}
/>
<SpeedDialAction
// tooltipOpen
icon={<DeleteIcon />}
tooltipTitle={"Delete"}
onClick={onDelete}
/>
<SpeedDialAction
// tooltipOpen
icon={<EditIcon />}
tooltipTitle={"Metadata"}
onClick={() => setInfoBox(!infoBoxOpen)}
/>
{state.status === "changed" && (
<SpeedDialAction
// tooltipOpen
icon={<UndoIcon />}
tooltipTitle={"Undo"}
onClick={undo}
/>
)}
</SpeedDial>
</div> </div>
</div> </div>
); );
@@ -242,26 +282,24 @@ export const ValidationBox: FC<{
data: props.data, data: props.data,
}); });
const makeSave = const onSave = (d: EditorData) => {
<K extends keyof EditorData>(k: K) => const newData = {
(d: EditorData[K]) => { ...data,
const newData = { ...d,
...data,
[k]: d,
};
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
});
} else {
setState({
failures: [],
data: newData,
});
}
}; };
const newFails = props.validate(newData);
if (newFails) {
setState({
failures: newFails,
data: newData,
});
} else {
setState({
failures: [],
data: newData,
});
}
};
return ( return (
<div className="automation-editor-failures"> <div className="automation-editor-failures">
@@ -282,27 +320,7 @@ export const ValidationBox: FC<{
<span> <span>
Please correct the automation file manually and then continue! Please correct the automation file manually and then continue!
</span> </span>
<InputYaml <InputYaml label="Raw" value={data} onChange={onSave} />
label="Metadata"
value={data.metadata}
onChange={makeSave("metadata")}
/>
<InputYaml label="Tags" value={data.tags} onChange={makeSave("tags")} />
<InputYaml
label="Trigger"
value={data.trigger}
onChange={makeSave("trigger")}
/>
<InputYaml
label="Condition"
value={data.condition}
onChange={makeSave("condition")}
/>
<InputYaml
label="Actions"
value={data.sequence}
onChange={makeSave("sequence")}
/>
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}> <Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>
Save Save
</Button> </Button>
+154 -101
View File
@@ -1,117 +1,170 @@
import { useState, useEffect } from 'react'; import { useState, useEffect } from "react";
import { AutomationData, AutomationMetadata } from "types/automations"; import {
AutomationData,
AutomationMetadata,
BareAutomationData,
} from "types/automations";
import * as v from "types/validators/autmation"; import * as v from "types/validators/autmation";
import { getFailures } from "types/validators/helper"; import { getFailures, MiniFailure } from "types/validators/helper";
import { MiniFailure } from '../../types/validators/helper';
export type EditorData = ReturnType<typeof genEditorData>; export type EditorData = ReturnType<typeof genEditorData>;
export type EditorState = { export type EditorState =
status: 'unchanged' | 'changed' | 'saving', | {
data: EditorData status: "unchanged";
} | { data: EditorData;
status: 'loading' }
} | { | {
status: 'invalid', status: "changed" | "saving";
failures: MiniFailure[], previous: EditorData[];
data: EditorData, data: EditorData;
} }
export type EditorStatus = EditorState['status']; | {
status: "loading";
}
| {
status: "invalid";
failures: MiniFailure[];
data: EditorData;
};
export type EditorStatus = EditorState["status"];
export const useAutomatioEditorState = ( export const useAutomatioEditorState = (
automation: AutomationData | undefined, automation: AutomationData | BareAutomationData | undefined,
onSave: (a: AutomationData) => void, onSave: (a: AutomationData | BareAutomationData) => void
) => { ) => {
const [state, update] = useState<EditorState>({ // state
status: "loading", const [state, update] = useState<EditorState>({
}); status: "loading",
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => ( });
data: D
) => ((state.status === 'changed') || (state.status === 'unchanged')) && update({ // helpers
status: 'changed', const validate = (data: any) => {
return getFailures(data, v.AutomationData);
};
const makeUpdate =
<K extends keyof EditorData, D extends EditorData[K]>(name: K) =>
(data: D) =>
(state.status === "changed" || state.status === "unchanged") &&
update({
status: "changed",
previous:
state.status === "unchanged"
? [state.data]
: state.previous.concat([state.data]),
data: { data: {
...state.data, ...state.data,
[name]: data, [name]: data,
} },
}) });
const saveAndUpdate = (data: EditorData) => { const saveAndUpdate = (data: EditorData) => {
const cleanData = { if (state.status === "changed") {
...data, const cleanData = {
tags: data.tags.reduce((all, [tagName, tagValue]) => ({ ...data,
...all, tags: data.tags.reduce(
[tagName.trim()]: tagValue.trim(), (all, [tagName, tagValue]) => ({
}), {}) ...all,
}; [tagName.trim()]: tagValue.trim(),
}),
{}
),
};
update({
status: "saving",
previous: state.previous,
data,
});
onSave(cleanData);
}
};
// pub methods
const methods = {
validate,
updateTrigger: makeUpdate("trigger"),
updateSequence: makeUpdate("action"),
updateCondition: makeUpdate("condition"),
saveAndUpdate,
updateMetadata: (
metadata: AutomationMetadata,
tags: Array<[string, string]>
) => {
if (state.status === "changed" || state.status === "unchanged") {
update({ update({
status: "saving", status: "changed",
data, previous:
}) state.status === "changed"
onSave(cleanData); ? state.previous.concat([state.data])
} : [state.data],
data: {
useEffect(() => { ...state.data,
if (automation) { tags,
const failures = getFailures(automation, v.AutomationData); ...metadata,
if (failures) { },
update({ });
status: 'invalid', }
failures, },
data: genEditorData(automation), save: () => {
}) if (state.status !== "loading") {
} else { saveAndUpdate(state.data);
update({ }
status: 'unchanged', },
data: genEditorData(automation), undo: () => {
}) if (state.status === "changed") {
} if (state.previous.length === 1) {
update({
status: "unchanged",
data: state.previous[0],
});
} else {
update({
status: "changed",
data: state.previous[state.previous.length - 1],
previous: state.previous.slice(0, state.previous.length - 1),
});
} }
}, [automation]); }
},
get state() {
return state;
},
};
return { // effects
validate: (data: any) => getFailures(data, v.AutomationData), useEffect(() => {
updateTrigger: makeUpdate('trigger'), if (automation) {
updateSequence: makeUpdate('sequence'), const failures = validate(automation);
updateCondition: makeUpdate('condition'), if (failures) {
saveAndUpdate, update({
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => { status: "invalid",
if ((state.status === 'changed') || (state.status === 'unchanged')) { failures,
update({ data: genEditorData(automation),
status: 'changed', });
data: { } else {
...state.data, update({
tags, status: "unchanged",
metadata, data: genEditorData(automation),
} });
}) }
}
},
save: () => {
if (state.status !== 'loading') {
saveAndUpdate(state.data)
}
},
get state() {
return state;
}
} }
} }, [automation]);
return methods;
};
const genEditorData = (automation: AutomationData) => { const genEditorData = (automation: AutomationData | BareAutomationData) => {
const { const { tags: rawTags, trigger, action, condition, ...metadata } = automation;
metadata,
trigger,
sequence,
condition,
} = automation;
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]); const tags: [string, string][] = Object.keys(rawTags).map((tagName) => [
tagName,
rawTags[tagName],
]);
return { return {
metadata, ...metadata,
trigger, trigger,
sequence, action,
condition, condition,
tags, tags,
} };
} };
@@ -13,6 +13,10 @@
user-select: none; user-select: none;
} }
.automation-manager--list-box-group.modified {
border: 1px var(--mui-success-main) solid;
}
.automation-manager--list-box-group { .automation-manager--list-box-group {
border-color: var(--mui-text-secondary); border-color: var(--mui-text-secondary);
border-width: 0.125px; border-width: 0.125px;
@@ -14,7 +14,10 @@ const { make, componentMeta } = makeStory({
args: { args: {
title: "Example", title: "Example",
type: "items", type: "items",
isSelected: false, flags: {
isSelected: false,
isModified: false,
},
data: [ data: [
{ {
id: "1", id: "1",
@@ -23,7 +26,13 @@ const { make, componentMeta } = makeStory({
description: "Amazing automation!", description: "Amazing automation!",
tags: {}, tags: {},
state: "on", state: "on",
isSelected: false, source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
flags: {
isSelected: false,
isModified: false,
},
}, },
{ {
id: "2", id: "2",
@@ -31,7 +40,13 @@ const { make, componentMeta } = makeStory({
entityId: "automation.2", entityId: "automation.2",
description: "Cool!", description: "Cool!",
state: "on", state: "on",
isSelected: false, source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
flags: {
isSelected: false,
isModified: false,
},
tags: { tags: {
room: "main bedroom", room: "main bedroom",
routine: "night time", routine: "night time",
@@ -48,16 +63,25 @@ export const Basic = make({});
export const Nested = make({ export const Nested = make({
title: "Top Group", title: "Top Group",
type: "group", type: "group",
isSelected: false, flags: {
isSelected: false,
isModified: false,
},
data: [ data: [
{ {
title: "Subgroup 1", title: "Subgroup 1",
type: "group", type: "group",
isSelected: true, flags: {
isSelected: true,
isModified: false,
},
data: [ data: [
{ {
type: "items", type: "items",
isSelected: true, flags: {
isSelected: true,
isModified: false,
},
title: "Subsub group", title: "Subsub group",
data: [ data: [
{ {
@@ -66,7 +90,13 @@ export const Nested = make({
description: "", description: "",
title: "Automation #1", title: "Automation #1",
state: "on", state: "on",
isSelected: true, source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
flags: {
isSelected: true,
isModified: false,
},
tags: {}, tags: {},
}, },
{ {
@@ -75,7 +105,13 @@ export const Nested = make({
description: "another one", description: "another one",
title: "Automation #2", title: "Automation #2",
state: "off", state: "off",
isSelected: false, source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
flags: {
isSelected: false,
isModified: false,
},
tags: {}, tags: {},
}, },
{ {
@@ -84,7 +120,13 @@ export const Nested = make({
description: "bad one", description: "bad one",
title: "Automation #3", title: "Automation #3",
state: "offing", state: "offing",
isSelected: false, source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
flags: {
isSelected: false,
isModified: false,
},
tags: { tags: {
type: "bad", type: "bad",
}, },
@@ -96,20 +138,32 @@ export const Nested = make({
{ {
title: "Subgroup 2", title: "Subgroup 2",
type: "group", type: "group",
isSelected: false, flags: {
isSelected: false,
isModified: false,
},
data: [], data: [],
}, },
{ {
title: "Other", title: "Other",
type: "items", type: "items",
isSelected: false, flags: {
isSelected: false,
isModified: false,
},
data: [ data: [
{ {
id: "4", id: "4",
entityId: "automation.4", entityId: "automation.4",
description: "Cool thing", description: "Cool thing",
title: "Automation #4", title: "Automation #4",
isSelected: false, flags: {
isSelected: false,
isModified: false,
},
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
state: "on", state: "on",
tags: { tags: {
type: "good", type: "good",
@@ -16,6 +16,7 @@ export type ListBoxGroupProps = AutomationManagerItem & {
) => void; ) => void;
onAutomationDelete: (aid: string, eid: string) => void; onAutomationDelete: (aid: string, eid: string) => void;
onSelect: (aid: string) => void; onSelect: (aid: string) => void;
onRun: (eid: string) => void;
initialOpenState?: boolean; initialOpenState?: boolean;
tagsDB: TagDB; tagsDB: TagDB;
}; };
@@ -23,7 +24,7 @@ export const ListBoxGroup: FC<ListBoxGroupProps> = ({
title, title,
type, type,
data, data,
isSelected, flags,
initialOpenState, initialOpenState,
tagsDB, tagsDB,
...events ...events
@@ -41,7 +42,8 @@ export const ListBoxGroup: FC<ListBoxGroupProps> = ({
<div <div
className={[ className={[
"automation-manager--list-box-group", "automation-manager--list-box-group",
isSelected ? "selected" : "", flags.isSelected ? "selected" : "",
flags.isModified ? "modified" : "",
].join(" ")} ].join(" ")}
> >
<div <div
@@ -67,7 +69,9 @@ export const ListBoxGroup: FC<ListBoxGroupProps> = ({
onDelete={() => onDelete={() =>
events.onAutomationDelete(auto.id, auto.entityId) events.onAutomationDelete(auto.id, auto.entityId)
} }
isSelected={auto.flags.isSelected}
onSelect={() => events.onSelect(auto.id)} onSelect={() => events.onSelect(auto.id)}
onRun={() => events.onRun(auto.entityId)}
onDescriptionUpdate={(description) => onDescriptionUpdate={(description) =>
events.onAutomationUpdate( events.onAutomationUpdate(
{ {
@@ -1,6 +1,6 @@
import { HassEntities } from "home-assistant-js-websocket"; import { HassEntities } from "home-assistant-js-websocket";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { AutomationData } from "types/automations"; import { AutomationData, BareAutomationData } from "types/automations";
import { defaultAutomation } from "utils/defaults"; import { defaultAutomation } from "utils/defaults";
import { TagDB } from "../TagDB"; import { TagDB } from "../TagDB";
import { AutomationManagerAuto } from "../types"; import { AutomationManagerAuto } from "../types";
@@ -12,7 +12,9 @@ export const useAutomationDB = (
) => { ) => {
const autoMap = genMapping(haEntities, configAutomations, tagsDB); const autoMap = genMapping(haEntities, configAutomations, tagsDB);
const [newAuto, setNewAuto] = const [newAuto, setNewAuto] =
useState<null | [AutomationManagerAuto, AutomationData]>(null); useState<
null | [AutomationManagerAuto, AutomationData | BareAutomationData]
>(null);
useEffect(() => { useEffect(() => {
if (newAuto && autoMap[newAuto[0].id]) { if (newAuto && autoMap[newAuto[0].id]) {
@@ -28,17 +30,15 @@ export const useAutomationDB = (
return out; return out;
} }
}, },
getAutomationData(autoId: string) { getAutomationData(
autoId: string
):
| null
| [AutomationManagerAuto, AutomationData | BareAutomationData | null] {
if (newAuto && newAuto[0].id === autoId) { if (newAuto && newAuto[0].id === autoId) {
return newAuto[1]; return newAuto;
} }
return (autoMap[autoId] ?? [null, null])[1]; return autoMap[autoId] ?? null;
},
getAutomationState(autoId: string): string | null {
if (newAuto && newAuto[0].id === autoId) {
return newAuto[0].state;
}
return (autoMap[autoId] ?? [{ state: null }, null])[0].state;
}, },
isAutoNew(autoId: string) { isAutoNew(autoId: string) {
return (newAuto && newAuto[0].id === autoId) ?? false; return (newAuto && newAuto[0].id === autoId) ?? false;
@@ -50,14 +50,17 @@ export const useAutomationDB = (
const auto = defaultAutomation(String(Date.now())); const auto = defaultAutomation(String(Date.now()));
setNewAuto([ setNewAuto([
{ {
id: auto.metadata.id, id: auto.id,
entityId: "", entityId: "",
title: auto.metadata.alias ?? "", title: auto.alias ?? "",
description: auto.metadata.description ?? "", description: auto.description ?? "",
state: "unregistered", state: "unregistered",
tags: {}, tags: {},
issue: "New Automation", issue: "New Automation",
isNew: true, isNew: true,
source_file: "n/a",
source_file_type: "n/a",
configuration_key: "n/a",
}, },
auto, auto,
]); ]);
@@ -74,7 +77,7 @@ const genMapping = (
const configData: Record<string, AutomationData> = configAutomations.reduce( const configData: Record<string, AutomationData> = configAutomations.reduce(
(all, n) => ({ (all, n) => ({
...all, ...all,
[n.metadata.id]: n, [n.id]: n,
}), }),
{} {}
); );
@@ -92,11 +95,16 @@ const genMapping = (
? undefined ? undefined
: `recived invalid state "${entityData.state}, this could be because you have a lingering automation that was not cleared by homeassistant, try to reboot HA or manually clear this automation from HA Database."`; : `recived invalid state "${entityData.state}, this could be because you have a lingering automation that was not cleared by homeassistant, try to reboot HA or manually clear this automation from HA Database."`;
let found: AutomationData | null = null; let found: AutomationData | null = null;
let source_file = "n/a";
let source_file_type = "n/a";
let configuration_key = "n/a";
if (configData[autoId]) { if (configData[autoId]) {
found = configData[entityData.attributes.id]; found = configData[entityData.attributes.id];
title = found.metadata.alias ?? title; title = found.alias ?? title;
description = found.metadata.description ?? description; description = found.description ?? description;
source_file = found.source_file ?? source_file;
source_file_type = found.source_file_type ?? source_file_type;
configuration_key = found.configuration_key ?? configuration_key;
delete configData[autoId]; delete configData[autoId];
} else { } else {
issue = "failed to find this automation in '/config' folder"; issue = "failed to find this automation in '/config' folder";
@@ -110,6 +118,9 @@ const genMapping = (
description, description,
state: entityData.state, state: entityData.state,
tags: tagsDB.getTags(autoId), tags: tagsDB.getTags(autoId),
source_file,
source_file_type,
configuration_key,
issue, issue,
}, },
found, found,
@@ -117,14 +128,17 @@ const genMapping = (
}); });
Object.values(configData).forEach((auto) => { Object.values(configData).forEach((auto) => {
automatioinMap[auto.metadata.id] = [ automatioinMap[auto.id] = [
{ {
id: auto.metadata.id, id: auto.id,
entityId: "", entityId: "",
title: auto.metadata.alias ?? "", title: auto.alias ?? "",
description: auto.metadata.description ?? "", description: auto.description ?? "",
state: "unregistered", state: "unregistered",
tags: tagsDB.getTags(auto.metadata.id), tags: tagsDB.getTags(auto.id),
source_file: auto.source_file,
source_file_type: auto.source_file_type,
configuration_key: auto.configuration_key,
issue: issue:
"homeassistant did not load this automation, try to manually reload automations or restart homeassistant.", "homeassistant did not load this automation, try to manually reload automations or restart homeassistant.",
}, },
@@ -9,14 +9,27 @@ import {
UseAutomationManagerStateArgs, UseAutomationManagerStateArgs,
} from "./state"; } from "./state";
import Alert from "@mui/material/Alert"; import Alert from "@mui/material/Alert";
import { useConfirm } from "material-ui-confirm";
export type AutomationManagerLoadedProps = UseAutomationManagerStateArgs & { export type AutomationManagerLoadedProps = UseAutomationManagerStateArgs & {
onAutomationDelete: (aid: string, eid: string) => void; onAutomationDelete: (aid: string, eid: string) => void;
}; };
export const AutomationManagerLoaded: FC< export const AutomationManagerLoaded: FC<
PropsWithChildren<AutomationManagerLoadedProps> PropsWithChildren<AutomationManagerLoadedProps>
> = ({ children, onAutomationDelete, ...args }) => { > = ({ children, ...args }) => {
const state = useAutomationManagerState(args); const state = useAutomationManagerState(args);
const confirm = useConfirm();
const onAutomationDelete = async (aid: string, eid: string) =>
confirm({
title: "Are you sure you want to delete this automation?",
confirmationText: "Delete",
})
.then(() => {
args.onAutomationDelete(aid, eid);
state.setSelectedAutomationId(null);
})
.catch(() => {});
return ( return (
<div className="automation-manager"> <div className="automation-manager">
@@ -27,11 +40,9 @@ export const AutomationManagerLoaded: FC<
selectedAutomationId={state.currentAutomationId} selectedAutomationId={state.currentAutomationId}
onSelectedAutomationId={state.setSelectedAutomationId} onSelectedAutomationId={state.setSelectedAutomationId}
onAutomationAdd={() => state.addNew()} onAutomationAdd={() => state.addNew()}
onAutomationDelete={(aid, eid) => { onAutomationDelete={onAutomationDelete}
onAutomationDelete(aid, eid);
state.setSelectedAutomationId(null);
}}
onAutomationUpdate={state.sideBarUpdateAutomation} onAutomationUpdate={state.sideBarUpdateAutomation}
onRun={args.onAutomationRun}
/> />
<div className={["automation-manager--editor"].join(" ")}> <div className={["automation-manager--editor"].join(" ")}>
{state.currentAutomationId !== null ? ( {state.currentAutomationId !== null ? (
@@ -43,6 +54,22 @@ export const AutomationManagerLoaded: FC<
}} }}
automation={state.currentAutomation} automation={state.currentAutomation}
onUpdate={state.editorUpdateAutomation} onUpdate={state.editorUpdateAutomation}
onDelete={() => {
if (
state.currentAutomationId &&
state.currentAutomationEntityId
) {
onAutomationDelete(
state.currentAutomationId,
state.currentAutomationEntityId
);
}
}}
onTrigger={() => {
if (state.currentAutomationEntityId) {
args.onAutomationRun(state.currentAutomationEntityId);
}
}}
tagDB={state.tagsDB} tagDB={state.tagsDB}
isNew={state.currentAutomationIsNew} isNew={state.currentAutomationIsNew}
/> />
@@ -1,7 +1,7 @@
import { HassEntities } from "home-assistant-js-websocket"; import { HassEntities } from "home-assistant-js-websocket";
import { useState } from "react"; import { useState } from "react";
import { useCookies } from "react-cookie"; import { useCookies } from "react-cookie";
import { AutomationData } from "types/automations"; import { AutomationData, BareAutomationData } from "types/automations";
import { useTagDB } from "../TagDB"; import { useTagDB } from "../TagDB";
import { useAutomationDB } from "./automationDB"; import { useAutomationDB } from "./automationDB";
import { useConfirm } from "material-ui-confirm"; import { useConfirm } from "material-ui-confirm";
@@ -12,9 +12,10 @@ export type UseAutomationManagerStateArgs = {
configAutomations: AutomationData[]; configAutomations: AutomationData[];
hassEntities: HassEntities; hassEntities: HassEntities;
onUpdateTags: (aid: string, tags: Record<string, string>) => void; onUpdateTags: (aid: string, tags: Record<string, string>) => void;
onAutomationAdd: (auto: AutomationData) => void; onAutomationAdd: (auto: BareAutomationData) => void;
onAutomationUpdate: (aid: string, auto: AutomationData) => void; onAutomationUpdate: (auto: AutomationData) => void;
onAutomationStateChange: (eid: string, on: boolean) => void; onAutomationStateChange: (eid: string, on: boolean) => void;
onAutomationRun: (eid: string) => void;
}; };
export const useAutomationManagerState = ({ export const useAutomationManagerState = ({
configAutomations, configAutomations,
@@ -29,10 +30,12 @@ export const useAutomationManagerState = ({
const snackbr = useSnackbar(); const snackbr = useSnackbar();
const cookies = useAMSCookies(); const cookies = useAMSCookies();
const tagsDB = useTagDB( const tagsDB = useTagDB(
configAutomations.map(({ metadata: { id }, tags }) => ({ configAutomations
id, .filter((a) => typeof a === "object")
tags, .map(({ id, tags = {} }) => ({
})), id,
tags,
})),
onUpdateTags onUpdateTags
); );
const automationDB = useAutomationDB(hassEntities, configAutomations, tagsDB); const automationDB = useAutomationDB(hassEntities, configAutomations, tagsDB);
@@ -65,12 +68,15 @@ export const useAutomationManagerState = ({
get tagsDB() { get tagsDB() {
return tagsDB; return tagsDB;
}, },
get currentAutomation() { get currentAutomation(): AutomationData | BareAutomationData | null {
return currentAutomation; return currentAutomation === null ? null : currentAutomation[1];
}, },
get currentAutomationIsNew() { get currentAutomationIsNew() {
return automationDB.isAutoNew(cookies.currentAutomationId ?? ""); return automationDB.isAutoNew(cookies.currentAutomationId ?? "");
}, },
get currentAutomationEntityId(): string | null {
return currentAutomation === null ? null : currentAutomation[0].entityId;
},
async setSelectedAutomationId(i: string | null, force: boolean = false) { async setSelectedAutomationId(i: string | null, force: boolean = false) {
if (methods.currentAutomationIsNew && !force) { if (methods.currentAutomationIsNew && !force) {
if (!(await stillHaveNewAreYouSure())) { if (!(await stillHaveNewAreYouSure())) {
@@ -87,13 +93,13 @@ export const useAutomationManagerState = ({
} }
} }
const auto = automationDB.addNew(); const auto = automationDB.addNew();
methods.setSelectedAutomationId(auto.metadata.id, true); methods.setSelectedAutomationId(auto.id, true);
}, },
editorUpdateAutomation(auto: AutomationData) { editorUpdateAutomation(auto: AutomationData | BareAutomationData) {
if (methods.currentAutomationIsNew) { if (methods.currentAutomationIsNew) {
onAutomationAdd(auto); onAutomationAdd(auto);
} else if (methods.currentAutomationId) { } else if (methods.currentAutomationId) {
onAutomationUpdate(methods.currentAutomationId, auto); onAutomationUpdate(auto as AutomationData);
} }
}, },
sideBarUpdateAutomation( sideBarUpdateAutomation(
@@ -101,19 +107,23 @@ export const useAutomationManagerState = ({
aid: string, aid: string,
eid: string eid: string
) { ) {
const previousAutoState = automationDB.getAutomationData(aid); const previousAuto = automationDB.getAutomationData(aid);
if (previousAutoState) { if (
previousAuto &&
previousAuto[1] &&
"configuration_key" in previousAuto[1] &&
"source_file" in previousAuto[1] &&
"source_file_type" in previousAuto[1]
) {
const previousAutoState = previousAuto[1];
if ( if (
previousAutoState.metadata.alias !== a.title || previousAutoState.alias !== a.title ||
previousAutoState.metadata.description !== a.description previousAutoState.description !== a.description
) { ) {
onAutomationUpdate(aid, { onAutomationUpdate({
...previousAutoState, ...previousAutoState,
metadata: { alias: a.title,
...previousAutoState.metadata, description: a.description,
alias: a.title,
description: a.description,
},
}); });
} }
} else { } else {
@@ -124,7 +134,8 @@ export const useAutomationManagerState = ({
{ variant: "error" } { variant: "error" }
); );
} }
const previousState = automationDB.getAutomationState(aid); const previousState =
previousAuto === null ? null : previousAuto[0].state;
if (previousState !== a.state) { if (previousState !== a.state) {
onAutomationStateChange(eid, a.state === "on"); onAutomationStateChange(eid, a.state === "on");
} }
@@ -8,7 +8,7 @@ import SaveIcon from "@mui/icons-material/SaveOutlined";
import { cleanUpUndefined } from "utils/helpers"; import { cleanUpUndefined } from "utils/helpers";
import { Modal } from "components/Modal"; import { Modal } from "components/Modal";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Buttons/Button";
import InputAutoText from "components/Inputs/InputAutoText"; import InputAutoText from "components/Inputs/InputAutoText";
import { TagDB } from "../TagDB"; import { TagDB } from "../TagDB";
@@ -30,7 +30,7 @@ export type TagModalState =
export const Tags: FC<TagsProps> = ({ automationId, tagsDB }) => { export const Tags: FC<TagsProps> = ({ automationId, tagsDB }) => {
const [modalState, setModal] = useState<TagModalState>({ open: false }); const [modalState, setModal] = useState<TagModalState>({ open: false });
const tags = tagsDB.getTags(automationId); const tags = tagsDB.getTags(automationId, true);
const onUpdate = (t: Record<string, string>) => const onUpdate = (t: Record<string, string>) =>
tagsDB.update(automationId, t); tagsDB.update(automationId, t);
@@ -42,12 +42,25 @@
font-size: 0.9em; font-size: 0.9em;
} }
.automation-manager--metadatabox .buttons {
display: flex;
flex-direction: row;
gap: 0.25em;
}
.automation-manager--metadatabox .delete:hover { .automation-manager--metadatabox .delete:hover {
cursor: pointer; cursor: pointer;
color: var(--mui-error-light); color: var(--mui-error-light);
color: var(--mui-error-contrastText);
background-color: var(--mui-error-dark); background-color: var(--mui-error-dark);
} }
.automation-manager--metadatabox .run:hover {
cursor: pointer;
color: var(--mui-success-contrastText);
background-color: var(--mui-success-dark);
}
.automation-manager--metadatabox .select:hover, .automation-manager--metadatabox .select:hover,
.automation-manager--metadatabox.selected.automation-manager--metadatabox .select { .automation-manager--metadatabox.selected.automation-manager--metadatabox .select {
cursor: pointer; cursor: pointer;
@@ -71,4 +84,14 @@
font-size: 0.75em; font-size: 0.75em;
user-select: none; user-select: none;
max-width: 5em; max-width: 5em;
}
.automation-manager--metadatabox .metadatabox--title--source {
margin-bottom: -0.5em;
}
.automation-manager--metadatabox .metadatabox--title--source .MuiChip-root {
font-size: 0.85em;
height: 2em;
} }
@@ -39,6 +39,10 @@ const { make, componentMeta } = makeStory({
export default componentMeta; export default componentMeta;
export const Basic = make({}); export const Basic = make({});
export const LongDescription = make({
description:
"Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.",
});
export const IsSelected = make({ isSelected: true }); export const IsSelected = make({ isSelected: true });
export const InvalidState = make({ state: "unavailable" }); export const InvalidState = make({ state: "unavailable" });
export const WithIssue = make({ issue: "look at me" }); export const WithIssue = make({ issue: "look at me" });
@@ -7,16 +7,19 @@ import Alert from "@mui/material/Alert";
import DeleteForeverIcon from "@mui/icons-material/DeleteForever"; import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
import SelectIcon from "@mui/icons-material/HighlightAltSharp"; import SelectIcon from "@mui/icons-material/HighlightAltSharp";
import RunIcon from "@mui/icons-material/RunCircleOutlined";
import { InputTextView } from "components/Inputs/InputTextView"; import { InputTextView } from "components/Inputs/InputTextView";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
import { AutomationManagerAuto } from "../types"; import { AutomationManagerAuto } from "../types";
import { Tags } from "./Tags"; import { Tags } from "./Tags";
import { TagDB } from "../TagDB"; import { TagDB } from "../TagDB";
import { Chip } from "@mui/material";
export type MetadataBoxProps = AutomationManagerAuto & { export type MetadataBoxProps = AutomationManagerAuto & {
onDelete: () => void; onDelete: () => void;
onSelect: () => void; onSelect: () => void;
onRun: () => void;
onStateUpdate: (s: "on" | "off") => void; onStateUpdate: (s: "on" | "off") => void;
onTitleUpdate: (t: string) => void; onTitleUpdate: (t: string) => void;
onDescriptionUpdate: (t: string) => void; onDescriptionUpdate: (t: string) => void;
@@ -51,6 +54,9 @@ export const MetadataBox: FC<MetadataBoxProps> = (props) => {
className="metadatabox--title" className="metadatabox--title"
title={`ID=${props.id}, EntityID=${props.entityId}`} title={`ID=${props.id}, EntityID=${props.entityId}`}
> >
<span className="metadatabox--title--source">
<Chip label={`@${props.source_file} (${props.source_file_type})`} />
</span>
<InputTextView <InputTextView
className="title" className="title"
placeholder="Title" placeholder="Title"
@@ -79,11 +85,19 @@ export const MetadataBox: FC<MetadataBoxProps> = (props) => {
className="select" className="select"
icon={<SelectIcon />} icon={<SelectIcon />}
onClick={props.onSelect} onClick={props.onSelect}
title="Select automation"
/>
<ButtonIcon
className="run"
icon={<RunIcon />}
onClick={props.onRun}
title="Trigger automation"
/> />
<ButtonIcon <ButtonIcon
className="delete" className="delete"
icon={<DeleteForeverIcon />} icon={<DeleteForeverIcon />}
onClick={props.onDelete} onClick={props.onDelete}
title="Delete automation"
/> />
</div> </div>
</div> </div>
@@ -33,6 +33,7 @@ const story = makeStory({
selectedAutomationId={selectedAutomationId} selectedAutomationId={selectedAutomationId}
tagsDB={useTagDB(automations, (a, t) => onTagUpdate(t, a))} tagsDB={useTagDB(automations, (a, t) => onTagUpdate(t, a))}
automations={automations} automations={automations}
onRun={args.onRun}
onSelectedAutomationId={(aid) => { onSelectedAutomationId={(aid) => {
args.onSelectedAutomationId(aid); args.onSelectedAutomationId(aid);
setSelAutoId(aid); setSelAutoId(aid);
@@ -67,6 +68,9 @@ const story = makeStory({
tags: {}, tags: {},
entityId: "automation." + id, entityId: "automation." + id,
state: "on", state: "on",
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
}, },
]); ]);
setSelAutoId(id); setSelAutoId(id);
@@ -93,6 +97,9 @@ const makeAuto = (
description: "", description: "",
state: "on", state: "on",
tags: {}, tags: {},
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
...data, ...data,
}; };
}; };
@@ -5,7 +5,7 @@ import { FC, useState } from "react";
import ArrowIcon from "@mui/icons-material/ArrowBackIosNewOutlined"; import ArrowIcon from "@mui/icons-material/ArrowBackIosNewOutlined";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/Base/InputText";
import InputMultiSelect from "components/Inputs/InputMultiSelect"; import InputMultiSelect from "components/Inputs/InputMultiSelect";
import { ListBoxGroup } from "../ListBoxGroup"; import { ListBoxGroup } from "../ListBoxGroup";
@@ -16,7 +16,7 @@ import {
AutomationManagerAuto, AutomationManagerAuto,
AutomationManagerAutoUpdatable, AutomationManagerAutoUpdatable,
} from "../types"; } from "../types";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Buttons/Button";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
export type AutomationManagerSidebarProps = { export type AutomationManagerSidebarProps = {
@@ -31,6 +31,7 @@ export type AutomationManagerSidebarProps = {
onAutomationDelete: (aid: string, eid: string) => void; onAutomationDelete: (aid: string, eid: string) => void;
onAutomationAdd: () => void; onAutomationAdd: () => void;
onSelectedAutomationId: (aid: string) => void; onSelectedAutomationId: (aid: string) => void;
onRun: (eid: string) => void;
}; };
export const AutomationManagerSidebar: FC<AutomationManagerSidebarProps> = ({ export const AutomationManagerSidebar: FC<AutomationManagerSidebarProps> = ({
automations, automations,
@@ -60,7 +61,11 @@ export const AutomationManagerSidebar: FC<AutomationManagerSidebarProps> = ({
); );
const items = grouping.top.map((i) => const items = grouping.top.map((i) =>
convertGroupingToItems(i, selectedAutomationId, automations, grouping) convertGroupingToItems(i, automations, grouping, (aid, t) => ({
...t,
isSelected: aid === selectedAutomationId,
isModified: tagsDB.isModified(aid),
}))
); );
return ( return (
@@ -85,7 +90,10 @@ export const AutomationManagerSidebar: FC<AutomationManagerSidebarProps> = ({
<ListBoxGroup <ListBoxGroup
{...item} {...item}
key={i} key={i}
onSelect={onSelectedAutomationId} onSelect={(id) => {
onSelectedAutomationId(id);
setHidden(true);
}}
{...events} {...events}
tagsDB={tagsDB} tagsDB={tagsDB}
initialOpenState={true} initialOpenState={true}
@@ -1,4 +1,9 @@
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
type TagDBState = {
original: Record<string, Record<string, string>>;
changed: Record<string, Record<string, string>>;
};
export type TagDB = ReturnType<typeof useTagDB>; export type TagDB = ReturnType<typeof useTagDB>;
export const useTagDB = ( export const useTagDB = (
automations: Array<{ automations: Array<{
@@ -8,28 +13,30 @@ export const useTagDB = (
onUpdate: (aid: string, tags: Record<string, string>) => void onUpdate: (aid: string, tags: Record<string, string>) => void
) => { ) => {
const lastAuto = useRef(JSON.stringify(automations)); const lastAuto = useRef(JSON.stringify(automations));
const [{ automationTags, changed }, setState] = useState({ const [{ original, changed }, setState] = useState<TagDBState>({
automationTags: convertAutoListToMap(automations), original: convertAutoListToMap(automations),
changed: new Set<string>(), changed: {},
}); });
const allTags = computeAllTags(automationTags); const allTags = computeAllTags(original);
const allTagNames = Object.keys(allTags); const allTagNames = Object.keys(allTags);
const isModified = changed.size > 0; const isModified = Object.keys(changed).length > 0;
useEffect(() => { useEffect(() => {
const c = JSON.stringify(automations); const c = JSON.stringify(automations);
if (lastAuto.current !== c) { if (lastAuto.current !== c) {
lastAuto.current = c; lastAuto.current = c;
setState({ setState({
automationTags: convertAutoListToMap(automations), original: convertAutoListToMap(automations),
changed: new Set(), changed: {},
}); });
} }
}, [automations, setState]); }, [automations, setState]);
return { return {
getTags(automationId: string) { getTags(automationId: string, includeChanged: boolean = false) {
return automationTags[automationId] ?? {}; if (includeChanged) {
return changed[automationId] ?? original[automationId] ?? {};
}
return original[automationId] ?? {};
}, },
getTagNames(myTags: string[]): string[] { getTagNames(myTags: string[]): string[] {
return allTagNames.filter((n) => !myTags.includes(n)).sort(); return allTagNames.filter((n) => !myTags.includes(n)).sort();
@@ -39,27 +46,33 @@ export const useTagDB = (
? Array.from(allTags[tagName].values()).sort() ? Array.from(allTags[tagName].values()).sort()
: []; : [];
}, },
isModified(aid: string) { isModified(aid: string): boolean {
return changed.has(aid); return aid in changed;
}, },
update(aid: string, tags: Record<string, string>) { update(aid: string, tags: Record<string, string>) {
if (JSON.stringify(tags) !== JSON.stringify(automationTags[aid])) { const update = JSON.stringify(tags);
setState({ if (aid in changed) {
changed: changed.add(aid), if (update === JSON.stringify(changed[aid])) {
automationTags: { return;
...automationTags, }
[aid]: tags, } else if (update === JSON.stringify(original[aid])) {
}, return;
});
} }
setState({
changed: {
...changed,
[aid]: tags,
},
original,
});
}, },
save(aid: string | null) { save(aid: string | null) {
if (isModified) { if (isModified) {
if (aid) { if (aid) {
onUpdate(aid, automationTags[aid]); onUpdate(aid, changed[aid]);
} else { } else {
for (const aid of changed.values()) { for (const [aid, change] of Object.entries(changed)) {
onUpdate(aid, automationTags[aid]); onUpdate(aid, change);
} }
} }
} }
@@ -4,42 +4,58 @@ import { AutomationManagerAuto } from "./types";
const automations: AutomationManagerAuto[] = [ const automations: AutomationManagerAuto[] = [
createMockAuto({ createMockAuto({
Room: "Living Room", tags: {
Type: "Lights", Room: "Living Room",
Type: "Lights",
},
}), }),
createMockAuto({ createMockAuto({
Room: "Living Room", tags: {
Type: "Climate", Room: "Living Room",
Type: "Climate",
},
}), }),
createMockAuto({ createMockAuto({
Room: "Kitchen", tags: {
Type: "Climate", Room: "Kitchen",
Type: "Climate",
},
}), }),
createMockAuto({ createMockAuto({
Type: "Climate", tags: {
Type: "Climate",
},
}), }),
createMockAuto({ createMockAuto({
Room: "Living Room", tags: {
Room: "Living Room",
},
}), }),
createMockAuto({}), createMockAuto({}),
].map<AutomationManagerAuto>((a) => ({ ].map<AutomationManagerAuto>((a) => ({
title: a.metadata.alias ?? "", title: a.alias ?? "",
entityId: "automation." + a.metadata.id, entityId: "automation." + a.id,
description: a.metadata.description ?? "", description: a.description ?? "",
state: "on", state: "on",
tags: a.tags, tags: a.tags,
id: a.metadata.id, id: a.id,
isSelected: false, isSelected: false,
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
})); }));
const bigList = bigMockAutoList.map<AutomationManagerAuto>((a) => ({ const bigList = bigMockAutoList.map<AutomationManagerAuto>((a) => ({
entityId: "automation." + a.metadata.id, entityId: "automation." + a.id,
title: a.metadata.alias ?? "", title: a.alias ?? "",
description: a.metadata.description ?? "", description: a.description ?? "",
state: "on", state: "on",
tags: a.tags, tags: a.tags,
id: a.metadata.id, id: a.id,
isSelected: false, isSelected: false,
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
})); }));
test("no grouping", () => { test("no grouping", () => {
@@ -99,7 +115,7 @@ test("bigAutoList groupings has not duplicate ids", () => {
test("convert grouper to items when no tags are selected", () => { test("convert grouper to items when no tags are selected", () => {
const grouping = makeGrouping(automations, [], null); const grouping = makeGrouping(automations, [], null);
const items = grouping.top.map((i) => const items = grouping.top.map((i) =>
convertGroupingToItems(i, "", automations, grouping) convertGroupingToItems(i, automations, grouping)
); );
expect(items.filter((i) => i.type === "group")).toHaveLength(0); expect(items.filter((i) => i.type === "group")).toHaveLength(0);
expect(items).toHaveLength(1); expect(items).toHaveLength(1);
@@ -109,7 +125,7 @@ test("convert grouper to items when no tags are selected", () => {
test("convert grouper to items when 1 tag is selected", () => { test("convert grouper to items when 1 tag is selected", () => {
const grouping = makeGrouping(automations, ["Room"], null); const grouping = makeGrouping(automations, ["Room"], null);
const items = grouping.top.map((i) => const items = grouping.top.map((i) =>
convertGroupingToItems(i, "", automations, grouping) convertGroupingToItems(i, automations, grouping)
); );
expect(grouping.top).toHaveLength(3); expect(grouping.top).toHaveLength(3);
expect(items.filter((i) => i.type === "group")).toHaveLength(0); expect(items.filter((i) => i.type === "group")).toHaveLength(0);
@@ -125,7 +141,7 @@ test("convert grouper to items when 1 tag is selected", () => {
test("convert grouper to items when 2 tag is selected", () => { test("convert grouper to items when 2 tag is selected", () => {
const grouping = makeGrouping(automations, ["Room", "Type"], null); const grouping = makeGrouping(automations, ["Room", "Type"], null);
const items = grouping.top.map((i) => const items = grouping.top.map((i) =>
convertGroupingToItems(i, "", automations, grouping) convertGroupingToItems(i, automations, grouping)
); );
expect(grouping.top).toHaveLength(3); expect(grouping.top).toHaveLength(3);
expect(items.filter((i) => i.type === "group")).toHaveLength(2); expect(items.filter((i) => i.type === "group")).toHaveLength(2);
@@ -1,4 +1,9 @@
import { AutomationManagerAuto, AutomationManagerItem } from "./types"; import {
AutomationManagerAuto,
AutomationManagerAutoItem,
AutomationManagerItem,
AutomationManagerItemFlags,
} from "./types";
const makeGrouper = () => { const makeGrouper = () => {
const groupIdNames: string[] = []; const groupIdNames: string[] = [];
@@ -149,33 +154,59 @@ export const makeGrouping = (
export const convertGroupingToItems = ( export const convertGroupingToItems = (
currentGroupIdx: number, currentGroupIdx: number,
selectedAutomationId: string | null,
autos: AutomationManagerAuto[], autos: AutomationManagerAuto[],
grouping: AutomationGrouping grouping: AutomationGrouping,
computeFlags: (
aid: string,
f: AutomationManagerItemFlags
) => AutomationManagerItemFlags = (aid, t) => t
): AutomationManagerItem => { ): AutomationManagerItem => {
const groupData = grouping.getData(currentGroupIdx); const groupData = grouping.getData(currentGroupIdx);
const automationIds = grouping.getAutomations(currentGroupIdx); const automationIds = grouping.getAutomations(currentGroupIdx);
if (automationIds.length > 0) { if (automationIds.length > 0) {
const data = automationIds.map<AutomationManagerAutoItem>((i) => {
return {
...autos[i],
flags: computeFlags(autos[i].id, {
isSelected: false,
isModified: false,
}),
};
});
return { return {
type: "items", type: "items",
title: groupData.name, title: groupData.name,
data: automationIds.map((i) => { data,
return { flags: data.reduce<AutomationManagerItemFlags>(
...autos[i], (out, a) => ({
isSelected: autos[i].id === selectedAutomationId, isSelected: out.isSelected || a.flags.isSelected,
}; isModified: out.isModified || a.flags.isModified,
}), }),
isSelected: groupData.selected, {
isSelected: false,
isModified: false,
}
),
}; };
} }
const subgroups = grouping.getSubGroups(currentGroupIdx); const subgroups = grouping.getSubGroups(currentGroupIdx);
const data = subgroups.map((i) =>
convertGroupingToItems(i, autos, grouping, computeFlags)
);
return { return {
type: "group", type: "group",
title: groupData.name, title: groupData.name,
data: subgroups.map((i) => data,
convertGroupingToItems(i, selectedAutomationId, autos, grouping) flags: data.reduce<AutomationManagerItemFlags>(
(out, a) => ({
isSelected: out.isSelected || a.flags.isSelected,
isModified: out.isModified || a.flags.isModified,
}),
{
isSelected: false,
isModified: false,
}
), ),
isSelected: groupData.selected,
}; };
}; };
@@ -23,4 +23,22 @@
.automation-manager.loading .automation-manager--editor.loading { .automation-manager.loading .automation-manager--editor.loading {
flex: 1; flex: 1;
height: 100%; height: 100%;
}
.invalid-automation-modal-list {
display: flex;
max-height: 50vh;
overflow: auto;
flex-direction: column;
}
.invalid-automation-modal-list li {
display: flex;
flex-direction: column;
}
.invalid-automation-modal-list--errors ul {
max-height: 10vh;
overflow: auto;
} }
@@ -19,9 +19,10 @@ const { make, componentMeta } = makeStory({
<AutomationManager <AutomationManager
api={useMockApiService(args.automations ?? [], !args.automations)} api={useMockApiService(args.automations ?? [], !args.automations)}
haEntities={useMockHAEntities(haEntities)} haEntities={useMockHAEntities(haEntities)}
refreshAutomations={() => {}} refreshAutomations={async () => {}}
forceDeleteAutomation={() => {}} triggerAutomation={async () => {}}
onAutomationStateChange={(eid, on) => { forceDeleteAutomation={async () => {}}
onAutomationStateChange={async (eid, on) => {
if (!haEntities.loading && !haEntities.error) { if (!haEntities.loading && !haEntities.error) {
setHAE({ setHAE({
...haEntities, ...haEntities,
@@ -78,17 +79,17 @@ export const Empty = make({
}, },
}); });
const auto1 = createMockAuto({ const auto1 = createMockAuto({
type: "button", tags: { type: "button" },
}); });
export const One = make({ export const One = make({
automations: [auto1], automations: [auto1],
haProps: { haProps: {
loading: false, loading: false,
entities: { entities: {
[`automation.${auto1.metadata.id}`]: { [`automation.${auto1.id}`]: {
entity_id: `automation.${auto1.metadata.id}`, entity_id: `automation.${auto1.id}`,
attributes: { attributes: {
id: auto1.metadata.id, id: auto1.id,
}, },
context: { id: "", parent_id: null, user_id: null }, context: { id: "", parent_id: null, user_id: null },
last_changed: "", last_changed: "",
@@ -104,11 +105,11 @@ export const MissingAutoInConfig = make({
haProps: { haProps: {
loading: false, loading: false,
entities: { entities: {
[`automation.${auto1.metadata.id}`]: { [`automation.${auto1.id}`]: {
entity_id: `automation.${auto1.metadata.id}`, entity_id: `automation.${auto1.id}`,
attributes: { attributes: {
id: auto1.metadata.id, id: auto1.id,
friendly_name: auto1.metadata.alias, friendly_name: auto1.alias,
}, },
context: { id: "", parent_id: null, user_id: null }, context: { id: "", parent_id: null, user_id: null },
last_changed: "", last_changed: "",
@@ -119,3 +120,102 @@ export const MissingAutoInConfig = make({
entitySource: {}, entitySource: {},
}, },
}); });
export const CrashingAutomations = make({
haProps: {
loading: false,
entities: {},
entitySource: {},
},
automations: [""] as any,
});
export const BadAutomation = make({
haProps: {
loading: false,
entities: {
[`automation.${auto1.id}`]: {
entity_id: `automation.${auto1.id}`,
attributes: {
id: "test",
},
context: { id: "", parent_id: null, user_id: null },
last_changed: "",
last_updated: "",
state: "on",
},
},
entitySource: {},
},
automations: [
{
tags: {},
id: "test",
mode: "single",
alias: "Light.Tank_Day",
description: "",
source_file: "automation.yaml",
source_file_type: "list",
configuration_key: "automation",
trigger: [
{
platform: "sun",
event: "sunrise",
offset: "30",
} as any,
{ whoAmI: "bad node is who" } as any,
],
condition: [{ whoAmI: "bad node is who" } as any],
action: [
{ scene: "scene.light_day" } as any,
{ whoAmI: "bad node is who" } as any,
{
service: "input_select.set_options",
target: {
entity_id: "input_select.tank_light_mode",
},
data: {
options: "day",
},
},
],
},
],
});
export const OneCrashingOneGoodAutomations = make({
haProps: {
loading: false,
entities: {
[`automation.${auto1.id}`]: {
entity_id: `automation.${auto1.id}`,
attributes: {
id: auto1.id,
},
context: { id: "", parent_id: null, user_id: null },
last_changed: "",
last_updated: "",
state: "on",
},
"1235": {
entity_id: `automation.1235`,
attributes: {
id: "1235",
},
context: { id: "", parent_id: null, user_id: null },
last_changed: "",
last_updated: "",
state: "on",
},
},
entitySource: {},
},
automations: [
auto1,
{
id: "1235",
tags: {},
} as any,
"" as any,
],
});
+215 -76
View File
@@ -1,6 +1,6 @@
import "./index.css"; import "./index.css";
import { FC, useState } from "react"; import { FC, useEffect, useRef, useState } from "react";
import LinearProgress from "@mui/material/LinearProgress"; import LinearProgress from "@mui/material/LinearProgress";
import Skeleton from "@mui/material/Skeleton"; import Skeleton from "@mui/material/Skeleton";
@@ -9,11 +9,18 @@ import { HAEntitiesState } from "haService/HAEntities";
import { AutomationManagerLoaded } from "./Loaded"; import { AutomationManagerLoaded } from "./Loaded";
import { Alert } from "@mui/material"; import { Alert } from "@mui/material";
import { useSnackbar } from "notistack"; import { useSnackbar } from "notistack";
import { ErrorBoundary } from "components/ErrorBoundary";
import { getFailures } from "types/validators/helper";
import * as av from "types/validators/autmation";
import { useConfirm } from "material-ui-confirm";
import InputYaml from "components/Inputs/Base/InputYaml";
import { APIResponse } from "apiService/types";
export type AutomationManagerProps = { export type AutomationManagerProps = {
onAutomationStateChange: (eid: string, on: boolean) => void; onAutomationStateChange: (eid: string, on: boolean) => Promise<any>;
refreshAutomations: () => void; refreshAutomations: () => Promise<any>;
forceDeleteAutomation: (eid: string) => void; forceDeleteAutomation: (eid: string) => Promise<any>;
triggerAutomation: (eid: string) => Promise<any>;
haEntities: HAEntitiesState; haEntities: HAEntitiesState;
api: ApiService; api: ApiService;
}; };
@@ -21,12 +28,144 @@ export type AutomationManagerProps = {
export const AutomationManager: FC<AutomationManagerProps> = ({ export const AutomationManager: FC<AutomationManagerProps> = ({
api, api,
haEntities, haEntities,
onAutomationStateChange, onAutomationStateChange: _onAutomationStateChange,
refreshAutomations, refreshAutomations: _refreshAutomations,
forceDeleteAutomation, forceDeleteAutomation: _forceDeleteAutomation,
triggerAutomation: _triggerAutomation,
}) => { }) => {
const snackbr = useSnackbar(); const snackbr = useSnackbar();
const [isSaving, setIsSaving] = useState(false); const confirm = useConfirm();
const validationsShown = useRef(false);
const [isSaving, setIsSaving] = useState<string[]>([]);
// helpers
function wrapPromise<T>(
name: string,
errorMessage: string,
makePromise: () => Promise<T>
) {
setIsSaving(isSaving.concat([name]));
return makePromise()
.then((resp) => {
setIsSaving(isSaving.filter((k) => k !== name));
return resp;
})
.catch((err) => {
console.error(err);
snackbr.enqueueSnackbar(errorMessage.replace("{{err}}", String(err)), {
variant: "error",
});
setIsSaving(isSaving.filter((k) => k !== name));
});
}
const wrapApiPromise = (
name: string,
errorMessage: string,
makePromise: () => Promise<APIResponse<any>>
) => {
wrapPromise(name, errorMessage, makePromise).then((resp) => {
if (resp) {
if (resp.ok) {
refreshAutomations();
} else {
snackbr.enqueueSnackbar(errorMessage.replace("{{err}}", resp.error), {
variant: "error",
});
}
}
});
};
const onAutomationStateChange = (eid: string, on: boolean) =>
wrapPromise(
"changing automation state",
'failed to toggle autonation due to "{{err}}"',
() => _onAutomationStateChange(eid, on)
);
const refreshAutomations = () =>
wrapPromise(
"refreshing automations",
'failed refreshing automations due to "{{err}}"',
() => _refreshAutomations()
);
const forceDeleteAutomation = (eid: string) =>
wrapPromise("deleting automations", 'failed delete due to "{{err}}"', () =>
_forceDeleteAutomation(eid)
);
const triggerAutomation = (eid: string) =>
wrapPromise(
"triggering automations",
'failed trigger due to "{{err}}"',
() => _triggerAutomation(eid)
);
// effects
useEffect(() => {
refreshAutomations();
// eslint-disable-next-line
}, []);
useEffect(() => {
if (
api.state.automations.ready &&
api.state.automations.ok &&
!validationsShown.current
) {
const configAutomationsValidated = api.state.automations.data.data.map(
(a) => {
const failures = getFailures(a, av.AutomationData);
return {
automation: a,
failures,
};
}
);
const invalidAutomations = configAutomationsValidated.filter(
({ failures }) => failures !== null
);
if (invalidAutomations.length > 0 && !validationsShown.current) {
validationsShown.current = true;
confirm({
cancellationButtonProps: {
style: { display: "none" },
},
title: "Invalid Automations detected!",
content: (
<>
<ol className="invalid-automation-modal-list">
{invalidAutomations.map(({ automation, failures }, i) => (
<li key={i}>
<b>Automation</b>
<InputYaml
label=""
value={automation}
onChange={() => {}}
/>
<b>Errors</b>
<Alert
color="error"
className="invalid-automation-modal-list--errors"
>
<ul>
{failures &&
failures.map((f, fi) => (
<li key={fi}>
<b>{f.path}</b>: {f.message.join(", ")}
</li>
))}
</ul>
</Alert>
</li>
))}
</ol>
</>
),
})
.then(console.info)
.catch(console.error);
}
}
}, [api.state.automations, confirm]);
// handle bad states // handle bad states
if (!haEntities.ready && haEntities.error) { if (!haEntities.ready && haEntities.error) {
@@ -68,77 +207,77 @@ export const AutomationManager: FC<AutomationManagerProps> = ({
} }
// alias // alias
const configAutomations = api.state.automations.data;
const hassEntities = haEntities.collection; const hassEntities = haEntities.collection;
const configAutomations = api.state.automations.data;
return ( return (
<AutomationManagerLoaded <ErrorBoundary
configAutomations={configAutomations.data} additionalContext={{
hassEntities={hassEntities} configAutomations,
onAutomationStateChange={onAutomationStateChange} hassEntities,
onAutomationAdd={async (auto) => {
await api.updateAutomation({
index: configAutomations.totalItems + 1,
auto,
});
refreshAutomations();
}}
onAutomationDelete={(aid, eid) => {
const index = configAutomations.data.findIndex(
({ metadata }) => metadata.id === aid
);
let deleteSent = false;
if (index >= 0) {
api.removeAutomation({
index,
});
deleteSent = true;
}
const hassAuto = hassEntities[eid];
if (hassAuto) {
forceDeleteAutomation(eid);
deleteSent = true;
}
if (!deleteSent) {
snackbr.enqueueSnackbar(
"Failed to delete automation, this may be resolved by a refresh or reboot of Home Assistant",
{
variant: "error",
}
);
}
// refreshAutomations();
}}
onAutomationUpdate={(aid, auto) => {
const index = configAutomations.data.findIndex(
({ metadata }) => metadata.id === aid
);
if (index >= 0) {
api.updateAutomation({
index: configAutomations.data.findIndex(
({ metadata }) => metadata.id === aid
),
auto,
});
refreshAutomations();
} else {
snackbr.enqueueSnackbar(
"Failed to update automation, this may be resolved by a refresh or reboot of Home Assistant.",
{
variant: "error",
}
);
}
}}
onUpdateTags={async (aid, t) => {
setIsSaving(true);
await api.updateTags({
automation_id: aid,
tags: t,
});
setIsSaving(false);
}} }}
> >
{isSaving && <LinearProgress />} {isSaving.length > 0 && (
</AutomationManagerLoaded> <>
<span>{isSaving.join(" and ")}...</span>
<LinearProgress />
</>
)}
<AutomationManagerLoaded
configAutomations={configAutomations.data}
hassEntities={hassEntities}
onAutomationRun={triggerAutomation}
onAutomationStateChange={onAutomationStateChange}
onAutomationAdd={(auto) =>
wrapApiPromise(
"adding automation",
"Failed to create automation, recieved error: {{err}}!",
() => api.createAutomation(auto) as any
)
}
onAutomationDelete={(aid, eid) => {
const autoToDelete = configAutomations.data.find(
({ id }) => id === aid
);
let deleteSent = false;
if (autoToDelete) {
api.removeAutomation(autoToDelete);
deleteSent = true;
}
const hassAuto = hassEntities[eid];
if (hassAuto) {
forceDeleteAutomation(eid);
deleteSent = true;
}
if (!deleteSent) {
snackbr.enqueueSnackbar(
"Failed to delete automation, this may be resolved by a refresh or reboot of Home Assistant",
{
variant: "error",
}
);
}
// refreshAutomations();
}}
onAutomationUpdate={(auto) =>
wrapApiPromise(
"updating automation",
"Failed to update automation, recieved error: {{err}}!",
() => api.updateAutomation(auto) as any
)
}
onUpdateTags={async (aid, t) => {
wrapApiPromise(
"updating tags",
"Failed to update tags, recieved error: {{err}}!",
() =>
api.updateTags({
automation_id: aid,
tags: t,
}) as any
);
}}
/>
</ErrorBoundary>
); );
}; };
@@ -9,11 +9,20 @@ export type AutomationManagerAuto = AutomationManagerAutoUpdatable & {
tags: Record<string, string>; tags: Record<string, string>;
issue?: string; issue?: string;
isNew?: boolean; isNew?: boolean;
source_file: string;
source_file_type: string;
configuration_key: string;
};
export type AutomationManagerAutoItem = AutomationManagerAuto & {
flags: AutomationManagerItemFlags;
};
export type AutomationManagerItemFlags = {
isSelected: boolean;
isModified: boolean;
}; };
export type AutomationManagerItem = { export type AutomationManagerItem = {
title: string; title: string;
isSelected: boolean; flags: AutomationManagerItemFlags;
} & ( } & (
| { | {
type: "group"; type: "group";
@@ -21,6 +30,6 @@ export type AutomationManagerItem = {
} }
| { | {
type: "items"; type: "items";
data: Array<AutomationManagerAuto & { isSelected: boolean }>; data: Array<AutomationManagerAutoItem>;
} }
); );
@@ -7,7 +7,7 @@ import { AutomationCondition } from "types/automations/conditions";
import { getSubTypeList } from "utils/automations"; import { getSubTypeList } from "utils/automations";
import { getConditionDefaultValues } from "utils/defaults"; import { getConditionDefaultValues } from "utils/defaults";
import { useHA } from "haService"; import { useHA } from "haService";
import InputYaml from "components/Inputs/InputYaml"; import InputYaml from "components/Inputs/Base/InputYaml";
import { getViewer } from "./viewRender"; import { getViewer } from "./viewRender";
import { getEditor } from "./editorRender"; import { getEditor } from "./editorRender";
import useWindowSize from "utils/useWindowSize"; import useWindowSize from "utils/useWindowSize";
@@ -10,26 +10,26 @@ import {
TriggerCondition, TriggerCondition,
ZoneCondition, ZoneCondition,
} from "types/automations/conditions"; } from "types/automations/conditions";
import InputNumber from "components/Inputs/InputNumber"; import InputNumber from "components/Inputs/Base/InputNumber";
import InputText from "components/Inputs/InputText"; import InputText from "components/Inputs/Base/InputText";
import { InputEntity } from "components/Inputs/InputEntities"; import { InputEntity } from "components/Inputs/AutoComplete/InputEntities";
import { import {
ConditionNodeBase, ConditionNodeBase,
ConditionNodeBaseViewMode, ConditionNodeBaseViewMode,
} from "./ConditionNodeBase"; } from "./ConditionNodeBase";
import { genUpdateMethods } from "./nestedUpdater"; import { genUpdateMethods } from "./nestedUpdater";
import { InputTime } from "components/Inputs/InputTime"; import { InputTime } from "components/Inputs/Base/InputTime";
import InputYaml from "components/Inputs/InputYaml"; import InputYaml from "components/Inputs/Base/InputYaml";
import { HAService } from "haService"; import { HAService } from "haService";
import { DeviceEditor } from "components/DeviceEditor"; import { DeviceEditor } from "components/DeviceEditor";
import { ButtonIcon } from "components/Icons/ButtonIcons"; import { ButtonIcon } from "components/Icons/ButtonIcons";
import AddIcon from "@mui/icons-material/Add"; import AddIcon from "@mui/icons-material/Add";
import { getEntityDomains } from "utils/automations"; import { getEntityDomains } from "utils/automations";
import { InputAutoComplete } from "components/Inputs/InputAutoComplete"; import { InputAutoComplete } from "components/Inputs/AutoComplete/InputAutoComplete";
import { InputTimeEntity } from "components/Inputs/InputTimeEntity"; import { InputTimeEntity } from "components/Inputs/AutoComplete/InputTimeEntity";
import { prettyName } from "utils/formatting"; import { prettyName } from "utils/formatting";
import { InputList } from "components/Inputs/InputList"; import { InputList } from "components/Inputs/InputList";
import { Button } from "components/Inputs/Button"; import { Button } from "components/Inputs/Buttons/Button";
import { RemoveCircle } from "@mui/icons-material"; import { RemoveCircle } from "@mui/icons-material";
interface Editor<C extends AutomationCondition> interface Editor<C extends AutomationCondition>
@@ -6,7 +6,7 @@ export const NODE_HEIGHT = 80 as const;
export const DEFAULT_DIMS: DAGDims = { export const DEFAULT_DIMS: DAGDims = {
collection: { collection: {
height: NODE_HEIGHT * 3, height: NODE_HEIGHT * 3,
width: NODE_WIDTH * 1.5, width: NODE_WIDTH * 2.5,
}, },
node: { node: {
height: NODE_HEIGHT, height: NODE_HEIGHT,
@@ -8,67 +8,61 @@ import { AutomationActionData } from "types/automations";
import { createUpdaterFromAutomationData } from "../updater"; import { createUpdaterFromAutomationData } from "../updater";
import { ModalState } from "../board/types"; import { ModalState } from "../board/types";
import { DEFAULT_DIMS } from "./constants"; import { DEFAULT_DIMS } from "./constants";
import { makeStory } from "devUtils";
const Demo: FC<{ const { make, componentMeta } = makeStory({
automation: AutomationActionData; Component: (props: {
flipped: boolean; automation: AutomationActionData;
}> = (props) => { flipped: boolean;
const { namer } = useHA(); }) => {
const [state, setState] = useState<AutomationActionData>(props.automation); const { namer } = useHA();
const [modalState, setModalState] = const [state, setState] = useState<AutomationActionData>(props.automation);
useState<ModalState | undefined>(undefined); const [modalState, setModalState] =
const updater = createUpdaterFromAutomationData( useState<ModalState | undefined>(undefined);
setModalState, const updater = createUpdaterFromAutomationData(
state, setModalState,
setState state,
); setState
const elementData = useAutomationNodes(state, { );
dims: { const elementData = useAutomationNodes(state, {
...DEFAULT_DIMS, dims: {
flipped: props.flipped, ...DEFAULT_DIMS,
}, flipped: props.flipped,
namer, },
openModal: setModalState, namer,
stateUpdater: updater, openModal: setModalState,
}); stateUpdater: updater,
return ( });
<DAGGraphBoard return (
modalState={modalState} <DAGGraphBoard
closeModal={() => setModalState(undefined)} modalState={modalState}
state={{ closeModal={() => setModalState(undefined)}
ready: true, state={{
data: { ready: true,
elements: elementData, data: {
}, elements: elementData,
}} },
/> }}
); />
}; );
},
export default { meta: {
title: "DAGGraph/Elements", title: "DAGGraph/Elements",
component: Demo, args: {
parameters: { actions: { argTypesRegex: "^on.*" } }, flipped: true,
args: { automation: {
flipped: true, trigger: [],
automation: { condition: [],
trigger: [], action: [],
condition: [], },
sequence: [],
}, },
}, },
} as ComponentMeta<typeof Demo>; });
const Template: ComponentStory<typeof Demo> = (args) => ( export default componentMeta;
<Page>
<Demo {...args} />
</Page>
);
export const Empty = Template.bind({}); export const Empty = make({});
export const Trigger = Template.bind({}); export const Trigger = make({
Trigger.args = {
...Trigger.args,
automation: { automation: {
trigger: [ trigger: [
{ platform: "homeassistant", event: "up" }, { platform: "homeassistant", event: "up" },
@@ -80,12 +74,11 @@ Trigger.args = {
}, },
], ],
condition: [], condition: [],
sequence: [], action: [],
}, },
}; });
export const Conditions = Template.bind({});
Conditions.args = { export const Conditions = make({
...Conditions.args,
automation: { automation: {
trigger: [ trigger: [
{ {
@@ -117,13 +110,11 @@ Conditions.args = {
below: "15", below: "15",
}, },
], ],
sequence: [], action: [],
}, },
}; });
export const FullAuto = Template.bind({}); export const FullAuto = make({
FullAuto.args = {
...FullAuto.args,
automation: { automation: {
condition: [ condition: [
{ {
@@ -160,7 +151,7 @@ FullAuto.args = {
bad: "node", bad: "node",
} as any, } as any,
], ],
sequence: [ action: [
{ {
condition: "and", condition: "and",
conditions: [ conditions: [
@@ -272,15 +263,13 @@ FullAuto.args = {
}, },
], ],
}, },
}; });
export const ChooseAuto = Template.bind({}); export const ChooseAuto = make({
ChooseAuto.args = {
...ChooseAuto.args,
automation: { automation: {
condition: [], condition: [],
trigger: [], trigger: [],
sequence: [ action: [
{ {
choose: [ choose: [
{ {
@@ -370,31 +359,26 @@ ChooseAuto.args = {
}, },
], ],
}, },
}; });
export const EmptyChooseAuto = Template.bind({}); export const EmptyChooseAuto = make({
EmptyChooseAuto.args = {
...EmptyChooseAuto.args,
automation: { automation: {
condition: [], condition: [],
trigger: [], trigger: [],
sequence: [ action: [
{ {
choose: [], choose: [],
default: [], default: [],
}, },
], ],
}, },
}; });
export const RepeatAuto = Template.bind({}); export const RepeatAuto = make({
RepeatAuto.args = {
...RepeatAuto.args,
automation: { automation: {
condition: [], condition: [],
trigger: [], trigger: [],
sequence: [ action: [
{ {
repeat: { repeat: {
while: 'states(lights.switch) == "on"', while: 'states(lights.switch) == "on"',
@@ -437,15 +421,13 @@ RepeatAuto.args = {
}, },
], ],
}, },
}; });
export const ParallelAuto = Template.bind({}); export const ParallelAuto = make({
ParallelAuto.args = {
...ParallelAuto.args,
automation: { automation: {
condition: [], condition: [],
trigger: [], trigger: [],
sequence: [ action: [
{ {
parallel: [ parallel: [
{ {
@@ -467,11 +449,9 @@ ParallelAuto.args = {
}, },
], ],
}, },
}; });
export const BadNodes = Template.bind({}); export const BadNodes = make({
BadNodes.args = {
...BadNodes.args,
automation: { automation: {
condition: [ condition: [
{ {
@@ -489,7 +469,7 @@ BadNodes.args = {
{ condition: "and" }, { condition: "and" },
"text?", "text?",
] as any, ] as any,
sequence: [ action: [
{ {
parallel: { parallel: {
bad: "me", bad: "me",
@@ -500,15 +480,13 @@ BadNodes.args = {
}, },
] as any, ] as any,
}, },
}; });
export const IfElseNode = Template.bind({}); export const IfElseNode = make({
IfElseNode.args = {
...IfElseNode.args,
automation: { automation: {
condition: [], condition: [],
trigger: [], trigger: [],
sequence: [ action: [
{ {
if: [], if: [],
else: [], else: [],
@@ -516,4 +494,24 @@ IfElseNode.args = {
}, },
], ],
}, },
}; });
export const TimeNodes = make({
automation: {
condition: [],
trigger: [
{
platform: "time",
at: "",
},
{
platform: "time_pattern",
},
],
action: [
{
condition: "time",
},
],
},
});
@@ -63,7 +63,7 @@ export const useAutomationNodes = (
); );
outputState.extend( outputState.extend(
makeSequenceNodes(automation.sequence, { makeSequenceNodes(automation.action, {
...args, ...args,
state, state,
dims, dims,
@@ -74,7 +74,7 @@ export const useAutomationNodes = (
dims, dims,
true true
), ),
nodeId: `${dims.flipped}-sequence`, nodeId: `${dims.flipped}-action`,
nodeIndex: 2, nodeIndex: 2,
lastNodeId: outputState.lastNodeId, lastNodeId: outputState.lastNodeId,
}) })
@@ -98,7 +98,7 @@ export const makeSequenceNodes: ElementMaker<AutomationSequenceNode> = (
enabled: node.enabled ?? true, enabled: node.enabled ?? true,
label: getDescriptionFromAutomationNode(node, namer, true), label: getDescriptionFromAutomationNode(node, namer, true),
...state.getIsClosedActions(nodeId, node), ...state.getIsClosedActions(nodeId, node),
...stateUpdater.createNodeActions("sequence", nodeIndex, { ...stateUpdater.createNodeActions("action", nodeIndex, {
includeAdd: true, includeAdd: true,
flipped: dims.flipped, flipped: dims.flipped,
}), }),
@@ -153,7 +153,7 @@ export const makeSequenceNodes: ElementMaker<AutomationSequenceNode> = (
dims, dims,
{ {
icon: <AddIcon />, icon: <AddIcon />,
onClick: () => stateUpdater.basic.sequence.addNode(null), onClick: () => stateUpdater.basic.action.addNode(null),
} }
), ),
true true
@@ -261,7 +261,7 @@ export const makeChooseeNodes = makeSpecialNodeMaker(
nodeId: args.nodeId, nodeId: args.nodeId,
position: pos, position: pos,
onClick: () => onClick: () =>
args.stateUpdater.basic.sequence.updateNode( args.stateUpdater.basic.action.updateNode(
{ {
...node, ...node,
choose: [ choose: [
@@ -464,10 +464,10 @@ export const makeParallelNodes = makeSpecialNodeMaker(
onClick: () => onClick: () =>
args.openModal({ args.openModal({
allowedTypes: ["condition", "action"], allowedTypes: ["condition", "action"],
node: args.stateUpdater.basic.sequence.defaultNode, node: args.stateUpdater.basic.action.defaultNode,
saveBtnCreateText: true, saveBtnCreateText: true,
update: (n) => update: (n) =>
args.stateUpdater.basic.sequence.updateNode( args.stateUpdater.basic.action.updateNode(
{ {
...node, ...node,
parallel: [...node.parallel, n], parallel: [...node.parallel, n],
@@ -29,7 +29,7 @@ export const useDAGElementsState = () => {
}, },
getIsClosedActions(nodeId: string, node: AutomationNode) { getIsClosedActions(nodeId: string, node: AutomationNode) {
if (isSpecialNode(getNodeSubType(node))) { if (isSpecialNode(getNodeSubType(node, true))) {
return { return {
isClosed: this.get(nodeId).isClosed ?? false, isClosed: this.get(nodeId).isClosed ?? false,
setIsClosed: (v: boolean) => this.set(nodeId, "isClosed", v), setIsClosed: (v: boolean) => this.set(nodeId, "isClosed", v),
+6 -6
View File
@@ -10,10 +10,10 @@ import { AutomationTrigger } from "types/automations/triggers";
import { AutomationCondition } from "types/automations/conditions"; import { AutomationCondition } from "types/automations/conditions";
export const DAGAutomationGraph: FC<{ export const DAGAutomationGraph: FC<{
sequence: AutomationSequenceNode[]; action: AutomationSequenceNode[];
trigger: AutomationTrigger[]; trigger: AutomationTrigger[];
condition: AutomationCondition[]; condition: AutomationCondition[];
onSequenceUpdate: (s: AutomationSequenceNode[]) => void; onActionUpdate: (s: AutomationSequenceNode[]) => void;
onTriggerUpdate: (t: AutomationTrigger[]) => void; onTriggerUpdate: (t: AutomationTrigger[]) => void;
onConditionUpdate: (c: AutomationCondition[]) => void; onConditionUpdate: (c: AutomationCondition[]) => void;
isFlipped: boolean; isFlipped: boolean;
@@ -24,9 +24,9 @@ export const DAGAutomationGraph: FC<{
useState<ModalState | undefined>(undefined); useState<ModalState | undefined>(undefined);
const updater = createUpdater({ const updater = createUpdater({
openModal: setModalState, openModal: setModalState,
sequence: { action: {
data: props.sequence, data: props.action,
onUpdate: props.onSequenceUpdate, onUpdate: props.onActionUpdate,
}, },
condition: { condition: {
data: props.condition, data: props.condition,
@@ -39,7 +39,7 @@ export const DAGAutomationGraph: FC<{
}); });
const elementData = useAutomationNodes( const elementData = useAutomationNodes(
{ {
sequence: props.sequence, action: props.action,
condition: props.condition, condition: props.condition,
trigger: props.trigger, trigger: props.trigger,
}, },
Loaded 100 of 196 files, more files were not shown because too many files have changed in this diff. Show more