Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
58379ebfc8 | ||
|
|
41059b4974 | ||
|
|
af600aaf57 | ||
|
|
738712e946 | ||
|
|
3c64550d10 | ||
|
|
beff46aeff | ||
|
|
7f3173684d | ||
|
|
8a06a1674b | ||
|
|
3e28974abf | ||
|
|
19ea12a70e | ||
|
|
f30ba7286b | ||
|
|
2617febece | ||
|
|
81bd15436e | ||
|
|
4b3028355d | ||
|
|
46209564f0 | ||
|
|
bd3cfdf859 | ||
|
|
44ad46cff3 | ||
|
|
baada590c5 | ||
|
|
4f78e42699 | ||
|
|
43c3438b2f | ||
|
|
7ea923a050 | ||
|
|
afc67a17ec | ||
|
|
248660ff30 | ||
|
|
3314d111d6 | ||
|
|
b368be0ff4 | ||
|
|
acb12e73e8 | ||
|
|
9e9cea9269 | ||
|
|
b329e3f594 | ||
|
|
e9cbacbc92 | ||
|
|
5e345d20e5 | ||
|
|
f6af594a8f | ||
|
|
ff7dee0879 | ||
|
|
d250018c9a | ||
|
|
95af6392ba | ||
|
|
fedc6c889a | ||
|
|
77c338eb90 | ||
|
|
967508c29e | ||
|
|
93fe26e787 | ||
|
|
5a6f79a0d6 | ||
|
|
b1c5bce584 | ||
|
|
50ba9f3d6b | ||
|
|
d54ac4a779 | ||
|
|
045af7bfdb | ||
|
|
8639ac8646 | ||
|
|
682bbf799b | ||
|
|
8cee78b5aa |
No files matched your search
@@ -0,0 +1,13 @@
|
|||||||
|
# These are supported funding model platforms
|
||||||
|
|
||||||
|
github: #[asosnovsky]
|
||||||
|
patreon: # Replace with a single Patreon username
|
||||||
|
open_collective: # Replace with a single Open Collective username
|
||||||
|
ko_fi: arisosnovsky
|
||||||
|
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
|
||||||
|
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
|
||||||
|
liberapay: # Replace with a single Liberapay username
|
||||||
|
issuehunt: asosnovsky
|
||||||
|
otechie: # Replace with a single Otechie username
|
||||||
|
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
|
||||||
|
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
# For most projects, this workflow file will not need changing; you simply need
|
||||||
|
# to commit it to your repository.
|
||||||
|
#
|
||||||
|
# You may wish to alter this file to override the set of languages analyzed,
|
||||||
|
# or to provide custom queries or build logic.
|
||||||
|
#
|
||||||
|
# ******** NOTE ********
|
||||||
|
# We have attempted to detect the languages in your repository. Please check
|
||||||
|
# the `language` matrix defined below to confirm you have the correct set of
|
||||||
|
# supported CodeQL languages.
|
||||||
|
#
|
||||||
|
name: "CodeQL"
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ main ]
|
||||||
|
pull_request:
|
||||||
|
# The branches below must be a subset of the branches above
|
||||||
|
branches: [ main ]
|
||||||
|
schedule:
|
||||||
|
- cron: '29 23 * * 0'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
analyze:
|
||||||
|
name: Analyze
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
actions: read
|
||||||
|
contents: read
|
||||||
|
security-events: write
|
||||||
|
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
language: [ 'javascript', 'python' ]
|
||||||
|
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
|
||||||
|
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Checkout repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
# Initializes the CodeQL tools for scanning.
|
||||||
|
- name: Initialize CodeQL
|
||||||
|
uses: github/codeql-action/init@v2
|
||||||
|
with:
|
||||||
|
languages: ${{ matrix.language }}
|
||||||
|
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||||
|
# By default, queries listed here will override any specified in a config file.
|
||||||
|
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||||
|
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||||
|
|
||||||
|
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
|
||||||
|
# If this step fails, then you should remove it and run the build manually (see below)
|
||||||
|
- name: Autobuild
|
||||||
|
uses: github/codeql-action/autobuild@v2
|
||||||
|
|
||||||
|
# ℹ️ Command-line programs to run using the OS shell.
|
||||||
|
# 📚 https://git.io/JvXDl
|
||||||
|
|
||||||
|
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
|
||||||
|
# and modify them (or add more) to build your code if your project
|
||||||
|
# uses a compiled language
|
||||||
|
|
||||||
|
#- run: |
|
||||||
|
# make bootstrap
|
||||||
|
# make release
|
||||||
|
|
||||||
|
- name: Perform CodeQL Analysis
|
||||||
|
uses: github/codeql-action/analyze@v2
|
||||||
Vendored
+10
-1
@@ -1,3 +1,12 @@
|
|||||||
{
|
{
|
||||||
"python.formatting.provider": "black"
|
"python.formatting.provider": "black",
|
||||||
|
"python.testing.unittestArgs": [
|
||||||
|
"-v",
|
||||||
|
"-s",
|
||||||
|
"./api/tests",
|
||||||
|
"-p",
|
||||||
|
"*test_*.py"
|
||||||
|
],
|
||||||
|
"python.testing.pytestEnabled": false,
|
||||||
|
"python.testing.unittestEnabled": true
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# Changelog
|
||||||
|
|
||||||
|
## [0.0.12] - Tags
|
||||||
|
|
||||||
|
- Added tag management system for automations
|
||||||
|
|
||||||
|
## [0.0.11] - Zoom
|
||||||
|
|
||||||
|
- Added lazy saving
|
||||||
|
|
||||||
|
## [0.0.10] - Zoom
|
||||||
|
|
||||||
|
- Introducing Zoom!
|
||||||
|
|
||||||
|
## [0.0.9] - First Working Version
|
||||||
|
|
||||||
|
- Instalable verion via github
|
||||||
|
- Initial POC done
|
||||||
|
|
||||||
|
|
||||||
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
+4
-3
@@ -13,7 +13,8 @@ RUN apk add --no-cache \
|
|||||||
npm \
|
npm \
|
||||||
build-base \
|
build-base \
|
||||||
python3-dev
|
python3-dev
|
||||||
RUN pip install -U wheel setuptools pip
|
RUN pip install -U wheel setuptools pip && \
|
||||||
|
npm i -g yarn
|
||||||
|
|
||||||
# <--- Python Dependencies -->
|
# <--- Python Dependencies -->
|
||||||
COPY api/setup.py /app/setup.py
|
COPY api/setup.py /app/setup.py
|
||||||
@@ -22,8 +23,8 @@ RUN pip install . /app
|
|||||||
# <--- Webapp Build -->
|
# <--- Webapp Build -->
|
||||||
COPY webapp/ /app/web-builder
|
COPY webapp/ /app/web-builder
|
||||||
RUN cd /app/web-builder && \
|
RUN cd /app/web-builder && \
|
||||||
npm install && \
|
yarn && \
|
||||||
npm run build && \
|
yarn build && \
|
||||||
cp -r /app/web-builder/build /app/web && \
|
cp -r /app/web-builder/build /app/web && \
|
||||||
rm -rf /app/web-builder
|
rm -rf /app/web-builder
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
# Shortumation
|
# Shortumation
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
@@ -7,9 +9,13 @@ A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI
|
|||||||
- [X] View your automations & scripts in a visual graph
|
- [X] View your automations & scripts in a visual graph
|
||||||
- [X] See all automations in one common view
|
- [X] See all automations in one common view
|
||||||
- [X] Automation Manager
|
- [X] Automation Manager
|
||||||
|
- [X] Tags for automation organization
|
||||||
- [ ] Script Manager
|
- [ ] Script Manager
|
||||||
- [ ] Use secrets and global parameters
|
- [ ] Use secrets and global parameters
|
||||||
- [ ] Autocomplete fields for entities/devices
|
- [ ] Autocomplete fields for entities/devices
|
||||||
- [ ] Autocomplete fields for template editor
|
- [ ] Autocomplete fields for template editor
|
||||||
- [ ] Autocomplete fields for referencing scripts
|
- [ ] Autocomplete fields for referencing scripts
|
||||||
|
|
||||||
|
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
||||||
|
|
||||||
|
|
||||||
+1
-2
@@ -8,7 +8,6 @@ setup:
|
|||||||
python3 -m venv $(VENV_FOLDER)
|
python3 -m venv $(VENV_FOLDER)
|
||||||
$(PIP) install wheel==0.35.1
|
$(PIP) install wheel==0.35.1
|
||||||
$(PIP) install .[dev]
|
$(PIP) install .[dev]
|
||||||
$(VENV_BIN)/pre-commit install
|
|
||||||
|
|
||||||
lint:
|
lint:
|
||||||
$(VENV_BIN)/vulture --exclude src
|
$(VENV_BIN)/vulture --exclude src
|
||||||
@@ -44,4 +43,4 @@ clean:
|
|||||||
run-local:
|
run-local:
|
||||||
rm -f web
|
rm -f web
|
||||||
ln -s ../webapp/build web
|
ln -s ../webapp/build web
|
||||||
USE_EXAMPLE_REPO=1 uvicorn src.app:app --reload
|
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
|
||||||
+12
-3
@@ -1,8 +1,10 @@
|
|||||||
|
from sys import prefix
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.env import ROOT_FOLDER
|
from src.env import ROOT_FOLDER, ORIGIN
|
||||||
from .routes import ping, automations
|
from .routes import ping, automations, details
|
||||||
|
|
||||||
|
|
||||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||||
@@ -18,7 +20,14 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
print("WARN: could not find web folder")
|
print("WARN: could not find web folder")
|
||||||
|
app.add_middleware(
|
||||||
|
CORSMiddleware,
|
||||||
|
allow_origins=ORIGIN,
|
||||||
|
allow_credentials=True,
|
||||||
|
allow_methods=["*"],
|
||||||
|
allow_headers=["*"],
|
||||||
|
)
|
||||||
app.include_router(ping.router, prefix="/ping")
|
app.include_router(ping.router, prefix="/ping")
|
||||||
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
|
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
|
||||||
|
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
|
||||||
return app
|
return app
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
from fastapi import APIRouter
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from src.hass_config import HassConfig
|
||||||
|
from src.env import BUILD_VERSION
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
@router.get("/")
|
||||||
|
def read_ping():
|
||||||
|
return {
|
||||||
|
"version": BUILD_VERSION,
|
||||||
|
"config": hass_config.get_configuration_path(),
|
||||||
|
"tags": hass_config.get_automation_tags_path(),
|
||||||
|
"autos": hass_config.get_automation_path(),
|
||||||
|
}
|
||||||
|
|
||||||
|
return router
|
||||||
@@ -2,7 +2,7 @@ from typing import Generic, List, TypeVar
|
|||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
from pydantic.generics import GenericModel
|
from pydantic.generics import GenericModel
|
||||||
from src.automations.types import AutomationData
|
from src.automations.types import ExtenededAutomationData
|
||||||
|
|
||||||
DataT = TypeVar("DataT")
|
DataT = TypeVar("DataT")
|
||||||
|
|
||||||
@@ -20,7 +20,7 @@ class ListData(GenericModel, Generic[DataT]):
|
|||||||
|
|
||||||
class UpdateAutoRequest(BaseModel):
|
class UpdateAutoRequest(BaseModel):
|
||||||
index: int = Field(description="Index of the automation to update")
|
index: int = Field(description="Index of the automation to update")
|
||||||
data: AutomationData
|
data: ExtenededAutomationData
|
||||||
|
|
||||||
|
|
||||||
class DeleteAutoRequest(BaseModel):
|
class DeleteAutoRequest(BaseModel):
|
||||||
|
|||||||
@@ -1,15 +1,17 @@
|
|||||||
from itertools import chain
|
from itertools import chain
|
||||||
from typing import Iterable, Iterator
|
from typing import Iterable, Iterator
|
||||||
from pydantic.error_wrappers import ValidationError
|
from pydantic.error_wrappers import ValidationError
|
||||||
|
from src.automations.tags import TagManager
|
||||||
from src.json_serializer import normalize_obj
|
from src.json_serializer import normalize_obj
|
||||||
from .types import AutomationData, AutomationMetdata
|
from .types import AutomationData, AutomationMetdata, ExtenededAutomationData
|
||||||
from .parsers import _parse_actions
|
from .parsers import _parse_actions
|
||||||
from .errors import InvalidAutomationFile
|
from .errors import InvalidAutomationFile
|
||||||
|
|
||||||
# Single loader
|
# Single loader
|
||||||
def load_automation(
|
def load_automation(
|
||||||
automations_raw_data: Iterable[dict],
|
auto_raw: dict,
|
||||||
) -> Iterator[AutomationData]:
|
tags: dict,
|
||||||
|
) -> Iterator[ExtenededAutomationData]:
|
||||||
"""Converts an automation dictionary loaded directly from the config into
|
"""Converts an automation dictionary loaded directly from the config into
|
||||||
several python typed objects
|
several python typed objects
|
||||||
|
|
||||||
@@ -17,22 +19,22 @@ def load_automation(
|
|||||||
automations_raw_data (Iterable[dict])
|
automations_raw_data (Iterable[dict])
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
Iterator[AutomationData]
|
Iterator[ExtenededAutomationData]
|
||||||
|
|
||||||
"""
|
"""
|
||||||
for auto_raw in automations_raw_data:
|
try:
|
||||||
try:
|
yield ExtenededAutomationData(
|
||||||
yield AutomationData(
|
metadata=AutomationMetdata.parse_obj(auto_raw),
|
||||||
metadata=AutomationMetdata.parse_obj(auto_raw),
|
sequence=list(
|
||||||
sequence=list(
|
_parse_actions(
|
||||||
_parse_actions(
|
chain(
|
||||||
chain(
|
auto_raw.get("condition", []),
|
||||||
auto_raw.get("condition", []),
|
auto_raw.get("action", []),
|
||||||
auto_raw.get("action", []),
|
|
||||||
)
|
|
||||||
)
|
)
|
||||||
),
|
)
|
||||||
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])],
|
),
|
||||||
)
|
trigger=[normalize_obj(obj) for obj in auto_raw.get("trigger", [])],
|
||||||
except ValidationError as err:
|
tags=tags,
|
||||||
raise InvalidAutomationFile from err
|
)
|
||||||
|
except ValidationError as err:
|
||||||
|
raise InvalidAutomationFile from err
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
from typing import Iterator, List, Optional
|
from typing import Iterator, List, Optional
|
||||||
from src.automations.errors import FailedDeletion
|
from src.automations.errors import FailedDeletion
|
||||||
from src.automations.types import AutomationData
|
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||||
from src.hass_config.loader import HassConfig
|
from src.hass_config.loader import HassConfig
|
||||||
from .loader import load_automation
|
from .loader import load_automation
|
||||||
|
|
||||||
@@ -14,21 +14,24 @@ class AutomationManager:
|
|||||||
offset: int = 0,
|
offset: int = 0,
|
||||||
limit: int = 10,
|
limit: int = 10,
|
||||||
) -> Iterator[AutomationData]:
|
) -> Iterator[AutomationData]:
|
||||||
|
tags = self.hass_config.automation_tags
|
||||||
for i, auto in enumerate(self.hass_config.automations):
|
for i, auto in enumerate(self.hass_config.automations):
|
||||||
if i < offset:
|
if i < offset:
|
||||||
continue
|
continue
|
||||||
if i >= offset + limit:
|
if i >= offset + limit:
|
||||||
break
|
break
|
||||||
yield from load_automation([auto])
|
yield from load_automation(auto, tags.get(i, {}))
|
||||||
|
|
||||||
def get(self, index: int) -> Optional[AutomationData]:
|
def get(self, index: int) -> Optional[AutomationData]:
|
||||||
|
tags = self.hass_config.automation_tags
|
||||||
if index >= 0:
|
if index >= 0:
|
||||||
for i, auto in enumerate(self.hass_config.automations):
|
for i, auto in enumerate(self.hass_config.automations):
|
||||||
if i == index:
|
if i == index:
|
||||||
return next(load_automation(([auto])))
|
return next(load_automation(auto, tags.get(i, {})))
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def update(self, index: int, automation: AutomationData):
|
def update(self, index: int, automation: ExtenededAutomationData):
|
||||||
|
tags = self.hass_config.automation_tags
|
||||||
automations: List[dict] = []
|
automations: List[dict] = []
|
||||||
updated = False
|
updated = False
|
||||||
for i, orig_auto in enumerate(self.hass_config.automations):
|
for i, orig_auto in enumerate(self.hass_config.automations):
|
||||||
@@ -39,7 +42,9 @@ class AutomationManager:
|
|||||||
automations.append(orig_auto)
|
automations.append(orig_auto)
|
||||||
if not updated:
|
if not updated:
|
||||||
automations.append(automation.to_primitive())
|
automations.append(automation.to_primitive())
|
||||||
|
tags[index] = automation.tags
|
||||||
self.hass_config.save_automations(automations)
|
self.hass_config.save_automations(automations)
|
||||||
|
self.hass_config.save_tags(tags)
|
||||||
|
|
||||||
def delete(self, index: int):
|
def delete(self, index: int):
|
||||||
automations: List[dict] = []
|
automations: List[dict] = []
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
from typing import Dict
|
||||||
|
from src.yaml_serializer import dump_yaml, load_yaml
|
||||||
|
|
||||||
|
class TagManager(Dict[int, Dict[str, str]]):
|
||||||
|
def save(self, path: Path):
|
||||||
|
path.write_text(dump_yaml(dict(self)))
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def load(cls, path: Path):
|
||||||
|
with path.open('r') as fp:
|
||||||
|
return cls(load_yaml(fp))
|
||||||
@@ -44,3 +44,6 @@ class AutomationData(BaseModel):
|
|||||||
"condition": [],
|
"condition": [],
|
||||||
"action": [action.to_primitive() for action in self.sequence],
|
"action": [action.to_primitive() for action in self.sequence],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ExtenededAutomationData(AutomationData):
|
||||||
|
tags: Dict[str, str] = Field(default_factory=dict)
|
||||||
+3
-1
@@ -1,7 +1,9 @@
|
|||||||
from decouple import config
|
from email.policy import default
|
||||||
|
from decouple import config, Csv
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
||||||
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
||||||
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
||||||
|
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import List, Optional
|
from typing import List, Optional
|
||||||
|
from src.automations.tags import TagManager
|
||||||
|
|
||||||
from src.yaml_serializer import load_yaml, dump_yaml
|
from src.yaml_serializer import load_yaml, dump_yaml
|
||||||
from src.yaml_serializer.types import IncludedYaml
|
from src.yaml_serializer.types import IncludedYaml
|
||||||
@@ -25,6 +26,19 @@ class HassConfig:
|
|||||||
raise MissingFile("automations.yaml") from err
|
raise MissingFile("automations.yaml") from err
|
||||||
return self.configurations["automation"]
|
return self.configurations["automation"]
|
||||||
|
|
||||||
|
@property
|
||||||
|
def automation_tags(self) -> TagManager:
|
||||||
|
tag_path = self.get_automation_tags_path()
|
||||||
|
if not tag_path.exists():
|
||||||
|
tag_path.parent.mkdir(parents=True, exist_ok=True)
|
||||||
|
return TagManager()
|
||||||
|
else:
|
||||||
|
return TagManager.load(tag_path)
|
||||||
|
|
||||||
|
|
||||||
|
def get_automation_tags_path(self) -> Path:
|
||||||
|
return self.root_path / ".shortumations" / "tags.yaml"
|
||||||
|
|
||||||
def get_configuration_path(self) -> Path:
|
def get_configuration_path(self) -> Path:
|
||||||
return self.root_path / "configuration.yaml"
|
return self.root_path / "configuration.yaml"
|
||||||
|
|
||||||
@@ -50,3 +64,6 @@ class HassConfig:
|
|||||||
self.get_configuration_path().write_text(
|
self.get_configuration_path().write_text(
|
||||||
dump_yaml({**self.configurations, "automation": automations})
|
dump_yaml({**self.configurations, "automation": automations})
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def save_tags(self, tags: TagManager):
|
||||||
|
tags.save(self.get_automation_tags_path())
|
||||||
@@ -0,0 +1,813 @@
|
|||||||
|
- id: '1616887975473'
|
||||||
|
alias: Home Assistant Off
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: shutdown
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: mobile_app
|
||||||
|
type: notify
|
||||||
|
title: Hassio Status
|
||||||
|
message: Hassio Is turning off...
|
||||||
|
mode: single
|
||||||
|
- id: '1616888026264'
|
||||||
|
alias: Home Assistant On
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: homeassistant
|
||||||
|
event: start
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: mobile_app
|
||||||
|
type: notify
|
||||||
|
title: Hassio Status
|
||||||
|
message: Home assistant is up!
|
||||||
|
mode: single
|
||||||
|
- id: '1619371298367'
|
||||||
|
alias: Living Room Button - Single Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_short_press
|
||||||
|
subtype: remote_button_short_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: light.toggle
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
area_id: dining_table
|
||||||
|
mode: single
|
||||||
|
- id: '1620239986670'
|
||||||
|
alias: Kitchen Button - Short Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_short_press
|
||||||
|
subtype: remote_button_short_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: light.toggle
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: light.switch_kitchen
|
||||||
|
mode: single
|
||||||
|
- id: '1620324780561'
|
||||||
|
alias: Kitchen Island Button - Single Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_short_press
|
||||||
|
subtype: remote_button_short_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- type: toggle
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: light.switch_island
|
||||||
|
domain: light
|
||||||
|
mode: single
|
||||||
|
- id: '1621352850204'
|
||||||
|
alias: Kitchen Button - Double Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_double_press
|
||||||
|
subtype: remote_button_double_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- type: toggle
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: light.switch_island
|
||||||
|
domain: light
|
||||||
|
mode: single
|
||||||
|
- id: '1622210698281'
|
||||||
|
alias: Kitchen Button - Long Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_long_press
|
||||||
|
subtype: remote_button_long_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- choose:
|
||||||
|
- conditions:
|
||||||
|
- condition: numeric_state
|
||||||
|
entity_id: light.switch_kitchen
|
||||||
|
attribute: brightness
|
||||||
|
above: '200'
|
||||||
|
sequence:
|
||||||
|
- service: light.turn_on
|
||||||
|
data:
|
||||||
|
brightness: 50
|
||||||
|
target:
|
||||||
|
entity_id: light.switch_kitchen
|
||||||
|
default:
|
||||||
|
- service: light.turn_on
|
||||||
|
data:
|
||||||
|
brightness: 255
|
||||||
|
target:
|
||||||
|
entity_id: light.switch_kitchen
|
||||||
|
mode: single
|
||||||
|
- id: '1622769811245'
|
||||||
|
alias: Living Room Button - Double Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_double_press
|
||||||
|
subtype: remote_button_double_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: light.toggle
|
||||||
|
data:
|
||||||
|
brightness: 255
|
||||||
|
target:
|
||||||
|
entity_id: light.switch_living
|
||||||
|
mode: single
|
||||||
|
- id: '1623430479201'
|
||||||
|
alias: Bedroom Button - Single Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_short_press
|
||||||
|
subtype: remote_button_short_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- type: toggle
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: light.bulb_ari_lamp
|
||||||
|
domain: light
|
||||||
|
mode: single
|
||||||
|
- id: '1623642118976'
|
||||||
|
alias: Bedroom Button - Double Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_double_press
|
||||||
|
subtype: remote_button_double_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: script.turn_all_lights_off
|
||||||
|
mode: single
|
||||||
|
- id: '1624640900951'
|
||||||
|
alias: Baby Button - Double Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_double_press
|
||||||
|
subtype: remote_button_double_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: media_player.play_media
|
||||||
|
target:
|
||||||
|
entity_id: media_player.baby_bedroom_dot
|
||||||
|
data:
|
||||||
|
media_content_id: Baby Sleep Music
|
||||||
|
media_content_type: SPOTIFY
|
||||||
|
mode: single
|
||||||
|
- id: '1628024070687'
|
||||||
|
alias: Baby Light Setting - Night
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: time
|
||||||
|
at: '20:35:00'
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: zwave_js.set_config_parameter
|
||||||
|
data:
|
||||||
|
parameter: '5'
|
||||||
|
value: '15'
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
- condition: state
|
||||||
|
entity_id: light.switch_baby
|
||||||
|
state: 'on'
|
||||||
|
- service: light.turn_on
|
||||||
|
data:
|
||||||
|
transition: 5
|
||||||
|
brightness_pct: 15
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
- service: light.turn_on
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
data:
|
||||||
|
brightness_pct: 25
|
||||||
|
mode: single
|
||||||
|
- id: '1628024123214'
|
||||||
|
alias: Baby Light Setting - Day
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: time
|
||||||
|
at: 07:00:00
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: zwave_js.set_config_parameter
|
||||||
|
data:
|
||||||
|
value: '100'
|
||||||
|
parameter: '5'
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
- condition: state
|
||||||
|
entity_id: light.switch_baby
|
||||||
|
state: 'on'
|
||||||
|
- service: light.turn_on
|
||||||
|
data:
|
||||||
|
transition: 5
|
||||||
|
brightness_pct: 50
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
mode: single
|
||||||
|
- id: '1628444671951'
|
||||||
|
alias: Office Window Opened
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- type: opened
|
||||||
|
platform: device
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: binary_sensor.window_office
|
||||||
|
domain: binary_sensor
|
||||||
|
condition:
|
||||||
|
- condition: time
|
||||||
|
after: '21:00'
|
||||||
|
- condition: state
|
||||||
|
entity_id: alarm_control_panel.home_alarm
|
||||||
|
state: armed_away
|
||||||
|
action:
|
||||||
|
- service: notify.mobile_app_levas_phone
|
||||||
|
data:
|
||||||
|
message: Window is opened in office
|
||||||
|
mode: single
|
||||||
|
- id: '1629309267204'
|
||||||
|
alias: On Balcony Door Open
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- type: opened
|
||||||
|
platform: device
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: binary_sensor.door_balcony
|
||||||
|
domain: binary_sensor
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: switch.turn_on
|
||||||
|
target:
|
||||||
|
area_id: balcony
|
||||||
|
data: {}
|
||||||
|
- service: light.turn_on
|
||||||
|
target:
|
||||||
|
area_id: balcony
|
||||||
|
data: {}
|
||||||
|
- repeat:
|
||||||
|
until:
|
||||||
|
- type: is_not_open
|
||||||
|
condition: device
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: binary_sensor.door_balcony
|
||||||
|
domain: binary_sensor
|
||||||
|
sequence:
|
||||||
|
- delay:
|
||||||
|
hours: 0
|
||||||
|
minutes: 5
|
||||||
|
seconds: 0
|
||||||
|
milliseconds: 0
|
||||||
|
- service: switch.turn_off
|
||||||
|
target:
|
||||||
|
device_id:
|
||||||
|
- das2qdasdasdasadaasd
|
||||||
|
- sad2q3qdewqdasdadasdas
|
||||||
|
area_id: balcony
|
||||||
|
data: {}
|
||||||
|
mode: single
|
||||||
|
- id: '1629422438707'
|
||||||
|
alias: Vita Night Light
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: time
|
||||||
|
at: input_datetime.vita_night_pump_time
|
||||||
|
condition:
|
||||||
|
- condition: and
|
||||||
|
conditions:
|
||||||
|
- condition: time
|
||||||
|
after: input_datetime.vita_night_pump_time
|
||||||
|
before: 00:00:00
|
||||||
|
- condition: time
|
||||||
|
after: 00:00:00
|
||||||
|
before: 06:00:00
|
||||||
|
action:
|
||||||
|
- service: light.turn_on
|
||||||
|
target:
|
||||||
|
entity_id: light.bulb_staircase
|
||||||
|
area_id: living_room
|
||||||
|
data:
|
||||||
|
brightness_pct: 40
|
||||||
|
transition: 15
|
||||||
|
mode: single
|
||||||
|
- id: '1634497376234'
|
||||||
|
alias: Baby Button - Long Press
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- device_id: das2qdasdasdasadaasd
|
||||||
|
domain: zha
|
||||||
|
platform: device
|
||||||
|
type: remote_button_long_press
|
||||||
|
subtype: remote_button_long_press
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: media_player.media_pause
|
||||||
|
target:
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
- type: turn_off
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: light.switch_baby
|
||||||
|
domain: light
|
||||||
|
mode: single
|
||||||
|
- id: '1635539262562'
|
||||||
|
alias: On Home Enter
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: zone
|
||||||
|
entity_id: person.ari
|
||||||
|
zone: zone.home_2
|
||||||
|
event: enter
|
||||||
|
condition:
|
||||||
|
- condition: not
|
||||||
|
conditions:
|
||||||
|
- condition: state
|
||||||
|
entity_id: alarm_control_panel.home_alarm
|
||||||
|
state: disarmed
|
||||||
|
action:
|
||||||
|
- service: alarm_control_panel.alarm_disarm
|
||||||
|
target:
|
||||||
|
entity_id: alarm_control_panel.home_alarm
|
||||||
|
data:
|
||||||
|
code: '8012'
|
||||||
|
- condition: state
|
||||||
|
entity_id: light.switch_living
|
||||||
|
state: 'off'
|
||||||
|
- wait_template: '{{ states("binary_sensor.door_main") == "on" }}'
|
||||||
|
timeout: 00:10:00
|
||||||
|
- service: light.turn_on
|
||||||
|
target:
|
||||||
|
area_id: living_room
|
||||||
|
data:
|
||||||
|
transition: 5
|
||||||
|
brightness: 255
|
||||||
|
mode: single
|
||||||
|
- id: '1636428429596'
|
||||||
|
alias: Night - On TV off
|
||||||
|
description: Auto runs things when we go to sleep
|
||||||
|
trigger:
|
||||||
|
- platform: time
|
||||||
|
at: '22:30:00'
|
||||||
|
- platform: device
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
domain: media_player
|
||||||
|
entity_id: media_player.ari_s_fire_tv
|
||||||
|
type: turned_off
|
||||||
|
- platform: device
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
domain: media_player
|
||||||
|
entity_id: media_player.living_room_firetv
|
||||||
|
type: turned_off
|
||||||
|
- platform: numeric_state
|
||||||
|
entity_id: sensor.analog_input_living_room_tv
|
||||||
|
below: '1'
|
||||||
|
condition:
|
||||||
|
- condition: time
|
||||||
|
before: 07:00:00
|
||||||
|
after: '21:00:00'
|
||||||
|
- condition: numeric_state
|
||||||
|
entity_id: sensor.analog_input_living_room_tv
|
||||||
|
below: '1'
|
||||||
|
- condition: state
|
||||||
|
entity_id: input_boolean.night_automation_ran
|
||||||
|
state: 'off'
|
||||||
|
action:
|
||||||
|
- service: switch.turn_off
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
area_id:
|
||||||
|
- dining_table
|
||||||
|
- office
|
||||||
|
- living_room
|
||||||
|
- service: light.turn_off
|
||||||
|
target:
|
||||||
|
entity_id:
|
||||||
|
- light.switch_kitchen
|
||||||
|
- light.switch_island
|
||||||
|
- light.switch_dining_chandelier
|
||||||
|
- light.switch_office_hallway
|
||||||
|
- switch.light_office
|
||||||
|
area_id:
|
||||||
|
- dining_table
|
||||||
|
- kitchen
|
||||||
|
data:
|
||||||
|
transition: 5
|
||||||
|
- service: light.turn_on
|
||||||
|
data:
|
||||||
|
transition: 10
|
||||||
|
brightness_pct: 50
|
||||||
|
target:
|
||||||
|
entity_id: light.switch_living
|
||||||
|
- service: light.turn_on
|
||||||
|
data:
|
||||||
|
brightness_pct: 47
|
||||||
|
kelvin: 4600
|
||||||
|
target:
|
||||||
|
entity_id:
|
||||||
|
- light.bulb_ari_lamp
|
||||||
|
- light.bulb_ari_lamp_philip
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
- service: input_boolean.turn_on
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: input_boolean.night_automation_ran
|
||||||
|
- wait_template: '{{ states("light.bulb_ari_lamp") == "off" }}'
|
||||||
|
- service: script.turn_all_lights_off
|
||||||
|
data: {}
|
||||||
|
mode: single
|
||||||
|
- id: '1639500650865'
|
||||||
|
alias: Main Bedroom - Closet Door - Toggle
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: state
|
||||||
|
entity_id: binary_sensor.door_main_bedroom_closet
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- choose:
|
||||||
|
- conditions:
|
||||||
|
- condition: template
|
||||||
|
value_template: '{{ trigger.to_state.attributes.contact }}'
|
||||||
|
sequence:
|
||||||
|
- service: light.turn_off
|
||||||
|
target:
|
||||||
|
entity_id:
|
||||||
|
- light.bulb_closet
|
||||||
|
default:
|
||||||
|
- service: light.turn_on
|
||||||
|
target:
|
||||||
|
entity_id:
|
||||||
|
- light.bulb_closet
|
||||||
|
data:
|
||||||
|
transition: 3
|
||||||
|
mode: single
|
||||||
|
- id: '1641617168123'
|
||||||
|
alias: Ensure On
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: device
|
||||||
|
type: turned_off
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: switch.power_washer
|
||||||
|
domain: switch
|
||||||
|
- platform: device
|
||||||
|
type: turned_off
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: switch.plug_living_room_tv
|
||||||
|
domain: switch
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- type: turn_on
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: switch.power_washer
|
||||||
|
domain: switch
|
||||||
|
- type: turn_on
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: switch.plug_living_room_tv
|
||||||
|
domain: switch
|
||||||
|
mode: single
|
||||||
|
- id: '1648071019802'
|
||||||
|
alias: 'Keep Bug Light On '
|
||||||
|
description: Keeps living room bug lamp on
|
||||||
|
trigger:
|
||||||
|
- platform: device
|
||||||
|
type: turned_off
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: switch.plug_buglamp_indoor
|
||||||
|
domain: switch
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- type: turn_on
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: switch.plug_buglamp_indoor
|
||||||
|
domain: switch
|
||||||
|
mode: single
|
||||||
|
- id: '1649426399020'
|
||||||
|
alias: Office Motion
|
||||||
|
description: Turn lights on or off when motion is detected
|
||||||
|
trigger:
|
||||||
|
- platform: state
|
||||||
|
entity_id: binary_sensor.motion_office_inv
|
||||||
|
for:
|
||||||
|
hours: 0
|
||||||
|
minutes: 0
|
||||||
|
seconds: 0
|
||||||
|
condition:
|
||||||
|
- condition: time
|
||||||
|
before: '18:00:00'
|
||||||
|
after: 06:00:00
|
||||||
|
weekday:
|
||||||
|
- mon
|
||||||
|
- tue
|
||||||
|
- wed
|
||||||
|
- thu
|
||||||
|
- fri
|
||||||
|
action:
|
||||||
|
- choose:
|
||||||
|
- conditions:
|
||||||
|
- condition: state
|
||||||
|
entity_id: binary_sensor.motion_office_inv
|
||||||
|
state: 'on'
|
||||||
|
sequence:
|
||||||
|
- type: turn_on
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: switch.light_office
|
||||||
|
domain: switch
|
||||||
|
default:
|
||||||
|
- type: turn_off
|
||||||
|
device_id: das2qdasdasdasadaasd
|
||||||
|
entity_id: switch.light_office
|
||||||
|
domain: switch
|
||||||
|
mode: single
|
||||||
|
- id: '1649432254675'
|
||||||
|
alias: Baby Light Setting
|
||||||
|
description: Controls max brightness on the baby light
|
||||||
|
trigger:
|
||||||
|
- platform: time
|
||||||
|
at: 07:00:00
|
||||||
|
- platform: time
|
||||||
|
at: '20:30:00'
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- choose:
|
||||||
|
- conditions:
|
||||||
|
- condition: time
|
||||||
|
before: 07:00:00
|
||||||
|
after: '20:30:00'
|
||||||
|
sequence:
|
||||||
|
- service: zwave_js.set_config_parameter
|
||||||
|
data:
|
||||||
|
parameter: '5'
|
||||||
|
value: '15'
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
- condition: state
|
||||||
|
entity_id: light.switch_baby
|
||||||
|
state: 'on'
|
||||||
|
- service: light.turn_on
|
||||||
|
data:
|
||||||
|
transition: 5
|
||||||
|
brightness_pct: 15
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
- service: light.turn_on
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
data:
|
||||||
|
brightness_pct: 25
|
||||||
|
default:
|
||||||
|
- service: zwave_js.set_config_parameter
|
||||||
|
data:
|
||||||
|
value: '100'
|
||||||
|
parameter: '5'
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
- condition: state
|
||||||
|
entity_id: light.switch_baby
|
||||||
|
state: 'on'
|
||||||
|
- service: light.turn_on
|
||||||
|
data:
|
||||||
|
transition: 5
|
||||||
|
brightness_pct: 50
|
||||||
|
target:
|
||||||
|
area_id: bedroom
|
||||||
|
mode: single
|
||||||
|
- id: '1649726828269'
|
||||||
|
alias: Climate Heat Mode Settings
|
||||||
|
description: Ensures that the climate is always in sync with the house settings
|
||||||
|
trigger:
|
||||||
|
- platform: state
|
||||||
|
entity_id: climate.main_floor
|
||||||
|
id: main
|
||||||
|
- platform: state
|
||||||
|
entity_id: climate.second_floor
|
||||||
|
id: second
|
||||||
|
- platform: state
|
||||||
|
entity_id: input_boolean.thermostats_house_is_heating
|
||||||
|
id: setting
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- choose:
|
||||||
|
- conditions:
|
||||||
|
- condition: template
|
||||||
|
value_template: '{{ trigger.id == "setting" }}'
|
||||||
|
sequence:
|
||||||
|
- service: climate.turn_off
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
device_id:
|
||||||
|
- das2qdasdasdasadaasd
|
||||||
|
- 32424rsafdsafsasq2341
|
||||||
|
- conditions:
|
||||||
|
- condition: state
|
||||||
|
entity_id: input_boolean.thermostats_house_is_heating
|
||||||
|
state: 'on'
|
||||||
|
sequence:
|
||||||
|
- choose:
|
||||||
|
- conditions:
|
||||||
|
- condition: and
|
||||||
|
conditions:
|
||||||
|
- condition: template
|
||||||
|
value_template: '{{ trigger.to_state.state != ''heat'' }}'
|
||||||
|
- condition: template
|
||||||
|
value_template: '{{ trigger.to_state.state != ''off'' }}'
|
||||||
|
sequence:
|
||||||
|
- service: climate.set_hvac_mode
|
||||||
|
data:
|
||||||
|
hvac_mode: heat
|
||||||
|
target:
|
||||||
|
entity_id: '{{ trigger.entity_id }}'
|
||||||
|
default:
|
||||||
|
- choose:
|
||||||
|
- conditions:
|
||||||
|
- condition: and
|
||||||
|
conditions:
|
||||||
|
- condition: template
|
||||||
|
value_template: '{{ trigger.to_state.state != ''cool'' }}'
|
||||||
|
- condition: template
|
||||||
|
value_template: '{{ trigger.to_state.state != ''off'' }}'
|
||||||
|
sequence:
|
||||||
|
- service: climate.set_hvac_mode
|
||||||
|
data:
|
||||||
|
hvac_mode: cool
|
||||||
|
target:
|
||||||
|
entity_id: '{{ trigger.entity_id }}'
|
||||||
|
mode: single
|
||||||
|
- id: '1649727810678'
|
||||||
|
alias: Climate Timing
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: time
|
||||||
|
at: 01:00:00
|
||||||
|
id: night
|
||||||
|
- platform: time
|
||||||
|
at: 06:00:00
|
||||||
|
id: day
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- choose:
|
||||||
|
- conditions:
|
||||||
|
- condition: template
|
||||||
|
value_template: '{{ trigger.id == "night" }}'
|
||||||
|
sequence:
|
||||||
|
- service: climate.turn_off
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
area_id:
|
||||||
|
- living_room
|
||||||
|
- main_bedroom
|
||||||
|
default:
|
||||||
|
- choose:
|
||||||
|
- conditions:
|
||||||
|
- condition: state
|
||||||
|
entity_id: input_boolean.thermostats_house_is_heating
|
||||||
|
state: 'on'
|
||||||
|
sequence:
|
||||||
|
- service: climate.set_hvac_mode
|
||||||
|
data:
|
||||||
|
hvac_mode: heat
|
||||||
|
target:
|
||||||
|
area_id:
|
||||||
|
- living_room
|
||||||
|
- main_bedroom
|
||||||
|
default:
|
||||||
|
- service: climate.set_hvac_mode
|
||||||
|
data:
|
||||||
|
hvac_mode: cool
|
||||||
|
target:
|
||||||
|
area_id:
|
||||||
|
- living_room
|
||||||
|
- main_bedroom
|
||||||
|
- service: climate.set_temperature
|
||||||
|
data:
|
||||||
|
temperature: 23.5
|
||||||
|
target:
|
||||||
|
area_id:
|
||||||
|
- living_room
|
||||||
|
- main_bedroom
|
||||||
|
mode: single
|
||||||
|
- id: '1649820885714'
|
||||||
|
alias: Turn off Night Auto Ran
|
||||||
|
description: ''
|
||||||
|
trigger:
|
||||||
|
- platform: time
|
||||||
|
at: 07:00:00
|
||||||
|
condition: []
|
||||||
|
action:
|
||||||
|
- service: input_boolean.turn_off
|
||||||
|
data: {}
|
||||||
|
target:
|
||||||
|
entity_id: input_boolean.night_automation_ran
|
||||||
|
mode: single
|
||||||
|
- id: '1649947692702'
|
||||||
|
alias: Bed Remote
|
||||||
|
description: ''
|
||||||
|
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: []
|
||||||
|
mode: single
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
# empty configuration file
|
||||||
|
cloud:
|
||||||
Submodule api/tests/samples/example_config_folder deleted from 2f2c69d6db.
@@ -1,7 +1,7 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
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 AutomationData, AutomationMetdata
|
from src.automations.types import AutomationData, AutomationMetdata, ExtenededAutomationData
|
||||||
from tests.utils import get_example_automation_loader
|
from tests.utils import get_example_automation_loader
|
||||||
|
|
||||||
|
|
||||||
@@ -33,8 +33,8 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 50,
|
"limit": 50,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], 31)
|
self.assertEqual(d["totalItems"], 28)
|
||||||
self.assertEqual(len(d["data"]), 31)
|
self.assertEqual(len(d["data"]), 28)
|
||||||
|
|
||||||
def test_subset1(self):
|
def test_subset1(self):
|
||||||
data = self.client.post(
|
data = self.client.post(
|
||||||
@@ -53,7 +53,7 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 10,
|
"limit": 10,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], 31)
|
self.assertEqual(d["totalItems"], 28)
|
||||||
self.assertEqual(len(d["data"]), 10)
|
self.assertEqual(len(d["data"]), 10)
|
||||||
|
|
||||||
def test_subset2(self):
|
def test_subset2(self):
|
||||||
@@ -73,25 +73,25 @@ class automation_list_tests(BaseTestCase):
|
|||||||
"limit": 10,
|
"limit": 10,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
self.assertEqual(d["totalItems"], 31)
|
self.assertEqual(d["totalItems"], 28)
|
||||||
self.assertEqual(len(d["data"]), 6)
|
self.assertEqual(len(d["data"]), 3)
|
||||||
|
|
||||||
|
|
||||||
class automation_update_tests(BaseTestCase):
|
class automation_update_tests(BaseTestCase):
|
||||||
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("/automations/list", json={"limit": 1, "offset": 0})
|
||||||
self.assertEqual(resp.json()["totalItems"], 31)
|
self.assertEqual(resp.json()["totalItems"], 28)
|
||||||
resp = self.client.post(
|
resp = self.client.post(
|
||||||
"/automations",
|
"/automations",
|
||||||
json={
|
json={
|
||||||
"index": 33,
|
"index": 29,
|
||||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
"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": 31})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 28})
|
||||||
data = resp.json()
|
data = resp.json()
|
||||||
self.assertEqual(data["totalItems"], 32)
|
self.assertEqual(data["totalItems"], 29)
|
||||||
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
|
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
|
||||||
|
|
||||||
def test_update_some(self):
|
def test_update_some(self):
|
||||||
@@ -108,13 +108,13 @@ class automation_update_tests(BaseTestCase):
|
|||||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||||
new_auto = resp.json()["data"][0]
|
new_auto = resp.json()["data"][0]
|
||||||
self.assertNotEqual(original_auto, new_auto)
|
self.assertNotEqual(original_auto, new_auto)
|
||||||
self.assertEqual(AutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto)
|
self.assertEqual(ExtenededAutomationData(metadata=AutomationMetdata(id="testme")).dict(), new_auto)
|
||||||
|
|
||||||
|
|
||||||
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})
|
||||||
self.assertEqual(resp.json()["totalItems"], 31)
|
self.assertEqual(resp.json()["totalItems"], 28)
|
||||||
resp = self.client.delete(
|
resp = self.client.delete(
|
||||||
"/automations",
|
"/automations",
|
||||||
json={
|
json={
|
||||||
@@ -123,4 +123,4 @@ class automation_delete_tests(BaseTestCase):
|
|||||||
)
|
)
|
||||||
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})
|
||||||
self.assertEqual(resp.json()["totalItems"], 30)
|
self.assertEqual(resp.json()["totalItems"], 27)
|
||||||
@@ -2,8 +2,8 @@ from unittest import TestCase
|
|||||||
from src.automations.types import (
|
from src.automations.types import (
|
||||||
AutomationActionNode,
|
AutomationActionNode,
|
||||||
AutomationConditionNode,
|
AutomationConditionNode,
|
||||||
AutomationData,
|
|
||||||
AutomationMetdata,
|
AutomationMetdata,
|
||||||
|
ExtenededAutomationData,
|
||||||
)
|
)
|
||||||
from src.automations.loader import load_automation
|
from src.automations.loader import load_automation
|
||||||
from src.yaml_serializer.types import (
|
from src.yaml_serializer.types import (
|
||||||
@@ -16,30 +16,29 @@ class loader_tests(TestCase):
|
|||||||
def test_load_automation_runs(self):
|
def test_load_automation_runs(self):
|
||||||
auto = list(
|
auto = list(
|
||||||
load_automation(
|
load_automation(
|
||||||
[
|
{
|
||||||
{
|
"id": "1616887975473",
|
||||||
"id": "1616887975473",
|
"alias": "Home Assistant Off",
|
||||||
"alias": "Home Assistant Off",
|
"description": "",
|
||||||
"description": "",
|
"trigger": [{"platform": "homeassistant", "event": "shutdown"}],
|
||||||
"trigger": [{"platform": "homeassistant", "event": "shutdown"}],
|
"condition": ["states(time.time) >= '10:00:00'"],
|
||||||
"condition": ["states(time.time) >= '10:00:00'"],
|
"action": [
|
||||||
"action": [
|
{
|
||||||
{
|
"device_id": SecretValue("my_mobile_phone", "..."),
|
||||||
"device_id": SecretValue("my_mobile_phone", "..."),
|
"domain": "mobile_app",
|
||||||
"domain": "mobile_app",
|
"type": "notify",
|
||||||
"type": "notify",
|
"title": "Hassio Status",
|
||||||
"title": "Hassio Status",
|
"message": "Hassio Is turning off...",
|
||||||
"message": "Hassio Is turning off...",
|
}
|
||||||
}
|
],
|
||||||
],
|
"mode": "single",
|
||||||
"mode": "single",
|
},
|
||||||
}
|
{}
|
||||||
]
|
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
auto[0],
|
auto[0],
|
||||||
AutomationData(
|
ExtenededAutomationData(
|
||||||
metadata=AutomationMetdata(
|
metadata=AutomationMetdata(
|
||||||
id="1616887975473",
|
id="1616887975473",
|
||||||
alias="Home Assistant Off",
|
alias="Home Assistant Off",
|
||||||
@@ -63,5 +62,6 @@ class loader_tests(TestCase):
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
tags={}
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||||
from src.automations.types import AutomationData, AutomationMetdata
|
from src.automations.types import AutomationMetdata, ExtenededAutomationData
|
||||||
from tests.utils import (
|
from tests.utils import (
|
||||||
get_dummy_automation_loader,
|
get_dummy_automation_loader,
|
||||||
get_example_automation_loader,
|
get_example_automation_loader,
|
||||||
@@ -27,7 +27,7 @@ class manager_tests(TestCase):
|
|||||||
|
|
||||||
def test_length(self):
|
def test_length(self):
|
||||||
_, _, loader = get_example_automation_loader()
|
_, _, loader = get_example_automation_loader()
|
||||||
self.assertEqual(loader.get_total_items(), 31)
|
self.assertEqual(loader.get_total_items(), 28)
|
||||||
|
|
||||||
def test_bad_automations_file(self):
|
def test_bad_automations_file(self):
|
||||||
folder, _, manager = get_dummy_automation_loader(
|
folder, _, manager = get_dummy_automation_loader(
|
||||||
@@ -43,41 +43,41 @@ class manager_tests(TestCase):
|
|||||||
[],
|
[],
|
||||||
automation_in_conifguration_mode="none",
|
automation_in_conifguration_mode="none",
|
||||||
)
|
)
|
||||||
manager.update(1, AutomationData(metadata=AutomationMetdata(id="test1")))
|
manager.update(1, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||||
auto = manager.get(0)
|
auto = manager.get(0)
|
||||||
self.assertIsNotNone(auto)
|
self.assertIsNotNone(auto)
|
||||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||||
|
|
||||||
def test_create_automation_with_example_folder(self):
|
def test_create_automation_with_example_folder(self):
|
||||||
_, _, manager = get_example_automation_loader()
|
_, _, manager = get_example_automation_loader()
|
||||||
self.assertEqual(manager.get_total_items(), 31)
|
self.assertEqual(manager.get_total_items(), 28)
|
||||||
manager.update(32, AutomationData(metadata=AutomationMetdata(id="test1")))
|
manager.update(32, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||||
auto = manager.get(31)
|
auto = manager.get(28)
|
||||||
self.assertIsNotNone(auto)
|
self.assertIsNotNone(auto)
|
||||||
self.assertEqual(manager.get_total_items(), 32)
|
self.assertEqual(manager.get_total_items(), 29)
|
||||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||||
|
|
||||||
def test_update_automation(self):
|
def test_update_automation(self):
|
||||||
_, _, manager = get_dummy_automation_loader(
|
_, _, manager = get_dummy_automation_loader(
|
||||||
[
|
[
|
||||||
AutomationData(metadata=AutomationMetdata(id="test1")),
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||||
AutomationData(metadata=AutomationMetdata(id="test2")),
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||||
AutomationData(metadata=AutomationMetdata(id="test3")),
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||||
],
|
],
|
||||||
automation_in_conifguration_mode="none",
|
automation_in_conifguration_mode="none",
|
||||||
)
|
)
|
||||||
auto = manager.get(0)
|
auto = manager.get(0)
|
||||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||||
manager.update(0, AutomationData(metadata=AutomationMetdata(id="toaster-7")))
|
manager.update(0, ExtenededAutomationData(metadata=AutomationMetdata(id="toaster-7")))
|
||||||
auto = manager.get(0)
|
auto = manager.get(0)
|
||||||
self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore
|
self.assertEqual(auto.metadata.id, "toaster-7") # type: ignore
|
||||||
|
|
||||||
def test_delete_automation(self):
|
def test_delete_automation(self):
|
||||||
_, _, manager = get_dummy_automation_loader(
|
_, _, manager = get_dummy_automation_loader(
|
||||||
[
|
[
|
||||||
AutomationData(metadata=AutomationMetdata(id="test1")),
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||||
AutomationData(metadata=AutomationMetdata(id="test2")),
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||||
AutomationData(metadata=AutomationMetdata(id="test3")),
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||||
],
|
],
|
||||||
automation_in_conifguration_mode="none",
|
automation_in_conifguration_mode="none",
|
||||||
)
|
)
|
||||||
@@ -90,9 +90,9 @@ class manager_tests(TestCase):
|
|||||||
def test_failed_deletion_automation(self):
|
def test_failed_deletion_automation(self):
|
||||||
_, _, manager = get_dummy_automation_loader(
|
_, _, manager = get_dummy_automation_loader(
|
||||||
[
|
[
|
||||||
AutomationData(metadata=AutomationMetdata(id="test1")),
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||||
AutomationData(metadata=AutomationMetdata(id="test2")),
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||||
AutomationData(metadata=AutomationMetdata(id="test3")),
|
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||||
],
|
],
|
||||||
automation_in_conifguration_mode="none",
|
automation_in_conifguration_mode="none",
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -0,0 +1,18 @@
|
|||||||
|
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
from tempfile import mktemp
|
||||||
|
from unittest import TestCase
|
||||||
|
from src.automations.tags import TagManager
|
||||||
|
|
||||||
|
class tag_tests(TestCase):
|
||||||
|
|
||||||
|
def test_load_and_save(self):
|
||||||
|
tmp_file = Path(mktemp()).with_suffix('.yml')
|
||||||
|
tags = TagManager()
|
||||||
|
tags[0] = {'Room': "Kitchen", "Type": 'Lights'}
|
||||||
|
tags[1] = {}
|
||||||
|
|
||||||
|
tags.save(tmp_file)
|
||||||
|
loaded_tags = TagManager.load(tmp_file)
|
||||||
|
assert loaded_tags.keys() == tags.keys()
|
||||||
+1
-1
@@ -11,7 +11,7 @@ from src.yaml_serializer.types import IncludedYaml
|
|||||||
|
|
||||||
THIS_FOLDER = Path(__file__).parent
|
THIS_FOLDER = Path(__file__).parent
|
||||||
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "example_config_folder"
|
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
||||||
|
|
||||||
|
|
||||||
def get_example_automation_loader() -> Tuple[Path, HassConfig, AutomationManager]:
|
def get_example_automation_loader() -> Tuple[Path, HassConfig, AutomationManager]:
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: 0.0.8
|
version: 0.0.12
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
url: "https://github.com/asosnovsky/Shortumation"
|
url: "https://github.com/asosnovsky/Shortumation"
|
||||||
description: "A homeassitant addon which provides better UI for automations & scripts."
|
description: "A homeassitant addon which provides better UI for automations & scripts."
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
0:
|
||||||
|
Type: Generic
|
||||||
|
1:
|
||||||
|
Type: Generic
|
||||||
|
2:
|
||||||
|
Type: Climate
|
||||||
|
Room: House
|
||||||
|
4: {}
|
||||||
|
3:
|
||||||
|
Type: Vent
|
||||||
|
Room: Bathroom
|
||||||
|
Floor: First
|
||||||
@@ -25,6 +25,8 @@
|
|||||||
- id: '1616888026264'
|
- id: '1616888026264'
|
||||||
alias: Home Assistant On
|
alias: Home Assistant On
|
||||||
description: ''
|
description: ''
|
||||||
|
trigger_variables:
|
||||||
|
mode: single
|
||||||
trigger:
|
trigger:
|
||||||
- platform: homeassistant
|
- platform: homeassistant
|
||||||
event: start
|
event: start
|
||||||
@@ -50,3 +52,11 @@
|
|||||||
target:
|
target:
|
||||||
entity: bear
|
entity: bear
|
||||||
data: {}
|
data: {}
|
||||||
|
- id: shortu-3
|
||||||
|
alias: Bathroom Vent
|
||||||
|
description: Turn the vent on when the humidity is high or it's smelly
|
||||||
|
trigger_variables:
|
||||||
|
mode: single
|
||||||
|
trigger: []
|
||||||
|
condition: []
|
||||||
|
action: []
|
||||||
Vendored
+1
-5
@@ -19,11 +19,7 @@
|
|||||||
"env": {
|
"env": {
|
||||||
"CI": "true"
|
"CI": "true"
|
||||||
},
|
},
|
||||||
"disableOptimisticBPs": true,
|
"disableOptimisticBPs": true
|
||||||
"jasmineExplorer.nodeArgv": [
|
|
||||||
"-r",
|
|
||||||
"ts-node/register"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Generated
-75200
File diff suppressed because it is too large.
Load diff
+14
-8
@@ -24,6 +24,7 @@
|
|||||||
"start": "react-scripts start",
|
"start": "react-scripts start",
|
||||||
"build": "react-scripts build",
|
"build": "react-scripts build",
|
||||||
"test": "react-scripts test",
|
"test": "react-scripts test",
|
||||||
|
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
||||||
"eject": "react-scripts eject",
|
"eject": "react-scripts eject",
|
||||||
"storybook": "start-storybook -p 6006 -s public",
|
"storybook": "start-storybook -p 6006 -s public",
|
||||||
"build-storybook": "build-storybook -s public"
|
"build-storybook": "build-storybook -s public"
|
||||||
@@ -57,18 +58,23 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@storybook/addon-actions": "^6.4.22",
|
||||||
|
"@storybook/addon-essentials": "^6.4.22",
|
||||||
|
"@storybook/addon-links": "^6.4.22",
|
||||||
|
"@storybook/addon-queryparams": "^6.2.9",
|
||||||
|
"@storybook/node-logger": "^6.4.22",
|
||||||
|
"@storybook/preset-create-react-app": "^3.2.0",
|
||||||
|
"@storybook/react": "^6.4.22",
|
||||||
"@testing-library/jest-dom": "^5.11.4",
|
"@testing-library/jest-dom": "^5.11.4",
|
||||||
"@testing-library/react": "^11.1.0",
|
"@testing-library/react": "^11.1.0",
|
||||||
"@testing-library/user-event": "^12.1.10",
|
"@testing-library/user-event": "^12.1.10",
|
||||||
"@storybook/addon-actions": "^6.3.12",
|
|
||||||
"@storybook/addon-essentials": "^6.3.12",
|
|
||||||
"@storybook/addon-links": "^6.3.12",
|
|
||||||
"@storybook/addon-queryparams": "^6.2.9",
|
|
||||||
"@storybook/node-logger": "^6.3.12",
|
|
||||||
"@storybook/preset-create-react-app": "^3.2.0",
|
|
||||||
"@storybook/react": "^6.3.12",
|
|
||||||
"@types/chroma-js": "^2.1.3",
|
"@types/chroma-js": "^2.1.3",
|
||||||
"@types/js-yaml": "^4.0.5",
|
"@types/js-yaml": "^4.0.5",
|
||||||
|
"jest-environment-jsdom": "^27.5.1",
|
||||||
"ts-node": "^10.4.0"
|
"ts-node": "^10.4.0"
|
||||||
}
|
},
|
||||||
|
"moduleDirectories": [
|
||||||
|
"node_modules",
|
||||||
|
"src"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
+8
-5
@@ -2,16 +2,19 @@ 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';
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const api = useConnectedApiService();
|
const api = useConnectedApiService();
|
||||||
return (
|
return (
|
||||||
<div className="app">
|
<div className="app">
|
||||||
<BrowserRouter>
|
<ErrorBoundary>
|
||||||
<Routes>
|
<BrowserRouter>
|
||||||
<Route path="*" element={<AutomationRoute api={api} />} />
|
<Routes>
|
||||||
</Routes>
|
<Route path="*" element={<AutomationRoute api={api} />} />
|
||||||
</BrowserRouter>
|
</Routes>
|
||||||
|
</BrowserRouter>
|
||||||
|
</ErrorBoundary>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,10 +5,11 @@ export interface API {
|
|||||||
}
|
}
|
||||||
export const makeRemoteAPI = (baseURL: string): API => ({
|
export const makeRemoteAPI = (baseURL: string): API => ({
|
||||||
async makeCall({
|
async makeCall({
|
||||||
path,
|
path,
|
||||||
method = "POST",
|
method = "POST",
|
||||||
data={}
|
data = {}
|
||||||
}) {
|
}) {
|
||||||
|
try {
|
||||||
const reply = await fetch(baseURL + path, {
|
const reply = await fetch(baseURL + path, {
|
||||||
method,
|
method,
|
||||||
headers: {
|
headers: {
|
||||||
@@ -30,5 +31,18 @@ export const makeRemoteAPI = (baseURL: string): API => ({
|
|||||||
console.error(response)
|
console.error(response)
|
||||||
}
|
}
|
||||||
return response
|
return response
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
let error = String(err)
|
||||||
|
|
||||||
|
if (err instanceof Error) {
|
||||||
|
error += ` ${err.stack}`
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
ok: false,
|
||||||
|
error,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
})
|
})
|
||||||
@@ -8,17 +8,18 @@ export const useAPIService = (
|
|||||||
) => {
|
) => {
|
||||||
// state
|
// state
|
||||||
const [state, setState] = useDefaultApiState();
|
const [state, setState] = useDefaultApiState();
|
||||||
const {reload, wrapCall} = makeReloadAutomations(automationAPI, state, setState);
|
const { reload, wrapCall } = makeReloadAutomations(automationAPI, state, setState);
|
||||||
|
|
||||||
|
|
||||||
// initial load of autos
|
// initial load of autos
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
reload();
|
reload();
|
||||||
|
// eslint-disable-next-line
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
state,
|
state,
|
||||||
removeAutomation: wrapCall(automationAPI.remove),
|
removeAutomation: wrapCall(automationAPI.remove),
|
||||||
updateAutomation: wrapCall(automationAPI.update),
|
updateAutomation: wrapCall(automationAPI.update),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2,13 +2,16 @@ import { AutomationData } from 'types/automations';
|
|||||||
import { makeAutomationAPI } from './automations';
|
import { makeAutomationAPI } from './automations';
|
||||||
import { makeRemoteAPI } from "./base";
|
import { makeRemoteAPI } from "./base";
|
||||||
import { useAPIService } from './core';
|
import { useAPIService } from './core';
|
||||||
import {useMockAPI} from "./mock";
|
import { useMockAPI } from "./mock";
|
||||||
|
|
||||||
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
||||||
|
console.log(process.env)
|
||||||
|
|
||||||
export const useConnectedApiService = () => useAPIService(
|
export const useConnectedApiService = () => useAPIService(
|
||||||
makeAutomationAPI(makeRemoteAPI(
|
makeAutomationAPI(makeRemoteAPI(
|
||||||
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
|
process.env.NODE_ENV === 'development' ?
|
||||||
|
"http://localhost:8000/automations" :
|
||||||
|
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
|
||||||
))
|
))
|
||||||
);
|
);
|
||||||
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
||||||
|
|||||||
@@ -1,18 +1,84 @@
|
|||||||
.automation-editor--info-box {
|
.automation-editor--info-box {
|
||||||
min-width : 25px;
|
height: 100%;
|
||||||
padding-left : 10px;
|
padding-left: 10px;
|
||||||
padding-right : 10px;
|
padding-right: 10px;
|
||||||
display : flex;
|
display: flex;
|
||||||
flex-direction : column;
|
flex-direction: column;
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
overflow : auto;
|
overflow: hidden;
|
||||||
padding-top : 5;
|
position: relative;
|
||||||
padding-bottom : 10;
|
|
||||||
position : relative;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* .automation-editor--info-box.hide {} */
|
.automation-editor--info-box-inner {
|
||||||
|
height: 100%;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box.show {
|
||||||
|
min-width: 25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box.hide {
|
||||||
|
min-width: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.hide>.automation-editor--info-box-inner {
|
.automation-editor--info-box.hide>.automation-editor--info-box-inner {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tags {
|
||||||
|
padding: 0.25em 0.75em 1em 0.75em;
|
||||||
|
border-color: var(--primary-accent);
|
||||||
|
border-width: 1px;
|
||||||
|
border-style: ridge;
|
||||||
|
border-radius: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tags>h1 {
|
||||||
|
font-size: 1.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tag {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 0.5em;
|
||||||
|
margin-bottom: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tag>div {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tag>div>input {
|
||||||
|
max-width: 5em;
|
||||||
|
padding: 1em 0.25em 0.2em 0.25em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tag>button {
|
||||||
|
height: 1.25em;
|
||||||
|
width: 1.25em;
|
||||||
|
font-size: 1em;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tag--error {
|
||||||
|
width: 100%;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tag--error.hide {
|
||||||
|
height: 0;
|
||||||
|
opacity: 0;
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tag--error.show {
|
||||||
|
height: fit-content;
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
@@ -3,29 +3,31 @@ import { useState } from "react";
|
|||||||
import { AutoInfoBox } from "./AutoInfoBox";
|
import { AutoInfoBox } from "./AutoInfoBox";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'AutomationEditor/AutoInfoBox',
|
title: 'App/AutomationList/Editor/InfoBox',
|
||||||
component: AutoInfoBox,
|
component: AutoInfoBox,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
} as ComponentMeta<typeof AutoInfoBox>;
|
} as ComponentMeta<typeof AutoInfoBox>;
|
||||||
|
|
||||||
|
|
||||||
export const Basic: ComponentStory<typeof AutoInfoBox> = args => {
|
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
||||||
const [state, setState] = useState(args.metadata)
|
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
|
||||||
return (
|
return (
|
||||||
<div className="page">
|
<div className="page">
|
||||||
<AutoInfoBox
|
<AutoInfoBox
|
||||||
className=""
|
className=""
|
||||||
metadata={state}
|
metadata={metadata}
|
||||||
onUpdate={up => {
|
tags={tags}
|
||||||
args.onUpdate(up)
|
onUpdate={(m, t) => {
|
||||||
setState(up)
|
args.onUpdate(m, t)
|
||||||
|
setState([m, t])
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Basic.args = {
|
NoTags.args = {
|
||||||
...Basic.args,
|
...NoTags.args,
|
||||||
|
tags: [],
|
||||||
metadata: {
|
metadata: {
|
||||||
id: "random",
|
id: "random",
|
||||||
alias: "Random",
|
alias: "Random",
|
||||||
@@ -34,5 +36,23 @@ Basic.args = {
|
|||||||
'wowo': '!'
|
'wowo': '!'
|
||||||
},
|
},
|
||||||
mode: 'single',
|
mode: 'single',
|
||||||
}
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({})
|
||||||
|
SomeTags.args = {
|
||||||
|
...SomeTags.args,
|
||||||
|
tags: [
|
||||||
|
["Room", "Bathroom"],
|
||||||
|
["Type", "Climate"],
|
||||||
|
],
|
||||||
|
metadata: {
|
||||||
|
id: "2432asd23",
|
||||||
|
alias: "Bathroom Vent",
|
||||||
|
description: "Turn the vent when the humidity is high",
|
||||||
|
trigger_variables: {
|
||||||
|
'wowo': '!'
|
||||||
|
},
|
||||||
|
mode: 'single',
|
||||||
|
},
|
||||||
}
|
}
|
||||||
@@ -1,28 +1,80 @@
|
|||||||
import "./AutoInfoBox.css";
|
import "./AutoInfoBox.css";
|
||||||
import { AutomationMetadata } from "types/automations";
|
import { AutomationData, AutomationMetadata } from "types/automations";
|
||||||
import InputList from "components/Inputs/InputList";
|
import InputList from "components/Inputs/InputList";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import InputTextArea from "components/Inputs/InputTextArea";
|
import InputTextArea from "components/Inputs/InputTextArea";
|
||||||
import { FC } from "react";
|
import { FC, useRef, useState } from 'react';
|
||||||
|
import { AddIcon, TrashIcon } from "components/Icons";
|
||||||
|
import { Button } from "components/Inputs/Button";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
className: string;
|
className: string;
|
||||||
metadata: AutomationMetadata;
|
metadata: AutomationMetadata;
|
||||||
onUpdate: (m: AutomationMetadata) => void;
|
tags: Array<[string, string]>;
|
||||||
|
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
||||||
}
|
}
|
||||||
export const AutoInfoBox: FC<Props> = ({
|
export const AutoInfoBox: FC<Props> = ({
|
||||||
metadata,
|
metadata,
|
||||||
|
tags,
|
||||||
onUpdate,
|
onUpdate,
|
||||||
className,
|
className,
|
||||||
children,
|
children,
|
||||||
}) => {
|
}) => {
|
||||||
|
// state
|
||||||
|
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
|
||||||
|
const [[errorIndex, error], _setError] = useState<[number | 'new', string]>([-1, ""]);
|
||||||
|
const errorTimeoutId = useRef(-1);
|
||||||
|
|
||||||
// aliases
|
// aliases
|
||||||
|
const setError = (index: number | 'new', msg: string) => {
|
||||||
|
_setError([index, msg])
|
||||||
|
if (errorTimeoutId.current >= 0) {
|
||||||
|
window.clearTimeout(errorTimeoutId.current);
|
||||||
|
}
|
||||||
|
errorTimeoutId.current = window.setTimeout(() => _setError([-1, ""]), 5000);
|
||||||
|
}
|
||||||
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
|
const onUpdateMetadata = <K extends keyof AutomationMetadata>(k: K) => (update: AutomationMetadata[K]) => onUpdate({
|
||||||
...metadata,
|
...metadata,
|
||||||
[k]: update
|
[k]: update
|
||||||
})
|
}, tags);
|
||||||
|
const validTagName = (newName: string): string | undefined => {
|
||||||
|
if (newName.length <= 0) {
|
||||||
|
return "Name must be at least 1 character long"
|
||||||
|
}
|
||||||
|
for (const [name, _] of tags) {
|
||||||
|
if (name.trim() === newName.trim()) {
|
||||||
|
return `The tag '${name}' already exists`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const updateTagName = (newName: string, tagIndex: number) => {
|
||||||
|
const error = validTagName(newName);
|
||||||
|
if (error) {
|
||||||
|
return setError(tagIndex, error)
|
||||||
|
}
|
||||||
|
onUpdate(metadata, [
|
||||||
|
...tags.slice(0, tagIndex),
|
||||||
|
[newName, tags[tagIndex][1]],
|
||||||
|
...tags.slice(tagIndex + 1),
|
||||||
|
])
|
||||||
|
}
|
||||||
|
const onUpdateTags = (tagValue: string, tagIndex: number) => onUpdate(metadata, [
|
||||||
|
...tags.slice(0, tagIndex),
|
||||||
|
[tags[tagIndex][0], tagValue],
|
||||||
|
...tags.slice(tagIndex + 1),
|
||||||
|
])
|
||||||
|
const addNewTag = () => {
|
||||||
|
const error = validTagName(newTag[0]);
|
||||||
|
if (error) {
|
||||||
|
return setError('new', error)
|
||||||
|
}
|
||||||
|
onUpdate(metadata, tags.concat([newTag]));
|
||||||
|
setNewTag(['', '']);
|
||||||
|
}
|
||||||
|
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
|
||||||
|
...tags.slice(0, tagIndex),
|
||||||
|
...tags.slice(tagIndex + 1),
|
||||||
|
])
|
||||||
// render
|
// render
|
||||||
return <div className={`automation-editor--info-box ${className}`}>
|
return <div className={`automation-editor--info-box ${className}`}>
|
||||||
<div className="automation-editor--info-box-inner">
|
<div className="automation-editor--info-box-inner">
|
||||||
@@ -40,6 +92,26 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
'restart'
|
'restart'
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
|
<div className="automation-editor--info-box--tags">
|
||||||
|
<h1>Tags</h1>
|
||||||
|
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
||||||
|
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
||||||
|
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
|
||||||
|
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
|
||||||
|
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
|
||||||
|
{error}
|
||||||
|
</span>
|
||||||
|
</div>)}
|
||||||
|
<hr />
|
||||||
|
<div className="automation-editor--info-box--tag">
|
||||||
|
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
|
||||||
|
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
|
||||||
|
<Button onClick={addNewTag} ><AddIcon /></Button>
|
||||||
|
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
|
||||||
|
{error}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
.automation-editor--info-icon {
|
.automation-editor--info-icon {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right : 10px;
|
right: 1.5em;
|
||||||
z-index : 10;
|
bottom: 0.5em;
|
||||||
|
z-index: 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box.hide>.automation-editor--info-icon {
|
.automation-editor--info-box.hide>.automation-editor--info-icon {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { useState } from 'react';
|
|||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'AutomationEditor/AutomationEditor',
|
title: 'App/AutomationList/Editor',
|
||||||
component: AutomationEditor,
|
component: AutomationEditor,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
args: {
|
args: {
|
||||||
@@ -27,7 +27,9 @@ const Template: ComponentStory<typeof AutomationEditor> = args => {
|
|||||||
<AutomationEditor
|
<AutomationEditor
|
||||||
{...args}
|
{...args}
|
||||||
automation={state}
|
automation={state}
|
||||||
onUpdate={setState}
|
onUpdate={s => {
|
||||||
|
window.setTimeout(() => setState(s), 3000)
|
||||||
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -36,6 +38,12 @@ export const Simple = Template.bind({})
|
|||||||
Simple.args = {
|
Simple.args = {
|
||||||
...Simple.args,
|
...Simple.args,
|
||||||
automation: {
|
automation: {
|
||||||
|
tags: {
|
||||||
|
"Room": "Bathroom",
|
||||||
|
"For": "Toliet",
|
||||||
|
"Type": "Smell",
|
||||||
|
"Use": "Flushing"
|
||||||
|
},
|
||||||
metadata: {
|
metadata: {
|
||||||
id: "random",
|
id: "random",
|
||||||
alias: "Random",
|
alias: "Random",
|
||||||
@@ -105,6 +113,7 @@ export const EmptyStart = Template.bind({})
|
|||||||
EmptyStart.args = {
|
EmptyStart.args = {
|
||||||
...EmptyStart.args,
|
...EmptyStart.args,
|
||||||
automation: {
|
automation: {
|
||||||
|
tags: {},
|
||||||
metadata: {
|
metadata: {
|
||||||
id: "random",
|
id: "random",
|
||||||
alias: "Random",
|
alias: "Random",
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { DAGBoardElmDims } from "components/DAGSvgs/DAGBoard";
|
import { DAGBoardElmDims } from "components/DAGSvgs/DAGBoard";
|
||||||
import { ArrowIcon } from "components/Icons";
|
import { ArrowIcon, CheckMarkIcon, ZoomIcon } from "components/Icons";
|
||||||
import { SequenceNodes } from "components/SequenceNodes";
|
import { SequenceNodes } from "components/SequenceNodes";
|
||||||
import { FC, useState } from "react";
|
import { FC, useEffect, useState } from "react";
|
||||||
import { AutomationData, AutomationSequenceNode } from "types/automations";
|
import { AutomationData, AutomationSequenceNode } from "types/automations";
|
||||||
import useWindowSize from "utils/useWindowSize";
|
import useWindowSize from "utils/useWindowSize";
|
||||||
import { AutoInfoBox } from "./AutoInfoBox";
|
import { AutoInfoBox } from "./AutoInfoBox";
|
||||||
@@ -13,6 +13,8 @@ import { AutomationTrigger } from 'types/automations/triggers';
|
|||||||
import { Modal } from "components/Modal";
|
import { Modal } from "components/Modal";
|
||||||
import { NodeEditor } from "components/NodeEditor";
|
import { NodeEditor } from "components/NodeEditor";
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
|
import { Button } from "components/Inputs/Button";
|
||||||
|
import { useAutomatioEditorState } from "./state";
|
||||||
|
|
||||||
interface TriggerEditorModalState {
|
interface TriggerEditorModalState {
|
||||||
trigger: AutomationTrigger;
|
trigger: AutomationTrigger;
|
||||||
@@ -25,29 +27,35 @@ interface Props {
|
|||||||
}
|
}
|
||||||
export const AutomationEditor: FC<Props> = ({
|
export const AutomationEditor: FC<Props> = ({
|
||||||
dims,
|
dims,
|
||||||
automation,
|
automation: propsAutos,
|
||||||
onUpdate,
|
onUpdate: propsOnUpdate,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
|
const {
|
||||||
|
state,
|
||||||
|
updateSequence,
|
||||||
|
updateTrigger,
|
||||||
|
updateMetadata,
|
||||||
|
save,
|
||||||
|
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||||
|
|
||||||
|
const [zoomLevel, setZoomLevel] = useState(40);
|
||||||
const { ratioWbh } = useWindowSize();
|
const { ratioWbh } = useWindowSize();
|
||||||
const [closeInfo, setCloseInfo] = useState(false);
|
const [closeInfo, setCloseInfo] = useState(false);
|
||||||
const [modalState, setModalState] = useState<null | TriggerEditorModalState>(null);
|
const [modalState, setModalState] = useState<null | TriggerEditorModalState>(null);
|
||||||
const { classes } = useEditorStyles({
|
const { classes } = useEditorStyles({
|
||||||
closeInfo,
|
closeInfo,
|
||||||
horizontalMode: ratioWbh < 0.75
|
horizontalMode: ratioWbh < 0.75,
|
||||||
|
autoChanged: state.status,
|
||||||
});
|
});
|
||||||
|
|
||||||
// alias
|
|
||||||
const updateSequence = (sequence: AutomationSequenceNode[]) => onUpdate({
|
|
||||||
...automation,
|
|
||||||
sequence,
|
|
||||||
});
|
|
||||||
const updateTriggers = (trigger: AutomationTrigger[]) => onUpdate({
|
|
||||||
...automation,
|
|
||||||
trigger,
|
|
||||||
});
|
|
||||||
|
|
||||||
// render
|
// render
|
||||||
|
if (state.status === 'loading') {
|
||||||
|
return <div className={classes.root}>
|
||||||
|
Loading...
|
||||||
|
</div>
|
||||||
|
}
|
||||||
return <div className={classes.root}>
|
return <div className={classes.root}>
|
||||||
<Modal open={!!modalState}>
|
<Modal open={!!modalState}>
|
||||||
{!!modalState && <NodeEditor
|
{!!modalState && <NodeEditor
|
||||||
@@ -62,8 +70,9 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
</Modal>
|
</Modal>
|
||||||
<AutoInfoBox
|
<AutoInfoBox
|
||||||
className={closeInfo ? "hide" : "show"}
|
className={closeInfo ? "hide" : "show"}
|
||||||
metadata={automation.metadata}
|
metadata={state.data.metadata}
|
||||||
onUpdate={metadata => onUpdate({ ...automation, metadata })}
|
tags={state.data.tags}
|
||||||
|
onUpdate={updateMetadata}
|
||||||
>
|
>
|
||||||
<ButtonIcon
|
<ButtonIcon
|
||||||
className={`${classes.infoIcon} automation-editor--info-icon`}
|
className={`${classes.infoIcon} automation-editor--info-icon`}
|
||||||
@@ -72,38 +81,59 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
>{ArrowIcon}</ButtonIcon>
|
>{ArrowIcon}</ButtonIcon>
|
||||||
</AutoInfoBox>
|
</AutoInfoBox>
|
||||||
|
|
||||||
<SequenceNodes
|
<div className={classes.wrapper}>
|
||||||
zoomLevel={1.5}
|
<div className={classes.toolbar}>
|
||||||
startPoint={[2, 0.5]}
|
<div style={{ display: 'flex' }}>
|
||||||
dims={dims}
|
<ZoomIcon className={classes.zoomImg} size={1} color="white" />
|
||||||
sequence={automation.sequence}
|
<input
|
||||||
onChange={updateSequence}
|
type="number"
|
||||||
additionalElements={() => chain([
|
min={1} max={100} step={1}
|
||||||
computeExtraField([1, 0.5], [2, 0.5]),
|
className={classes.zoom}
|
||||||
computeTriggerPos(
|
value={zoomLevel}
|
||||||
[0.5, 0.5],
|
onChange={z => setZoomLevel(z.target.valueAsNumber ?? 40)}
|
||||||
automation.trigger,
|
/>
|
||||||
[1.5, 0.5],
|
</div>
|
||||||
updateTriggers,
|
<Button
|
||||||
() => {
|
className={classes.saveBtn}
|
||||||
setModalState({
|
onClick={save}
|
||||||
trigger: {
|
disabled={state.status !== 'changed'}
|
||||||
$smType: "trigger",
|
>
|
||||||
platform: "device",
|
Save <CheckMarkIcon color="#bf4" />
|
||||||
device_id: "",
|
</Button>
|
||||||
domain: "",
|
</div>
|
||||||
type: "",
|
<SequenceNodes
|
||||||
subtype: ""
|
zoomLevel={zoomLevel * 200 / 100 + 50}
|
||||||
},
|
startPoint={[2, 0.5]}
|
||||||
onSave: (t) => updateTriggers([...automation.trigger, t])
|
dims={dims}
|
||||||
});
|
sequence={state.data.sequence}
|
||||||
},
|
onChange={updateSequence}
|
||||||
(trigger, onSave) => setModalState({
|
additionalElements={() => chain([
|
||||||
trigger,
|
computeExtraField([1, 0.5], [2, 0.5]),
|
||||||
onSave,
|
computeTriggerPos(
|
||||||
})
|
[0.5, 0.5],
|
||||||
),
|
state.data.trigger,
|
||||||
])}
|
[1.5, 0.5],
|
||||||
/>
|
updateTrigger,
|
||||||
|
() => {
|
||||||
|
setModalState({
|
||||||
|
trigger: {
|
||||||
|
$smType: "trigger",
|
||||||
|
platform: "device",
|
||||||
|
device_id: "",
|
||||||
|
domain: "",
|
||||||
|
type: "",
|
||||||
|
subtype: ""
|
||||||
|
},
|
||||||
|
onSave: (t) => updateTrigger([...state.data.trigger, t])
|
||||||
|
});
|
||||||
|
},
|
||||||
|
(trigger, onSave) => setModalState({
|
||||||
|
trigger,
|
||||||
|
onSave,
|
||||||
|
})
|
||||||
|
),
|
||||||
|
])}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
import { useState, useEffect } from 'react';
|
||||||
|
import { AutomationData, AutomationMetadata } from "types/automations";
|
||||||
|
|
||||||
|
|
||||||
|
export type EditorData = ReturnType<typeof genEditorData>;
|
||||||
|
export type EditorState = {
|
||||||
|
status: 'unchanged' | 'changed',
|
||||||
|
data: EditorData
|
||||||
|
} | {
|
||||||
|
status: 'loading'
|
||||||
|
}
|
||||||
|
export type EditorStatus = EditorState['status'];
|
||||||
|
|
||||||
|
export const useAutomatioEditorState = (
|
||||||
|
automation: AutomationData,
|
||||||
|
onSave: (a: AutomationData) => void,
|
||||||
|
) => {
|
||||||
|
const [state, update] = useState<EditorState>({
|
||||||
|
status: "loading",
|
||||||
|
});
|
||||||
|
|
||||||
|
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
|
||||||
|
data: D
|
||||||
|
) => state.status !== 'loading' && update({
|
||||||
|
status: 'changed',
|
||||||
|
data: {
|
||||||
|
...state.data,
|
||||||
|
[name]: data,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
update({
|
||||||
|
status: 'unchanged',
|
||||||
|
data: genEditorData(automation),
|
||||||
|
})
|
||||||
|
}, [automation]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
updateTrigger: makeUpdate('trigger'),
|
||||||
|
updateSequence: makeUpdate('sequence'),
|
||||||
|
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
|
||||||
|
if (state.status !== 'loading') {
|
||||||
|
update({
|
||||||
|
status: 'changed',
|
||||||
|
data: {
|
||||||
|
...state.data,
|
||||||
|
tags,
|
||||||
|
metadata,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
},
|
||||||
|
save: () => {
|
||||||
|
if (state.status !== 'loading') {
|
||||||
|
const data = {
|
||||||
|
...state.data,
|
||||||
|
tags: state.data.tags.reduce((all, [tagName, tagValue]) => ({
|
||||||
|
...all,
|
||||||
|
[tagName]: tagValue,
|
||||||
|
}), {})
|
||||||
|
};
|
||||||
|
update({
|
||||||
|
status: "loading",
|
||||||
|
})
|
||||||
|
onSave(data);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
get state() {
|
||||||
|
return state;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const genEditorData = (automation: AutomationData) => {
|
||||||
|
const {
|
||||||
|
metadata,
|
||||||
|
trigger,
|
||||||
|
sequence,
|
||||||
|
} = automation;
|
||||||
|
|
||||||
|
const tags: [string, string][] = Object.keys(automation.tags).map(tagName => [tagName, automation.tags[tagName]]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
metadata,
|
||||||
|
trigger,
|
||||||
|
sequence,
|
||||||
|
tags,
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,8 +4,17 @@ import { createAppUseStyles } from "styles/theme";
|
|||||||
export const useEditorStyles = createAppUseStyles<{
|
export const useEditorStyles = createAppUseStyles<{
|
||||||
closeInfo: boolean;
|
closeInfo: boolean;
|
||||||
horizontalMode: boolean;
|
horizontalMode: boolean;
|
||||||
|
autoChanged: string;
|
||||||
}>(theme => ({
|
}>(theme => ({
|
||||||
root: ({horizontalMode}) => ({
|
wrapper: {
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'column',
|
||||||
|
alignItems: "flex-end",
|
||||||
|
height: '100%',
|
||||||
|
width: '100%',
|
||||||
|
overflow: 'hidden',
|
||||||
|
},
|
||||||
|
root: ({ horizontalMode }) => ({
|
||||||
height: '100%',
|
height: '100%',
|
||||||
width: '100%',
|
width: '100%',
|
||||||
color: theme.primaryAccent,
|
color: theme.primaryAccent,
|
||||||
@@ -18,7 +27,36 @@ export const useEditorStyles = createAppUseStyles<{
|
|||||||
borderColor: theme.secondaryAccent,
|
borderColor: theme.secondaryAccent,
|
||||||
width: '100%',
|
width: '100%',
|
||||||
},
|
},
|
||||||
infoIcon: ({horizontalMode}) => ({
|
infoIcon: ({ horizontalMode }) => ({
|
||||||
bottom: horizontalMode ? '90%' : 10
|
bottom: horizontalMode ? '90%' : 10
|
||||||
})
|
}),
|
||||||
|
zoom: {
|
||||||
|
backgroundColor: theme.secondary,
|
||||||
|
color: theme.secondaryAccent,
|
||||||
|
textAlign: 'center',
|
||||||
|
maxWidth: "3em",
|
||||||
|
},
|
||||||
|
zoomImg: {
|
||||||
|
|
||||||
|
},
|
||||||
|
toolbar: {
|
||||||
|
width: "100%",
|
||||||
|
display: "flex",
|
||||||
|
flexDirection: "row",
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
alignItems: "center",
|
||||||
|
padding: "0.5em",
|
||||||
|
},
|
||||||
|
saveBtn: ({ autoChanged }) => ({
|
||||||
|
display: "flex",
|
||||||
|
opacity: autoChanged === "changed" ? 1 : 0,
|
||||||
|
height: autoChanged === "changed" ? undefined : 0,
|
||||||
|
fontSize: autoChanged === "changed" ? undefined : 0,
|
||||||
|
gap: '0.5em',
|
||||||
|
maxHeight: '1em',
|
||||||
|
justifyContent: 'center',
|
||||||
|
alignItems: 'center',
|
||||||
|
borderColor: "#bf4 !important",
|
||||||
|
color: "#bf4 !important"
|
||||||
|
}),
|
||||||
}))
|
}))
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import "styles/root.css";
|
||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutomationList } from ".";
|
import { AutomationList } from ".";
|
||||||
@@ -58,15 +59,15 @@ export const FewAutos = Template.bind({})
|
|||||||
FewAutos.args = {
|
FewAutos.args = {
|
||||||
...FewAutos.args,
|
...FewAutos.args,
|
||||||
automations: [
|
automations: [
|
||||||
createMockAuto(),
|
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
|
||||||
createMockAuto(),
|
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
|
||||||
createMockAuto(),
|
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
|
||||||
createMockAuto(),
|
createMockAuto({ "Type": "Climate" }),
|
||||||
createMockAuto(),
|
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
|
||||||
createMockAuto(),
|
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
|
||||||
createMockAuto(),
|
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
|
||||||
createMockAuto(),
|
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
||||||
createMockAuto(),
|
createMockAuto({ "Room": "Office" }),
|
||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,109 @@
|
|||||||
|
.automation-list-box {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body {
|
||||||
|
overflow: auto;
|
||||||
|
height: 100%;
|
||||||
|
flex: 1;
|
||||||
|
user-select: none;
|
||||||
|
}
|
||||||
|
.automation-list-box--body > * {
|
||||||
|
padding-top: 0.5em;
|
||||||
|
padding-bottom: 0.5em;
|
||||||
|
}
|
||||||
|
.automation-list-box--body--group {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding-left: 1em;
|
||||||
|
border-radius: 10px;
|
||||||
|
padding-bottom: 0.5em;
|
||||||
|
border-width: 1px;
|
||||||
|
border-bottom-style: solid ;
|
||||||
|
border-color: white;
|
||||||
|
}
|
||||||
|
.automation-list-box--body--group > .automation-list-box--body--group {
|
||||||
|
border-left-style: solid ;
|
||||||
|
border-top-left-radius: 0;
|
||||||
|
margin-left: 0.75em;
|
||||||
|
padding-left: 0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--group > b {
|
||||||
|
width: 100%;
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 0.1em;
|
||||||
|
}
|
||||||
|
.automation-list-box--body--group > b:hover {
|
||||||
|
background-color: var(--secondary-accent);
|
||||||
|
color: var(--secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--item:hover {
|
||||||
|
background-color: var(--primary-accent);
|
||||||
|
color: var(--primary);
|
||||||
|
}
|
||||||
|
.automation-list-box--body--item:hover > .automation-list-box--body--item--tags > span {
|
||||||
|
border-color: var(--primary);
|
||||||
|
}
|
||||||
|
.automation-list-box--body--item {
|
||||||
|
padding-left: 1em;
|
||||||
|
cursor: pointer;
|
||||||
|
display: flex;
|
||||||
|
justify-content: left;
|
||||||
|
align-items: flex-start;
|
||||||
|
gap: 1em;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
.automation-list-box--body--item::before {
|
||||||
|
content: "⊚ ";
|
||||||
|
}
|
||||||
|
.automation-list-box--body--item--title {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
padding-left: 0.25em;
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
.automation-list-box--body--item--title > b {
|
||||||
|
font-size: 1em;
|
||||||
|
}
|
||||||
|
.automation-list-box--body--item--title > span, .automation-list-box--body--item--title > b > span {
|
||||||
|
font-size: 0.75em;
|
||||||
|
}
|
||||||
|
.automation-list-box--body--item > button {
|
||||||
|
padding: 0.25em !important;
|
||||||
|
margin: 0.5em !important;
|
||||||
|
}
|
||||||
|
.automation-list-box--body--item--tags {
|
||||||
|
flex: 1;
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
font-size: 0.75em;
|
||||||
|
justify-content: left;
|
||||||
|
align-items: flex-start;
|
||||||
|
overflow: auto;
|
||||||
|
max-height: 100%;
|
||||||
|
gap: 0.25em;
|
||||||
|
}
|
||||||
|
.automation-list-box--body--item--tags > span {
|
||||||
|
border-color: var(--primary-accent);
|
||||||
|
border-style: solid;
|
||||||
|
border-width: 1px;
|
||||||
|
border-radius: 0.5em;
|
||||||
|
padding: 0.1em 0.5em;
|
||||||
|
}
|
||||||
|
.automation-list-box--bottom {
|
||||||
|
margin-top: 0.5em;
|
||||||
|
margin-bottom: 0.5em;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: space-around;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.automation-list-box--bottom > button {
|
||||||
|
background-color: #070;
|
||||||
|
color: var(--primary-accent);
|
||||||
|
padding: 0.5em 2em;
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { AutomationListBox } from "./AutomationListBox";
|
||||||
|
import { createMockAuto } from "utils/mocks";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'App/AutomationList/Box',
|
||||||
|
component: AutomationListBox,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {
|
||||||
|
}
|
||||||
|
} as ComponentMeta<typeof AutomationListBox>;
|
||||||
|
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
||||||
|
const [autos, setAutos] = useState(args.automations)
|
||||||
|
console.log({ args })
|
||||||
|
return <div className="page">
|
||||||
|
<AutomationListBox {...args} automations={autos} />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const EmptyStart = Template.bind({})
|
||||||
|
EmptyStart.args = {
|
||||||
|
...EmptyStart.args,
|
||||||
|
automations: [],
|
||||||
|
}
|
||||||
|
|
||||||
|
export const FewAutos = Template.bind({})
|
||||||
|
FewAutos.args = {
|
||||||
|
...FewAutos.args,
|
||||||
|
automations: [
|
||||||
|
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
|
||||||
|
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
|
||||||
|
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
|
||||||
|
createMockAuto({ "Type": "Climate" }),
|
||||||
|
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
|
||||||
|
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
|
||||||
|
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
|
||||||
|
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
||||||
|
createMockAuto({ "Room": "Office" }),
|
||||||
|
createMockAuto(),
|
||||||
|
],
|
||||||
|
}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
import { groupAutomations, getTagList } from './AutomationListBox';
|
||||||
|
import { AutomationData } from 'types/automations/index';
|
||||||
|
import { createMockAuto } from 'utils/mocks';
|
||||||
|
|
||||||
|
test('group automations', () => {
|
||||||
|
const automations: AutomationData[] = [
|
||||||
|
{
|
||||||
|
metadata: {
|
||||||
|
id: '1',
|
||||||
|
alias: '',
|
||||||
|
description: '',
|
||||||
|
mode: 'single',
|
||||||
|
},
|
||||||
|
tags: {
|
||||||
|
"Room": 'Living Room',
|
||||||
|
"Type": 'Lights'
|
||||||
|
},
|
||||||
|
sequence: [],
|
||||||
|
trigger: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
metadata: {
|
||||||
|
id: '2',
|
||||||
|
alias: '',
|
||||||
|
description: '',
|
||||||
|
mode: 'single',
|
||||||
|
},
|
||||||
|
tags: {
|
||||||
|
"Room": 'Living Room',
|
||||||
|
"Type": 'Climate'
|
||||||
|
},
|
||||||
|
sequence: [],
|
||||||
|
trigger: [],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
metadata: {
|
||||||
|
id: '3',
|
||||||
|
alias: '',
|
||||||
|
description: '',
|
||||||
|
mode: 'single',
|
||||||
|
},
|
||||||
|
tags: {
|
||||||
|
"Room": 'Kitchen',
|
||||||
|
"Type": 'Climate'
|
||||||
|
},
|
||||||
|
sequence: [],
|
||||||
|
trigger: [],
|
||||||
|
},
|
||||||
|
];
|
||||||
|
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
|
||||||
|
"Living Room": {
|
||||||
|
"Lights": [0],
|
||||||
|
"Climate": [1],
|
||||||
|
},
|
||||||
|
"Kitchen": {
|
||||||
|
"Climate": [2],
|
||||||
|
}
|
||||||
|
})
|
||||||
|
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
|
||||||
|
"Lights": {
|
||||||
|
"Living Room": [0],
|
||||||
|
},
|
||||||
|
"Climate": {
|
||||||
|
"Living Room": [1],
|
||||||
|
"Kitchen": [2]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
|
||||||
|
"Lights": [0],
|
||||||
|
"Climate": [1, 2]
|
||||||
|
})
|
||||||
|
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
|
||||||
|
"Living Room": [0, 1],
|
||||||
|
"Kitchen": [2]
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
|
||||||
|
0, 1, 2
|
||||||
|
])
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
test('getTagList', () => {
|
||||||
|
expect(getTagList([
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
createMockAuto(),
|
||||||
|
])).toStrictEqual([])
|
||||||
|
|
||||||
|
expect(getTagList([
|
||||||
|
createMockAuto({ "Room": "Kitchen", "Area": "Oven" }),
|
||||||
|
createMockAuto({ "Room": "Attic" }),
|
||||||
|
createMockAuto({ "Room": "Office" }),
|
||||||
|
createMockAuto({ "Area": "Balcony" }),
|
||||||
|
])).toStrictEqual(["Room", "Area"])
|
||||||
|
})
|
||||||
@@ -0,0 +1,185 @@
|
|||||||
|
import "./AutomationListBox.css";
|
||||||
|
import { FC, useState } from 'react';
|
||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||||
|
import InputText from "components/Inputs/InputText";
|
||||||
|
import { Button } from "components/Inputs/Button";
|
||||||
|
import { TrashIcon } from "components/Icons";
|
||||||
|
|
||||||
|
|
||||||
|
export type Props = {
|
||||||
|
automations: AutomationData[];
|
||||||
|
onSelectAutomation: (i: number) => void;
|
||||||
|
onRemove: (i: number) => void;
|
||||||
|
onAdd: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AutomationListBox: FC<Props> = ({
|
||||||
|
automations,
|
||||||
|
onSelectAutomation,
|
||||||
|
onAdd,
|
||||||
|
onRemove,
|
||||||
|
}) => {
|
||||||
|
|
||||||
|
const tags = getTagList(automations);
|
||||||
|
const [searchText, setSearchText] = useState('');
|
||||||
|
const [selected, setSelected] = useState<number[]>([]);
|
||||||
|
const filteredAutomations = filterAutomations(automations, searchText, selected, tags);
|
||||||
|
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selected, tags);
|
||||||
|
|
||||||
|
return <div className="automation-list-box">
|
||||||
|
<div className="automation-list-box--nav">
|
||||||
|
<InputText
|
||||||
|
label="Search"
|
||||||
|
value={searchText}
|
||||||
|
onChange={setSearchText}
|
||||||
|
/>
|
||||||
|
<InputMultiSelect
|
||||||
|
label="Tags"
|
||||||
|
selected={selected}
|
||||||
|
onChange={setSelected}
|
||||||
|
options={tags}
|
||||||
|
max={3}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="automation-list-box--body">
|
||||||
|
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove)}
|
||||||
|
</div>
|
||||||
|
<div className="automation-list-box--bottom">
|
||||||
|
<Button onClick={onAdd}>Add</Button>
|
||||||
|
<span>Showing Automations: {filteredAutomations.length} out of {automations.length}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const getTagList = (autos: AutomationData[]): string[] => Object.keys(autos
|
||||||
|
.map(a => Object.keys(a.tags))
|
||||||
|
.reduce((all: any, keys) => {
|
||||||
|
for (const k of keys) {
|
||||||
|
all[k] = 1
|
||||||
|
}
|
||||||
|
return all;
|
||||||
|
}, {}))
|
||||||
|
|
||||||
|
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
|
||||||
|
if (searchText.length > 0) {
|
||||||
|
if (
|
||||||
|
!(
|
||||||
|
a.metadata.description.toLocaleLowerCase().includes(searchText) ||
|
||||||
|
a.metadata.alias.toLocaleLowerCase().includes(searchText)
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (selected.length > 0) {
|
||||||
|
for (const i of selected) {
|
||||||
|
if (!a.tags[tags[i]]) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
export const groupAutomations = (
|
||||||
|
autos: AutomationData[],
|
||||||
|
selected: number[],
|
||||||
|
tags: string[],
|
||||||
|
) => {
|
||||||
|
if (selected.length === 0) {
|
||||||
|
return autos.map((_, i) => i);
|
||||||
|
}
|
||||||
|
const out: any = {};
|
||||||
|
for (let ai = 0; ai < autos.length; ai++) {
|
||||||
|
const a = autos[ai];
|
||||||
|
let where = out;
|
||||||
|
let tag: string = '';
|
||||||
|
let lastKey: string | null = null;
|
||||||
|
for (const i of selected) {
|
||||||
|
tag = tags[i];
|
||||||
|
if (lastKey !== null) {
|
||||||
|
where = where[lastKey]
|
||||||
|
}
|
||||||
|
if (!where[a.tags[tag]]) {
|
||||||
|
where[a.tags[tag]] = {}
|
||||||
|
}
|
||||||
|
lastKey = a.tags[tag]
|
||||||
|
}
|
||||||
|
if (lastKey !== null) {
|
||||||
|
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
|
||||||
|
where[lastKey] = []
|
||||||
|
}
|
||||||
|
where[lastKey].push(ai)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
const convertGroupsToItems = (
|
||||||
|
groups: any,
|
||||||
|
autos: Array<[AutomationData, number]>,
|
||||||
|
onSelectAutomation: (i: number) => void,
|
||||||
|
onRemove: (i: number) => void,
|
||||||
|
) => {
|
||||||
|
if (Array.isArray(groups)) {
|
||||||
|
return groups.map(i => {
|
||||||
|
const [auto, autoIndex] = autos[i];
|
||||||
|
return <div
|
||||||
|
key={i}
|
||||||
|
className="automation-list-box--body--item"
|
||||||
|
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
className="automation-list-box--body--item--title"
|
||||||
|
onClick={() => onSelectAutomation(autoIndex)}
|
||||||
|
>
|
||||||
|
<b>{auto.metadata.alias.slice(0, 15)} <span>({auto.metadata.id.slice(0, 5)})</span></b>
|
||||||
|
<span>{auto.metadata.description.slice(0, 25)}</span>
|
||||||
|
<div
|
||||||
|
className="automation-list-box--body--item--tags"
|
||||||
|
>
|
||||||
|
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
||||||
|
<b>{tagName}:</b> {auto.tags[tagName]}
|
||||||
|
</span>)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
||||||
|
</div>
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
return Object.keys(groups).map(groupName => {
|
||||||
|
return <AutomationListBoxGroup
|
||||||
|
key={groupName}
|
||||||
|
groupName={groupName}
|
||||||
|
groups={groups[groupName]}
|
||||||
|
autos={autos}
|
||||||
|
onSelectAutomation={onSelectAutomation}
|
||||||
|
onRemove={onRemove}
|
||||||
|
/>
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const AutomationListBoxGroup: FC<{
|
||||||
|
groupName: string,
|
||||||
|
groups: any,
|
||||||
|
autos: Array<[AutomationData, number]>,
|
||||||
|
onSelectAutomation: (i: number) => void,
|
||||||
|
onRemove: (i: number) => void;
|
||||||
|
}> = ({
|
||||||
|
groupName,
|
||||||
|
groups,
|
||||||
|
autos,
|
||||||
|
onSelectAutomation,
|
||||||
|
onRemove,
|
||||||
|
}) => {
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
return <div className="automation-list-box--body--group">
|
||||||
|
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
|
||||||
|
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove)}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
import { ConnectedAutmationList } from ".";
|
import { ConnectedAutomationList } from ".";
|
||||||
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants';
|
import { NODE_HEIGHT, NODE_WIDTH, ADD_HEIGHT, ADD_WIDTH, CIRCLE_SIZE, DISTANCE_FACTOR } from 'components/DAGSvgs/constants';
|
||||||
import { createMockAuto } from "utils/mocks";
|
import { createMockAuto } from "utils/mocks";
|
||||||
import { useMockApiService } from "apiService";
|
import { useMockApiService } from "apiService";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/ConnectedAutmationList',
|
title: 'App/AutomationList/Connected',
|
||||||
component: ConnectedAutmationList,
|
component: ConnectedAutomationList,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
args: {
|
args: {
|
||||||
dims: {
|
dims: {
|
||||||
@@ -19,13 +19,13 @@ export default {
|
|||||||
},
|
},
|
||||||
initialAutomations: [],
|
initialAutomations: [],
|
||||||
}
|
}
|
||||||
} as ComponentMeta<typeof ConnectedAutmationList>;
|
} as ComponentMeta<typeof ConnectedAutomationList>;
|
||||||
|
|
||||||
|
|
||||||
const Template: ComponentStory<any> = args => {
|
const Template: ComponentStory<any> = args => {
|
||||||
const api = useMockApiService(args.initialAutomations);
|
const api = useMockApiService(args.initialAutomations);
|
||||||
return <div className="page">
|
return <div className="page">
|
||||||
<ConnectedAutmationList
|
<ConnectedAutomationList
|
||||||
{...args}
|
{...args}
|
||||||
api={api}
|
api={api}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
/* root elements */
|
||||||
|
.automation-list--root {
|
||||||
|
width : 100%;
|
||||||
|
height : 100%;
|
||||||
|
display : flex;
|
||||||
|
flex-direction: row;
|
||||||
|
overflow : hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--list {
|
||||||
|
flex : 1;
|
||||||
|
min-width: 400px;
|
||||||
|
max-width: 400px;
|
||||||
|
position : relative;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--viewer {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* list children: on hide */
|
||||||
|
.automation-list--list.hide>.automation-list-box {
|
||||||
|
width: 0;
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--list.hide {
|
||||||
|
min-width: 35px;
|
||||||
|
max-width: 35px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--list.hide>.automation-list--list-hide {
|
||||||
|
transform: rotate(180deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* list children: normal */
|
||||||
|
.automation-list--list {
|
||||||
|
border-right: solid;
|
||||||
|
border-width: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--list-hide {
|
||||||
|
position: absolute;
|
||||||
|
bottom : 10px;
|
||||||
|
right : 5px;
|
||||||
|
}
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
import "./styles.css";
|
import "./index.css";
|
||||||
import { AutomationEditor } from "components/AutomationEditor";
|
import { AutomationEditor } from "components/AutomationEditor";
|
||||||
import { Button } from "components/Inputs/Button";
|
|
||||||
import { FC, useState } from "react";
|
import { FC, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { DAGBoardElmDims } from 'components/DAGSvgs/DAGBoard';
|
import { DAGBoardElmDims } from 'components/DAGSvgs/DAGBoard';
|
||||||
import { defaultAutomation } from '../../utils/defaults';
|
import { defaultAutomation } from '../../utils/defaults';
|
||||||
import { ArrowIcon, TrashIcon } from "components/Icons";
|
import { ArrowIcon } from "components/Icons";
|
||||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||||
import { ApiService } from "apiService/core";
|
import { ApiService } from "apiService/core";
|
||||||
|
import { AutomationListBox } from "./AutomationListBox";
|
||||||
|
|
||||||
|
|
||||||
interface AutomationListParams {
|
interface AutomationListParams {
|
||||||
@@ -35,21 +35,15 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
// render
|
// render
|
||||||
return <div className="automation-list--root">
|
return <div className="automation-list--root">
|
||||||
<div className={automationListListCls}>
|
<div className={automationListListCls}>
|
||||||
<div className="automation-list--list-box">
|
<AutomationListBox
|
||||||
{automations.map((auto, i) =>
|
automations={automations}
|
||||||
<div key={i} className="automation-list--elm">
|
onAdd={() => {
|
||||||
<Button onClick={() => onRemove(i)} className="automation-list--elm-remove"><TrashIcon /></Button>
|
|
||||||
<Button onClick={() => setCurrent(i)}>
|
|
||||||
{auto.metadata.alias.slice(0, 15)} <br />
|
|
||||||
<span>{auto.metadata.description.slice(0, 25)}</span>
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
<Button onClick={() => {
|
|
||||||
onAdd(defaultAutomation(`shortu-${automations.length}`));
|
onAdd(defaultAutomation(`shortu-${automations.length}`));
|
||||||
setCurrent(automations.length)
|
setCurrent(automations.length)
|
||||||
}}>Add</Button>
|
}}
|
||||||
</div>
|
onSelectAutomation={setCurrent}
|
||||||
|
onRemove={onRemove}
|
||||||
|
/>
|
||||||
<ButtonIcon
|
<ButtonIcon
|
||||||
onClick={() => setHideList(!hideList)}
|
onClick={() => setHideList(!hideList)}
|
||||||
className="automation-list--list-hide"
|
className="automation-list--list-hide"
|
||||||
@@ -68,11 +62,11 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ConnectedAutmationListParams {
|
interface ConnectedAutomationListParams {
|
||||||
dims: DAGBoardElmDims;
|
dims: DAGBoardElmDims;
|
||||||
api: ApiService;
|
api: ApiService;
|
||||||
}
|
}
|
||||||
export const ConnectedAutmationList: FC<ConnectedAutmationListParams> = ({
|
export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
||||||
api: {
|
api: {
|
||||||
state: {
|
state: {
|
||||||
automations,
|
automations,
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
/* root elements */
|
|
||||||
.automation-list--root {
|
|
||||||
width : 100%;
|
|
||||||
height : 100%;
|
|
||||||
display : flex;
|
|
||||||
flex-direction: row;
|
|
||||||
overflow : hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--list {
|
|
||||||
flex : 1;
|
|
||||||
min-width: 200px;
|
|
||||||
max-width: 200px;
|
|
||||||
position : relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--viewer {
|
|
||||||
/* flex: 6; */
|
|
||||||
min-width: 100%;
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* list children: on hide */
|
|
||||||
.automation-list--list.hide>.automation-list--list-box {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--list.hide {
|
|
||||||
min-width: 35px;
|
|
||||||
max-width: 35px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--list.hide>.automation-list--list-hide {
|
|
||||||
transform: rotate(180deg);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* list children: normal */
|
|
||||||
.automation-list--list {
|
|
||||||
border-right: solid;
|
|
||||||
border-width: 1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--list-hide {
|
|
||||||
position: absolute;
|
|
||||||
bottom : 10px;
|
|
||||||
right : 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
.automation-list--list-box {
|
|
||||||
overflow : auto;
|
|
||||||
height : 100%;
|
|
||||||
display : flex;
|
|
||||||
flex-direction : column;
|
|
||||||
justify-content: flex-start;
|
|
||||||
align-items : center;
|
|
||||||
padding-top : 10px;
|
|
||||||
margin-bottom : 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--list-box>* {
|
|
||||||
margin-bottom: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--list-box>:last-child {
|
|
||||||
background-color: #070;
|
|
||||||
color : white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--elm {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--elm>button {
|
|
||||||
padding-left : 5px;
|
|
||||||
padding-right: 5px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--elm>button>span {
|
|
||||||
font-size: 0.75em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-list--elm>.automation-list--elm-remove {
|
|
||||||
position: absolute;
|
|
||||||
left : -10px;
|
|
||||||
top : 10%;
|
|
||||||
padding : 0;
|
|
||||||
margin : 0;
|
|
||||||
}
|
|
||||||
@@ -16,25 +16,26 @@ export const SVGBoard: FC<{
|
|||||||
minGraphWidth = 300,
|
minGraphWidth = 300,
|
||||||
nodeHeight = NODE_HEIGHT,
|
nodeHeight = NODE_HEIGHT,
|
||||||
nodeWidth = NODE_WIDTH,
|
nodeWidth = NODE_WIDTH,
|
||||||
zoomLevel = 1,
|
zoomLevel = 100,
|
||||||
}) => {
|
}) => {
|
||||||
|
|
||||||
// state
|
// state
|
||||||
const { ratioWbh } = useWindowSize();
|
const { ratioWbh } = useWindowSize();
|
||||||
// alias
|
// alias
|
||||||
|
const paddedZoomLevel = zoomLevel / 100;
|
||||||
const graphWidth = Math.max(
|
const graphWidth = Math.max(
|
||||||
Math.round(graphHeight * ratioWbh),
|
Math.round(graphHeight * ratioWbh),
|
||||||
minGraphWidth
|
minGraphWidth
|
||||||
);
|
);
|
||||||
const { classes, theme } = useBoardStyles({
|
const { classes, theme } = useBoardStyles({
|
||||||
boardHeight: Math.max(nodeHeight, graphHeight) * zoomLevel,
|
boardHeight: Math.max(nodeHeight, graphHeight) * paddedZoomLevel,
|
||||||
boardWidth: Math.max(4 * nodeWidth, graphWidth) * zoomLevel,
|
boardWidth: Math.max(4 * nodeWidth, graphWidth) * paddedZoomLevel,
|
||||||
});
|
});
|
||||||
// render
|
// render
|
||||||
return <div className={classes.dag} >
|
return <div className={classes.dag} >
|
||||||
<svg
|
<svg
|
||||||
className={classes.svg}
|
className={classes.svg}
|
||||||
viewBox={[0, 0, graphWidth, graphHeight].join(" ")}
|
viewBox={[0, 0, graphWidth / paddedZoomLevel, graphHeight / paddedZoomLevel].join(" ")}
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
>
|
>
|
||||||
<defs>
|
<defs>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export default {
|
|||||||
component: DAGBoard,
|
component: DAGBoard,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
args: {
|
args: {
|
||||||
zoomLevel: 1,
|
zoomLevel: 100,
|
||||||
settings: {
|
settings: {
|
||||||
nodeHeight: NODE_HEIGHT,
|
nodeHeight: NODE_HEIGHT,
|
||||||
nodeWidth: NODE_WIDTH,
|
nodeWidth: NODE_WIDTH,
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
.error-boundary {
|
||||||
|
padding: 2em 5%;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1, h2 {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import React, { FC } from "react";
|
||||||
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
|
import { ErrorBoundary } from ".";
|
||||||
|
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'ErrorBoundary',
|
||||||
|
component: ErrorBoundary,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {
|
||||||
|
}
|
||||||
|
} as ComponentMeta<typeof ErrorBoundary>
|
||||||
|
|
||||||
|
export const ErrorThrown: ComponentStory<typeof ErrorBoundary> = args => {
|
||||||
|
const BadComponent: FC = () => {
|
||||||
|
throw new Error("!!!")
|
||||||
|
}
|
||||||
|
return <div className="page">
|
||||||
|
<ErrorBoundary>
|
||||||
|
<BadComponent />
|
||||||
|
</ErrorBoundary>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const NoError: ComponentStory<typeof ErrorBoundary> = args => {
|
||||||
|
const GoodComponent: FC = () => {
|
||||||
|
return <span>All Good.</span>
|
||||||
|
}
|
||||||
|
return <div className="page">
|
||||||
|
<ErrorBoundary>
|
||||||
|
<GoodComponent />
|
||||||
|
</ErrorBoundary>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import "./index.css";
|
||||||
|
import { Component, ErrorInfo } from "react";
|
||||||
|
|
||||||
|
type State = {
|
||||||
|
hasError: false;
|
||||||
|
} | {
|
||||||
|
hasError: true,
|
||||||
|
error: any,
|
||||||
|
errorInfo?: ErrorInfo,
|
||||||
|
}
|
||||||
|
export class ErrorBoundary extends Component<{}, State> {
|
||||||
|
|
||||||
|
state: State = {
|
||||||
|
hasError: false
|
||||||
|
}
|
||||||
|
|
||||||
|
static getDerivedStateFromError(error: any): State {
|
||||||
|
return { error, hasError: true, };
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
|
||||||
|
this.setState({
|
||||||
|
hasError: true,
|
||||||
|
error,
|
||||||
|
errorInfo,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
if (this.state.hasError) {
|
||||||
|
return <div className="error-boundary">
|
||||||
|
<h1>An Error has occured.</h1>
|
||||||
|
<h2>{String(this.state.error)}</h2>
|
||||||
|
{JSON.stringify(this.state.error, null, 4)}
|
||||||
|
<br />
|
||||||
|
{this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
|
||||||
|
<span key={i}>{s}</span><br key={`br-${i}`} />
|
||||||
|
</>)}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.props.children;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
import { ComponentStory } from "@storybook/react";
|
import { ComponentStory } from "@storybook/react";
|
||||||
|
|
||||||
import { IconBase } from "./base";
|
import { IconBase } from "./base";
|
||||||
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon } from ".";
|
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon } from ".";
|
||||||
import { AddIcon } from './index';
|
|
||||||
import { ButtonIcon } from "./ButtonIcons";
|
import { ButtonIcon } from "./ButtonIcons";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -19,6 +18,7 @@ export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
|||||||
<AddIcon {...args} />
|
<AddIcon {...args} />
|
||||||
<TrashIcon {...args} />
|
<TrashIcon {...args} />
|
||||||
<InfoIcon {...args} />
|
<InfoIcon {...args} />
|
||||||
|
<ZoomIcon {...args} />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
IconList.args = {
|
IconList.args = {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
import { IconBase, IconBaseProps } from "./base";
|
import { IconBase, IconBaseProps } from './base';
|
||||||
|
|
||||||
|
|
||||||
export const PencilIcon: FC<IconBaseProps> = props => <IconBase {...props}
|
export const PencilIcon: FC<IconBaseProps> = props => <IconBase {...props}
|
||||||
@@ -54,3 +54,14 @@ export const ArrowIcon: FC<IconBaseProps> = props => <IconBase
|
|||||||
>
|
>
|
||||||
<path d="M3 12l18-12v24z" />
|
<path d="M3 12l18-12v24z" />
|
||||||
</IconBase>
|
</IconBase>
|
||||||
|
|
||||||
|
|
||||||
|
export const ZoomIcon: FC<IconBaseProps> = props => <IconBase {...props}
|
||||||
|
svgProps={{
|
||||||
|
viewBox: "0 0 1000 1000",
|
||||||
|
x: 0,
|
||||||
|
y: 0
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<path d="M410.9,10c54.3,0,106.2,10.6,155.7,31.8c49.5,21.2,92.1,49.7,127.9,85.4c35.7,35.7,64.2,78.4,85.4,127.9c21.2,49.5,31.8,101.4,31.8,155.7c0,46.6-7.6,91.3-22.8,134c-15.2,42.7-36.8,81.4-64.9,116.2l253,252.7c8.6,8.6,12.9,19.1,12.9,31.7c0,12.8-4.2,23.4-12.7,31.8c-8.5,8.5-19.1,12.7-31.8,12.7c-12.5,0-23.1-4.3-31.7-12.9l-252.7-253c-34.8,28.1-73.6,49.7-116.2,64.9c-42.7,15.2-87.3,22.8-134,22.8c-54.3,0-106.2-10.6-155.7-31.8c-49.5-21.2-92.1-49.7-127.9-85.4C91.5,658.8,63,616.2,41.8,566.7C20.6,517.1,10,465.2,10,410.9c0-54.3,10.6-106.2,31.8-155.7s49.7-92.2,85.4-127.9s78.3-64.2,127.9-85.4S356.6,10,410.9,10L410.9,10z M410.9,99.1c-42.2,0-82.6,8.2-121.1,24.7c-38.5,16.5-71.7,38.6-99.5,66.5c-27.8,27.8-50,61-66.5,99.5c-16.5,38.5-24.7,78.9-24.7,121.1c0,42.2,8.2,82.6,24.7,121.1c16.5,38.5,38.6,71.7,66.5,99.5s61,50,99.5,66.5c38.5,16.5,78.9,24.7,121.1,24.7c42.2,0,82.6-8.2,121.1-24.7c38.5-16.5,71.7-38.6,99.5-66.5s50-61,66.5-99.5c16.5-38.5,24.7-78.9,24.7-121.1c0-42.2-8.2-82.6-24.7-121.1c-16.5-38.5-38.6-71.7-66.5-99.5c-27.8-27.8-61-50-99.5-66.5C493.5,107.3,453.2,99.1,410.9,99.1z M410.9,232.7c12.3,0,22.8,4.4,31.5,13.1c8.7,8.7,13.1,19.2,13.1,31.5v89.1h89.1c12.3,0,22.8,4.4,31.5,13.1c8.7,8.7,13.1,19.2,13.1,31.5c0,12.3-4.4,22.8-13.1,31.5c-8.7,8.7-19.2,13.1-31.5,13.1h-89.1v89.1c0,12.3-4.4,22.8-13.1,31.5c-8.7,8.7-19.2,13.1-31.5,13.1c-12.3,0-22.8-4.4-31.5-13.1c-8.7-8.7-13.1-19.2-13.1-31.5v-89.1h-89.1c-12.3,0-22.8-4.4-31.5-13.1c-8.7-8.7-13.1-19.2-13.1-31.5c0-12.3,4.4-22.8,13.1-31.5c8.7-8.7,19.2-13.1,31.5-13.1h89.1v-89.1c0-12.3,4.4-22.8,13.1-31.5C388.1,237.1,398.6,232.7,410.9,232.7z" />
|
||||||
|
</IconBase>
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { useEffect, useState } from "react";
|
||||||
|
|
||||||
|
import InputMultiSelect from "./InputMultiSelect";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Inputs/InputMultiSelect',
|
||||||
|
component: InputMultiSelect,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
} as ComponentMeta<typeof InputMultiSelect>;
|
||||||
|
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof InputMultiSelect> = args => {
|
||||||
|
|
||||||
|
const [value, setValue] = useState<number[]>(args.selected)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setValue(args.selected);
|
||||||
|
}, [args.selected])
|
||||||
|
|
||||||
|
return <div className="page">
|
||||||
|
<InputMultiSelect {...args} onChange={a => {
|
||||||
|
setValue(a);
|
||||||
|
args.onChange(a);
|
||||||
|
}} options={args.options} selected={value} />
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Simple = Template.bind({})
|
||||||
|
Simple.args = {
|
||||||
|
label: "Room Tags",
|
||||||
|
options: [
|
||||||
|
"Bears",
|
||||||
|
"Cats",
|
||||||
|
"Kitchen",
|
||||||
|
"Bathroom",
|
||||||
|
],
|
||||||
|
selected: [1],
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
import { ArrowIcon } from "components/Icons";
|
||||||
|
import { useInputMultiSelectStyles } from "./styles";
|
||||||
|
import { useState } from 'react';
|
||||||
|
|
||||||
|
|
||||||
|
export interface Props<T extends string> {
|
||||||
|
label: string;
|
||||||
|
selected: Array<number>;
|
||||||
|
options: readonly T[];
|
||||||
|
onChange: (i: Array<number>) => void;
|
||||||
|
max?: number;
|
||||||
|
id?: string;
|
||||||
|
className?: string;
|
||||||
|
}
|
||||||
|
export default function InputMultiSelect<T extends string>({
|
||||||
|
selected = [], options, onChange, label, max,
|
||||||
|
}: Props<T>) {
|
||||||
|
// state
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
|
||||||
|
// alias
|
||||||
|
const maxedOut = max ? selected.length >= max : false;
|
||||||
|
const toggle = () => setOpen(!open);
|
||||||
|
|
||||||
|
// style
|
||||||
|
const { classes } = useInputMultiSelectStyles({
|
||||||
|
open,
|
||||||
|
selected,
|
||||||
|
maxedOut,
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
return <div className={classes.root}>
|
||||||
|
<div className={classes.input} onClick={toggle}>
|
||||||
|
<label>{label}</label>
|
||||||
|
<span className={classes.numberSelected}>{selected.length}</span>
|
||||||
|
<ArrowIcon color="white" className={classes.arrow} />
|
||||||
|
<div className={classes.optionsWrapper}>
|
||||||
|
{options.map((v, i) => {
|
||||||
|
const selectedCount = selected.indexOf(i);
|
||||||
|
const isSelected = selectedCount > -1;
|
||||||
|
return <div
|
||||||
|
key={i}
|
||||||
|
title={(maxedOut && !isSelected) ? `Maximum allowed to select is ${max}.` : isSelected ? `Unselect ${v}` : `Select ${v}`}
|
||||||
|
className={[classes.option, isSelected ? 'selected' : 'unselected'].join(' ')}
|
||||||
|
onClick={() => {
|
||||||
|
if (!isSelected) {
|
||||||
|
if (!maxedOut) {
|
||||||
|
onChange([...selected, i])
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
onChange(
|
||||||
|
selected.slice(0, selectedCount).concat(selected.slice(selectedCount + 1))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<span>{v}</span>
|
||||||
|
<span>{selectedCount}</span>
|
||||||
|
</div>
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
@@ -6,22 +6,38 @@ export interface Props {
|
|||||||
label: string;
|
label: string;
|
||||||
value: number | undefined;
|
value: number | undefined;
|
||||||
onChange: (v: number | undefined) => void;
|
onChange: (v: number | undefined) => void;
|
||||||
|
className?: string;
|
||||||
|
min?: number,
|
||||||
|
max?: number,
|
||||||
|
step?: number,
|
||||||
}
|
}
|
||||||
export default function InputNumber({
|
export default function InputNumber({
|
||||||
label,
|
label,
|
||||||
value = undefined,
|
value = undefined,
|
||||||
onChange,
|
onChange,
|
||||||
|
className = "",
|
||||||
|
min, max, step,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
const { classes } = useInputNumberStyles({});
|
const { classes } = useInputNumberStyles({});
|
||||||
return <InputWrapper label={label} labelSize={value !== undefined ? 'small' : 'normal'}>
|
return <InputWrapper className={className} label={label} labelSize={value !== undefined ? 'small' : 'normal'}>
|
||||||
<input
|
<input
|
||||||
className={classes.input}
|
className={classes.input}
|
||||||
type="number"
|
type="number"
|
||||||
value={value ?? ""}
|
value={value ?? ""}
|
||||||
onChange={e => {
|
onChange={e => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
onChange(Number(e.target.value))
|
let v = Number(e.target.value);
|
||||||
|
if (max) {
|
||||||
|
v = Math.min(v, max)
|
||||||
|
}
|
||||||
|
if (min) {
|
||||||
|
v = Math.max(v, min)
|
||||||
|
}
|
||||||
|
onChange(v)
|
||||||
}}
|
}}
|
||||||
|
step={step}
|
||||||
|
min={min}
|
||||||
|
max={max}
|
||||||
/>
|
/>
|
||||||
{value && <button className={classes.deleteIcon} onClick={() => onChange(undefined)}>X</button>}
|
{value && <button className={classes.deleteIcon} onClick={() => onChange(undefined)}>X</button>}
|
||||||
</InputWrapper>
|
</InputWrapper>
|
||||||
|
|||||||
@@ -9,9 +9,7 @@ const commonInputStyle = (theme: AppTheme) => ({
|
|||||||
borderStyle: 'solid',
|
borderStyle: 'solid',
|
||||||
borderWidth: 1,
|
borderWidth: 1,
|
||||||
borderRadius: 5,
|
borderRadius: 5,
|
||||||
padding: 15,
|
padding: '1em',
|
||||||
marginLeft: 5,
|
|
||||||
marginRight: 5,
|
|
||||||
fontSize: 16,
|
fontSize: 16,
|
||||||
|
|
||||||
"&:hover": {
|
"&:hover": {
|
||||||
@@ -29,8 +27,8 @@ const commonInputStyle = (theme: AppTheme) => ({
|
|||||||
export const useButtonStyles = createAppUseStyles<{}>(theme => ({
|
export const useButtonStyles = createAppUseStyles<{}>(theme => ({
|
||||||
input: {
|
input: {
|
||||||
...commonInputStyle(theme).input,
|
...commonInputStyle(theme).input,
|
||||||
paddingTop: '2%',
|
paddingTop: '1em',
|
||||||
paddingBottom: '2%',
|
paddingBottom: '1em',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
@@ -44,8 +42,8 @@ export const useInputWrapperStyles = createAppUseStyles<{
|
|||||||
position: 'relative',
|
position: 'relative',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'column',
|
flexDirection: 'column',
|
||||||
marginTop: noMargin ? 0 : 10,
|
marginTop: noMargin ? 0 : '0.5em',
|
||||||
marginBottom: noMargin ? 0 : '0.25em',
|
marginBottom: noMargin ? 0 : '0.5em',
|
||||||
}),
|
}),
|
||||||
label: ({ labelSize }) => ({
|
label: ({ labelSize }) => ({
|
||||||
fontSize: labelSize === 'normal' ? 16 : 10,
|
fontSize: labelSize === 'normal' ? 16 : 10,
|
||||||
@@ -97,8 +95,8 @@ export const useInputNumberStyles = createAppUseStyles<{}>(theme => {
|
|||||||
},
|
},
|
||||||
deleteIcon: {
|
deleteIcon: {
|
||||||
position: "absolute",
|
position: "absolute",
|
||||||
left: 30,
|
left: "1em",
|
||||||
top: 17,
|
top: "1.5em",
|
||||||
color: theme.secondaryAccent,
|
color: theme.secondaryAccent,
|
||||||
backgroundColor: theme.secondary,
|
backgroundColor: theme.secondary,
|
||||||
borderWidth: 1,
|
borderWidth: 1,
|
||||||
@@ -124,6 +122,95 @@ export const useInputListStyles = createAppUseStyles<{}>(theme => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const useInputMultiSelectStyles = createAppUseStyles<{
|
||||||
|
open: boolean;
|
||||||
|
selected: number[];
|
||||||
|
maxedOut: boolean;
|
||||||
|
}>(theme => {
|
||||||
|
const styles = commonInputStyle(theme);
|
||||||
|
return {
|
||||||
|
root: {
|
||||||
|
},
|
||||||
|
input: {
|
||||||
|
...styles.input,
|
||||||
|
position: 'relative',
|
||||||
|
cursor: 'pointer',
|
||||||
|
display: 'flex',
|
||||||
|
gap: '1em',
|
||||||
|
|
||||||
|
"&> label": {
|
||||||
|
cursor: 'pointer',
|
||||||
|
userSelect: 'none',
|
||||||
|
},
|
||||||
|
"&:hover": {
|
||||||
|
color: theme.primaryAccent,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
numberSelected: (({ selected }) => ({
|
||||||
|
display: selected.length > 0 ? 'block' : 'none',
|
||||||
|
background: theme.primary,
|
||||||
|
borderColor: theme.primaryAccent,
|
||||||
|
borderStyle: 'solid',
|
||||||
|
borderWidth: '1px',
|
||||||
|
borderRadius: '60%',
|
||||||
|
padding: '0em 0.4em'
|
||||||
|
})),
|
||||||
|
optionsWrapper: (({ open }) => ({
|
||||||
|
background: theme.primary,
|
||||||
|
borderColor: theme.primaryAccent,
|
||||||
|
borderStyle: "solid",
|
||||||
|
borderWidth: 1,
|
||||||
|
position: 'absolute',
|
||||||
|
display: open ? 'flex' : 'none',
|
||||||
|
flexDirection: 'column',
|
||||||
|
gap: '0.25em',
|
||||||
|
left: '0',
|
||||||
|
top: 'calc(100% + 0.25em)',
|
||||||
|
userSelect: 'none',
|
||||||
|
overflow: 'hidden',
|
||||||
|
width: "100%",
|
||||||
|
zIndex: 10,
|
||||||
|
})),
|
||||||
|
arrow: (({ open }) => ({
|
||||||
|
position: 'absolute',
|
||||||
|
right: '1em',
|
||||||
|
top: '1em',
|
||||||
|
transform: open ? 'rotate(90deg)' : 'rotate(270deg)',
|
||||||
|
})),
|
||||||
|
option: (({ maxedOut }) => ({
|
||||||
|
display: 'flex',
|
||||||
|
flexDirection: 'row',
|
||||||
|
gap: '0.25em',
|
||||||
|
width: '100%',
|
||||||
|
padding: '0.25em 0.5em',
|
||||||
|
|
||||||
|
'&.unselected span:nth-child(2)': {
|
||||||
|
display: 'none'
|
||||||
|
},
|
||||||
|
'&.selected span:nth-child(2)': {
|
||||||
|
background: theme.primary,
|
||||||
|
borderColor: theme.primaryAccent,
|
||||||
|
borderStyle: 'solid',
|
||||||
|
borderWidth: '1px',
|
||||||
|
borderRadius: '40%',
|
||||||
|
padding: '0em 0.4em'
|
||||||
|
},
|
||||||
|
|
||||||
|
'&.unselected': {
|
||||||
|
cursor: maxedOut ? 'not-allowed' : 'pointer',
|
||||||
|
},
|
||||||
|
'&.selected': {
|
||||||
|
cursor: 'pointer',
|
||||||
|
},
|
||||||
|
|
||||||
|
"&:hover": {
|
||||||
|
color: theme.secondary,
|
||||||
|
backgroundColor: theme.secondaryAccent,
|
||||||
|
}
|
||||||
|
})),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
export const useInputTextAreaStyles = createAppUseStyles<{ resizable: boolean }>(theme => {
|
export const useInputTextAreaStyles = createAppUseStyles<{ resizable: boolean }>(theme => {
|
||||||
const styles = commonInputStyle(theme);
|
const styles = commonInputStyle(theme);
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ import { OptionManager } from './OptionManager';
|
|||||||
import { AutomationTriggerState } from 'types/automations/triggers';
|
import { AutomationTriggerState } from 'types/automations/triggers';
|
||||||
import InputText from 'components/Inputs/InputText';
|
import InputText from 'components/Inputs/InputText';
|
||||||
import { InputEntity } from 'components/Inputs/InputTextBubble';
|
import { InputEntity } from 'components/Inputs/InputTextBubble';
|
||||||
import InputNumber from 'components/Inputs/InputNumber';
|
|
||||||
import InputTextArea from 'components/Inputs/InputTextArea';
|
|
||||||
import InputTime from 'components/Inputs/InputTime';
|
import InputTime from 'components/Inputs/InputTime';
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
import { OptionManager } from './OptionManager';
|
import { OptionManager } from './OptionManager';
|
||||||
import { AutomationTriggerTemplate } from 'types/automations/triggers';
|
import { AutomationTriggerTemplate } from 'types/automations/triggers';
|
||||||
import InputText from 'components/Inputs/InputText';
|
import InputText from 'components/Inputs/InputText';
|
||||||
import { InputEntity } from 'components/Inputs/InputTextBubble';
|
|
||||||
import InputNumber from 'components/Inputs/InputNumber';
|
|
||||||
import InputTextArea from 'components/Inputs/InputTextArea';
|
|
||||||
import InputTime from 'components/Inputs/InputTime';
|
import InputTime from 'components/Inputs/InputTime';
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,6 @@
|
|||||||
import { OptionManager } from './OptionManager';
|
import { OptionManager } from './OptionManager';
|
||||||
import { AutomationTriggerTimePattern } from 'types/automations/triggers';
|
import { AutomationTriggerTimePattern } from 'types/automations/triggers';
|
||||||
import InputText from 'components/Inputs/InputText';
|
import InputText from 'components/Inputs/InputText';
|
||||||
import { InputEntity } from 'components/Inputs/InputTextBubble';
|
|
||||||
import InputNumber from 'components/Inputs/InputNumber';
|
|
||||||
import InputTextArea from 'components/Inputs/InputTextArea';
|
|
||||||
import InputTime from 'components/Inputs/InputTime';
|
|
||||||
|
|
||||||
|
|
||||||
export const TriggerTimePattern: OptionManager<AutomationTriggerTimePattern> = {
|
export const TriggerTimePattern: OptionManager<AutomationTriggerTimePattern> = {
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ export default {
|
|||||||
component: SequenceNodes,
|
component: SequenceNodes,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
args: {
|
args: {
|
||||||
zoomLevel: 1.5,
|
zoomLevel: 100,
|
||||||
startPoint: [0.5, 0.5],
|
startPoint: [0.5, 0.5],
|
||||||
dims: {
|
dims: {
|
||||||
nodeHeight: NODE_HEIGHT,
|
nodeHeight: NODE_HEIGHT,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { ApiService } from 'apiService/core';
|
import { ApiService } from 'apiService/core';
|
||||||
import { ConnectedAutmationList } from "components/AutomationList";
|
import { ConnectedAutomationList } from "components/AutomationList";
|
||||||
import { DEFAULT_DIMS } from "components/DAGSvgs/constants";
|
import { DEFAULT_DIMS } from "components/DAGSvgs/constants";
|
||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
|
|
||||||
@@ -12,7 +12,7 @@ export const AutomationRoute: FC<{ api: ApiService }> = ({
|
|||||||
|
|
||||||
|
|
||||||
return <div className="page">
|
return <div className="page">
|
||||||
<ConnectedAutmationList
|
<ConnectedAutomationList
|
||||||
dims={DEFAULT_DIMS}
|
dims={DEFAULT_DIMS}
|
||||||
api={api}
|
api={api}
|
||||||
/>
|
/>
|
||||||
|
|||||||
+14
-13
@@ -1,24 +1,25 @@
|
|||||||
:root {
|
:root {
|
||||||
--primary : #111111;
|
--primary: #111111;
|
||||||
--secondary : #1c1c1c;
|
--secondary: #1c1c1c;
|
||||||
--primary-accent : #bbbbbb;
|
--primary-accent: #bbbbbb;
|
||||||
--secondary-accent: #929191;
|
--secondary-accent: #929191;
|
||||||
touch-action : pan-x pan-y;
|
--error: #c55;
|
||||||
height : 100%;
|
touch-action: pan-x pan-y;
|
||||||
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
html,
|
html,
|
||||||
body,
|
body,
|
||||||
#root {
|
#root {
|
||||||
margin : 0 !important;
|
margin: 0 !important;
|
||||||
padding : 0 !important;
|
padding: 0 !important;
|
||||||
height : 100vh;
|
height: 100vh;
|
||||||
width : 100vw;
|
width: 100vw;
|
||||||
overflow : hidden !important;
|
overflow: hidden !important;
|
||||||
font-family : Tahoma, Geneva, sans-serif;
|
font-family: Tahoma, Geneva, sans-serif;
|
||||||
display : flex !important;
|
display: flex !important;
|
||||||
align-items : center;
|
align-items: center;
|
||||||
justify-items: center;
|
justify-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,22 +4,23 @@ import { AutomationTrigger, TriggerType } from "./triggers";
|
|||||||
|
|
||||||
|
|
||||||
export interface AutomationMetadata {
|
export interface AutomationMetadata {
|
||||||
id: string;
|
id: string;
|
||||||
alias: string;
|
alias: string;
|
||||||
description: string;
|
description: string;
|
||||||
trigger_variables?: Record<string, string>;
|
trigger_variables?: Record<string, string>;
|
||||||
mode: "single" | "restart" | "queued" | "parallel";
|
mode: "single" | "restart" | "queued" | "parallel";
|
||||||
}
|
}
|
||||||
export interface AutomationData {
|
export interface AutomationData {
|
||||||
metadata: AutomationMetadata;
|
metadata: AutomationMetadata;
|
||||||
trigger: AutomationTrigger[];
|
trigger: AutomationTrigger[];
|
||||||
sequence: AutomationSequenceNode[];
|
sequence: AutomationSequenceNode[];
|
||||||
|
tags: Record<string, string>;
|
||||||
}
|
}
|
||||||
export type AutomationSequenceNode = AutomationAction | AutomationCondition;
|
export type AutomationSequenceNode = AutomationAction | AutomationCondition;
|
||||||
export type AutomationNodeMapping = {
|
export type AutomationNodeMapping = {
|
||||||
"trigger": AutomationTrigger;
|
"trigger": AutomationTrigger;
|
||||||
"action": AutomationAction;
|
"action": AutomationAction;
|
||||||
"condition": AutomationCondition;
|
"condition": AutomationCondition;
|
||||||
}
|
}
|
||||||
export type AutomationNodeTypes = keyof AutomationNodeMapping | undefined;
|
export type AutomationNodeTypes = keyof AutomationNodeMapping | undefined;
|
||||||
export type AutomationNode<N extends AutomationNodeTypes = any> =
|
export type AutomationNode<N extends AutomationNodeTypes = any> =
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ export const defaultAutomation = (id: string): AutomationData => ({
|
|||||||
description: "",
|
description: "",
|
||||||
mode: "single",
|
mode: "single",
|
||||||
},
|
},
|
||||||
|
tags: {},
|
||||||
trigger: [],
|
trigger: [],
|
||||||
sequence: [],
|
sequence: [],
|
||||||
})
|
})
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
import { AutomationData } from 'types/automations';
|
import { AutomationData } from 'types/automations';
|
||||||
|
|
||||||
|
|
||||||
export const createMockAuto = (): AutomationData => ({
|
export const createMockAuto = (tags: Record<string, string> = {}): AutomationData => ({
|
||||||
metadata: {
|
metadata: {
|
||||||
id: "random",
|
id: Math.random().toString(36).slice(2, 15),
|
||||||
alias: "Random",
|
alias: "Random",
|
||||||
description: "Example Metadata",
|
description: "Example Metadata",
|
||||||
trigger_variables: {
|
trigger_variables: {
|
||||||
@@ -11,6 +11,7 @@ export const createMockAuto = (): AutomationData => ({
|
|||||||
},
|
},
|
||||||
mode: 'single',
|
mode: 'single',
|
||||||
},
|
},
|
||||||
|
tags,
|
||||||
trigger: [
|
trigger: [
|
||||||
{
|
{
|
||||||
"$smType": undefined,
|
"$smType": undefined,
|
||||||
|
|||||||
+13271
-12996
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user