Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
67f5358f45 | ||
|
|
c40e441f33 | ||
|
|
a3ee13e8e3 | ||
|
|
a3fa409eda | ||
|
|
7ac7d60468 | ||
|
|
cb34db3c86 | ||
|
|
ea8697137a | ||
|
|
e9246a5b6c | ||
|
|
d121082d4f | ||
|
|
2605978b43 | ||
|
|
f5b21be26d | ||
|
|
582859b35b | ||
|
|
184734ee70 | ||
|
|
3a44057a40 | ||
|
|
ef02abe0cb | ||
|
|
1d52993253 | ||
|
|
50031c4868 | ||
|
|
b3dae6fea7 | ||
|
|
fd35938fcb | ||
|
|
649ee0f31e | ||
|
|
e7110dc97b | ||
|
|
dcf577f84c | ||
|
|
fabb5612d5 | ||
|
|
2958fa49f8 | ||
|
|
211f5d8be7 | ||
|
|
3dac905fda | ||
|
|
75d70b1133 | ||
|
|
47b0c89589 | ||
|
|
212349b4c0 | ||
|
|
a4789cf43e | ||
|
|
395a9d955e | ||
|
|
937a3f97c4 | ||
|
|
6bb18563b4 | ||
|
|
2a9ba678d3 | ||
|
|
38e362a469 | ||
|
|
b56b5fc184 | ||
|
|
1cce2d20f4 | ||
|
|
717fada35e | ||
|
|
ca4be32d63 | ||
|
|
ad4c1f66f2 | ||
|
|
4af6b1688a | ||
|
|
045ce75362 | ||
|
|
442a49da8b | ||
|
|
8e859ff191 | ||
|
|
3b1b88b404 | ||
|
|
8306686e4c | ||
|
|
6d67dd129c | ||
|
|
5086ecd993 | ||
|
|
bbb87ebf9e | ||
|
|
a1ca9d62b7 | ||
|
|
0e4e4783fa | ||
|
|
1719148c58 | ||
|
|
2ea96973ad | ||
|
|
a35e8e127f | ||
|
|
46a67b1395 | ||
|
|
6b465219a9 | ||
|
|
e769a8e798 | ||
|
|
d8a2dd53d5 |
No files matched your search
@@ -1,5 +1,4 @@
|
||||
webapp/node_modules
|
||||
webapp/build
|
||||
webapp/.storybook
|
||||
webapp/.vscode
|
||||
webapp/.env.local
|
||||
|
||||
@@ -1,18 +1,53 @@
|
||||
name: "Manual Build"
|
||||
name: Build
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
type: string
|
||||
description: "Version Number"
|
||||
required: true
|
||||
push:
|
||||
branch: [main]
|
||||
jobs:
|
||||
build:
|
||||
metadata:
|
||||
runs-on: ubuntu-latest
|
||||
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
|
||||
name: Metadata
|
||||
outputs:
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
steps:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- name: Get Version
|
||||
id: version
|
||||
shell: bash
|
||||
run: |
|
||||
if [ -z "${INPUT_VERSION}" ]; then
|
||||
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
|
||||
else
|
||||
echo ::set-output name=VERSION::${INPUT_VERSION}
|
||||
fi
|
||||
env:
|
||||
INPUT_VERSION: ${{ github.event.inputs.version }}
|
||||
- name: ${{ steps.version.outputs.VERSION }}
|
||||
shell: bash
|
||||
run: |
|
||||
echo ${{ steps.version.outputs.VERSION }}
|
||||
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
name: Build & Publish ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||
if: github.event_name != 'pull_request'
|
||||
needs:
|
||||
- metadata
|
||||
strategy:
|
||||
matrix:
|
||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||
arch:
|
||||
- "aarch64"
|
||||
- "amd64"
|
||||
- "armhf"
|
||||
- "armv7"
|
||||
- "i386"
|
||||
|
||||
steps:
|
||||
- name: Cancel Previous Runs
|
||||
@@ -24,16 +59,51 @@ jobs:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Setup node
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16
|
||||
cache: "yarn"
|
||||
cache-dependency-path: webapp/yarn.lock
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.0.0
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Build & Push to Dockerhub
|
||||
- name: "Save version number"
|
||||
run: echo "REACT_APP_BUILD_VERSION=${{ needs.metadata.outputs.version }}" > ./webapp/.env.production
|
||||
|
||||
- name: "Build Web"
|
||||
run: cd webapp && yarn install && yarn build
|
||||
|
||||
- name: ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||
uses: home-assistant/builder@2022.07.0
|
||||
with:
|
||||
args: |
|
||||
--${{ matrix.arch }} \
|
||||
--version ${{ github.event.inputs.version }} \
|
||||
--no-latest \
|
||||
--version ${{ needs.metadata.outputs.version }} \
|
||||
--target .
|
||||
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
if: "${{ github.event.inputs.version != '' }}"
|
||||
needs:
|
||||
- metadata
|
||||
- deploy
|
||||
name: Publish Github Release
|
||||
steps:
|
||||
- name: Publish Release ${{ needs.metadata.outputs.version }}
|
||||
uses: actions/github-script@v6
|
||||
env:
|
||||
VERSION: ${{ needs.metadata.outputs.version }}
|
||||
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
|
||||
with:
|
||||
script: |
|
||||
github.rest.repos.createRelease({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
tag_name: process.env.VERSION,
|
||||
});
|
||||
@@ -1,76 +0,0 @@
|
||||
# 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: Cancel Previous Runs
|
||||
uses: styfle/cancel-workflow-action@0.10.0
|
||||
with:
|
||||
all_but_latest: true
|
||||
access_token: ${{ github.token }}
|
||||
|
||||
- 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
|
||||
@@ -1,46 +0,0 @@
|
||||
name: Deploy
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branch: [main]
|
||||
paths:
|
||||
- "config.yaml"
|
||||
jobs:
|
||||
metadata:
|
||||
runs-on: ubuntu-latest
|
||||
name: Metadata
|
||||
outputs:
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
|
||||
steps:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Get Version
|
||||
id: version
|
||||
shell: bash
|
||||
run: |
|
||||
echo ::set-output name=VERSION::$(cat config.yaml | sed -nr 's/version: (.*)/\1/p')
|
||||
- name: Get Changelog
|
||||
id: changlelog
|
||||
shell: bash
|
||||
run: |
|
||||
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
|
||||
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- metadata
|
||||
name: Publish Github Release
|
||||
steps:
|
||||
- name: Publish Release ${{ needs.metadata.outputs.version }}
|
||||
uses: actions/github-script@v6
|
||||
env:
|
||||
VERSION: ${{ needs.metadata.outputs.version }}
|
||||
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
|
||||
with:
|
||||
script: |
|
||||
github.rest.repos.createRelease({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
tag_name: process.env.VERSION,
|
||||
});
|
||||
@@ -0,0 +1,44 @@
|
||||
name: Test Release
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
type: string
|
||||
description: "Version Number"
|
||||
jobs:
|
||||
release:
|
||||
runs-on: ubuntu-latest
|
||||
name: Publish Github Release
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: "${{ github.event.inputs.version }}"
|
||||
uses: actions/github-script@v6
|
||||
env:
|
||||
VERSION: "${{ github.event.inputs.version }}"
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
script: |
|
||||
github.rest.repos.createRelease({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
tag_name: process.env.VERSION,
|
||||
});
|
||||
pre:
|
||||
runs-on: ubuntu-latest
|
||||
name: Publish Github PreRelease
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: "${{ github.event.inputs.version }}"
|
||||
uses: actions/github-script@v6
|
||||
env:
|
||||
VERSION: pre-${{ github.event.inputs.version }}
|
||||
with:
|
||||
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
script: |
|
||||
github.rest.repos.createRelease({
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
tag_name: process.env.VERSION,
|
||||
});
|
||||
@@ -1,10 +1,13 @@
|
||||
name: Tests
|
||||
name: Commit Tests
|
||||
on:
|
||||
push:
|
||||
branch:
|
||||
branch:
|
||||
- main
|
||||
paths:
|
||||
- "webapp"
|
||||
- "api"
|
||||
pull_request:
|
||||
branch:
|
||||
branch:
|
||||
- main
|
||||
jobs:
|
||||
metadata:
|
||||
@@ -72,40 +75,3 @@ jobs:
|
||||
run: cd webapp && yarn install
|
||||
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||
run: cd webapp && yarn ${{ matrix.action }}
|
||||
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
name: Build & Publish ${{ matrix.arch }}
|
||||
if: github.event_name != 'pull_request'
|
||||
needs:
|
||||
- metadata
|
||||
- nodejs
|
||||
- python
|
||||
strategy:
|
||||
matrix:
|
||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||
|
||||
steps:
|
||||
- name: Cancel Previous Runs
|
||||
uses: styfle/cancel-workflow-action@0.10.0
|
||||
with:
|
||||
all_but_latest: true
|
||||
access_token: ${{ github.token }}
|
||||
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.0.0
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||
uses: home-assistant/builder@2022.07.0
|
||||
with:
|
||||
args: |
|
||||
--${{ matrix.arch }} \
|
||||
--no-latest \
|
||||
--version ${{ needs.metadata.outputs.version }} \
|
||||
--target .
|
||||
@@ -1 +1,2 @@
|
||||
.vscode/*.log
|
||||
webapp/src/types/validators/index.test.ts
|
||||
+16
-3
@@ -1,10 +1,24 @@
|
||||
# Changelog 
|
||||
|
||||
## [0.3.2] - Fixed Addon Image for arm-based devices
|
||||
|
||||
- Using hypercon instead of uvicorn (this losses the rust dependency which makes it easier to install on arm)
|
||||
- Pre-building web assets outside of docker (this takes the image size down and speeds up instaltion of addon)
|
||||
- Updated build scripts to actually fail installation when build/prep steps fail
|
||||
- Ensured that builds for all architecture run successfully
|
||||
- Re-worked github actions (quicker test phases)
|
||||
|
||||
## [0.3.1] - Increased Pagination + Restricted Repeat Node
|
||||
|
||||
- Increased pagination to display up to 10,000 autos for now
|
||||
- Repeat node now has types
|
||||
|
||||
## [0.3.0] - Complete Refactor of Graphs
|
||||
|
||||
- Added visual support for
|
||||
* Repeat Nodes
|
||||
* Parallel Nodes
|
||||
|
||||
- Repeat Nodes
|
||||
- Parallel Nodes
|
||||
|
||||
- Using collections for conditions & triggers
|
||||
- Fixed several bugs with improper alerts
|
||||
@@ -17,7 +31,6 @@
|
||||
|
||||

|
||||
|
||||
|
||||
## [0.1.22] - Many Visual improvements
|
||||
|
||||
- Deprecated several custom components in favor of mui.com
|
||||
|
||||
+7
-14
@@ -1,8 +1,8 @@
|
||||
# <--- Pre-Build Args -->
|
||||
ARG BUILD_ARCH
|
||||
|
||||
# <--- Image Setup -->
|
||||
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
||||
# <--- Main Image -->
|
||||
FROM python:3.9.13-slim-buster
|
||||
WORKDIR /app
|
||||
|
||||
# <--- Post-Build Args -->
|
||||
@@ -13,11 +13,8 @@ ENV BUILD_VERSION $BUILD_VERSION
|
||||
|
||||
# <--- System Wide Dependencies -->
|
||||
ENV LANG C.UTF-8
|
||||
RUN apk add --no-cache \
|
||||
nodejs \
|
||||
npm \
|
||||
build-base \
|
||||
python3-dev
|
||||
RUN apt-get update -y && \
|
||||
apt-get install -y gcc git build-essential libtool automake curl
|
||||
|
||||
# <--- Scripts -->
|
||||
COPY docker/bin /app/bin
|
||||
@@ -28,16 +25,12 @@ RUN /app/bin/prep.sh
|
||||
# <--- Python Dependencies -->
|
||||
COPY api/setup.py /app/setup.py
|
||||
|
||||
# <--- Webapp Build -->
|
||||
COPY webapp/ /app/web-builder
|
||||
RUN cd /app/web-builder && \
|
||||
echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
|
||||
|
||||
# <--- BUILD -->
|
||||
RUN /app/bin/build.sh /app /app/web-builder
|
||||
RUN /app/bin/build.sh /app
|
||||
|
||||
# <--- Api Code -->
|
||||
COPY api/src /app/src
|
||||
COPY webapp/build /app/web
|
||||
|
||||
# <--- Ports -->
|
||||
EXPOSE 8000
|
||||
@@ -45,7 +38,7 @@ EXPOSE 8000
|
||||
# <--- Final -->
|
||||
LABEL \
|
||||
io.hass.type="addon" \
|
||||
io.hass.arch="armhf|aarch64|i386|amd64"
|
||||
io.hass.arch="armhf|aarch64|i386|amd64|armv7"
|
||||
|
||||
ENTRYPOINT [ "/app/bin/run.sh" ]
|
||||
CMD [ "/app" ]
|
||||
|
||||
@@ -15,9 +15,11 @@ build-with-builder:
|
||||
-t /data
|
||||
|
||||
build:
|
||||
cd webapp && yarn build
|
||||
$(DC) build
|
||||
|
||||
build-no-cache:
|
||||
cd webapp && yarn buil
|
||||
$(DC) build --no-cache
|
||||
|
||||
push:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Shortumation 
|
||||
|
||||
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
||||

|
||||
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml) [](https://github.com/asosnovsky/Shortumation/actions/workflows/build.yml)
|
||||
|
||||
| | Stable | Edge
|
||||
| --- | --- | ---
|
||||
| Version |  | 
|
||||
@@ -73,7 +73,7 @@ If this warning does not scare you or you still want to try things out, then tak
|
||||
|
||||
**How is this different from Node-Red?**
|
||||
|
||||
> Node-Red is both an execution engine and an automation editor, which means that in order for you automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
||||
> Node-Red is both an execution engine and an automation editor, which means that in order for your automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
||||
|
||||
**Which HA Installation does this support?**
|
||||
|
||||
|
||||
+1
-1
@@ -43,4 +43,4 @@ clean:
|
||||
run-local:
|
||||
rm -f web
|
||||
ln -s ../webapp/build web
|
||||
USE_EXAMPLE_REPO=1 $(VENV_BIN)/uvicorn src.app:app --reload
|
||||
USE_EXAMPLE_REPO=1 $(VENV_BIN)/hypercorn src.app:app --reload
|
||||
+2
-1
@@ -7,8 +7,9 @@ setuptools.setup(
|
||||
"PyYAML==6.0",
|
||||
"fastapi==0.78.0",
|
||||
"pydantic==1.9.1",
|
||||
"uvicorn[standard]==0.18.2",
|
||||
"hypercorn==0.13.2",
|
||||
"python-decouple==3.6",
|
||||
"websockets==10.3"
|
||||
],
|
||||
extras_require={
|
||||
"dev": [
|
||||
|
||||
@@ -5,6 +5,7 @@ from src.api.types import (
|
||||
ListData,
|
||||
ListParams,
|
||||
UpdateAutoRequest,
|
||||
UpdateTags,
|
||||
)
|
||||
from src.automations.errors import FailedDeletion
|
||||
from src.automations.manager import AutomationManager
|
||||
@@ -29,6 +30,10 @@ def make_automation_router(automations: AutomationManager) -> APIRouter:
|
||||
def upsert_auto(body: UpdateAutoRequest):
|
||||
automations.update(body.index, body.data)
|
||||
|
||||
@router.post("/item/tags")
|
||||
def update_tags(body: UpdateTags):
|
||||
automations.update_tags(body.automation_id, body.tags)
|
||||
|
||||
@router.delete("/item")
|
||||
def delete_auto(body: DeleteAutoRequest):
|
||||
try:
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from typing import Generic, List, TypeVar
|
||||
from typing import Dict, Generic, List, TypeVar
|
||||
|
||||
from pydantic import BaseModel
|
||||
from pydantic.fields import Field
|
||||
@@ -25,5 +25,10 @@ class UpdateAutoRequest(BaseModel):
|
||||
data: ExtenededAutomationData
|
||||
|
||||
|
||||
class UpdateTags(BaseModel):
|
||||
automation_id: str = Field(description="Automation Id to update")
|
||||
tags: Dict[str, str]
|
||||
|
||||
|
||||
class DeleteAutoRequest(BaseModel):
|
||||
index: int = Field(description="Index of the automation to update")
|
||||
@@ -1,4 +1,4 @@
|
||||
from typing import Iterator, List, Optional
|
||||
from typing import Dict, Iterator, List, Optional
|
||||
|
||||
from src.automations.errors import FailedDeletion, InvalidAutomationFile
|
||||
from src.automations.types import AutomationData, ExtenededAutomationData
|
||||
@@ -24,7 +24,7 @@ class AutomationManager:
|
||||
break
|
||||
yield from load_automation(auto, tags.get(auto.get("id", ""), {}))
|
||||
|
||||
def get(self, index: int) -> Optional[AutomationData]:
|
||||
def get(self, index: int) -> Optional[ExtenededAutomationData]:
|
||||
tags = self.hass_config.automation_tags
|
||||
if index >= 0:
|
||||
for i, auto in enumerate(self.hass_config.automations):
|
||||
@@ -51,6 +51,11 @@ class AutomationManager:
|
||||
self.hass_config.save_automations(automations)
|
||||
self.hass_config.save_tags(tags)
|
||||
|
||||
def update_tags(self, auto_id: str, tags: Dict[str, str]):
|
||||
autos_tags = self.hass_config.automation_tags
|
||||
autos_tags[auto_id] = tags
|
||||
self.hass_config.save_tags(autos_tags)
|
||||
|
||||
def delete(self, index: int):
|
||||
automations: List[dict] = []
|
||||
deleted = False
|
||||
|
||||
@@ -10,9 +10,12 @@ def find_hass_config() -> HassConfig:
|
||||
"""Try to find HASS config."""
|
||||
if config("USE_EXAMPLE_REPO", False, cast=bool):
|
||||
print("using USE_EXAMPLE_REPO")
|
||||
from tests.utils import create_copy_of_example_config
|
||||
from tests.utils import (
|
||||
HA_CONFIG3_EXAMPLE,
|
||||
create_copy_of_example_config,
|
||||
)
|
||||
|
||||
path = create_copy_of_example_config()
|
||||
path = create_copy_of_example_config(HA_CONFIG3_EXAMPLE)
|
||||
print("|-> ", path)
|
||||
return HassConfig(path)
|
||||
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
'1616887975473':
|
||||
Type: HA
|
||||
'1616888026264':
|
||||
Type: HA
|
||||
'1619371298367':
|
||||
Room: Living
|
||||
Type: Button
|
||||
'1620239986670':
|
||||
Room: Kitchen
|
||||
Type: Button
|
||||
'1620324780561':
|
||||
Room: Kitchen
|
||||
Type: Button
|
||||
'1621352850204':
|
||||
Room: Kitchen
|
||||
Type: Button
|
||||
'1622210698281':
|
||||
Room: Kitchen
|
||||
Type: Button
|
||||
'1622769811245':
|
||||
Room: Living
|
||||
Type: Button
|
||||
'1623430479201':
|
||||
Room: Baby
|
||||
Type: Button
|
||||
'1623642118976':
|
||||
Room: Baby
|
||||
Type: Button
|
||||
'1624640900951':
|
||||
Room: Baby
|
||||
Type: Button
|
||||
'1628024070687':
|
||||
Room: Baby
|
||||
Type: Routine
|
||||
'1628024123214':
|
||||
Room: Baby
|
||||
Type: Routine
|
||||
'1628444671951':
|
||||
Room: Office
|
||||
Type: Window
|
||||
'1629309267204':
|
||||
Room: Balcony
|
||||
Type: Door
|
||||
'1629422438707':
|
||||
Type: Routine
|
||||
'1634497376234':
|
||||
Room: Baby
|
||||
Type: Button
|
||||
'1635539262562':
|
||||
Type: Routine
|
||||
'1636428429596':
|
||||
Type: Routine
|
||||
'1639500650865':
|
||||
Room: Bedroom
|
||||
Type: Door
|
||||
'1641617168123':
|
||||
Type: Ensure Power
|
||||
'1648071019802':
|
||||
Type: Ensure Power
|
||||
'1649426399020':
|
||||
Room: Office
|
||||
Type: Motion
|
||||
'1649432254675':
|
||||
Room: Baby
|
||||
Type: Routine
|
||||
'1649726828269':
|
||||
Climate: Heat
|
||||
Type: Climate
|
||||
'1649727810678':
|
||||
Climate: Time
|
||||
Type: Climate
|
||||
'1649820885714':
|
||||
Type: Routine
|
||||
'1649947692702':
|
||||
BadOne: true
|
||||
Room: Bedroom
|
||||
Type: Button
|
||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,2 @@
|
||||
# empty configuration file
|
||||
cloud:
|
||||
@@ -100,3 +100,16 @@ class manager_tests(TestCase):
|
||||
self.assertEqual(manager.get_total_items(), 3)
|
||||
with self.assertRaises(FailedDeletion):
|
||||
manager.delete(10)
|
||||
|
||||
def test_save_tags(self):
|
||||
_, _, manager = get_dummy_automation_loader(
|
||||
[
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test1")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test2")),
|
||||
ExtenededAutomationData(metadata=AutomationMetdata(id="test3")),
|
||||
],
|
||||
automation_in_conifguration_mode="none",
|
||||
)
|
||||
manager.update_tags("test1", {"room": "bathroom"})
|
||||
auto = manager.get(0)
|
||||
assert auto.tags == {"room": "bathroom"}
|
||||
@@ -13,6 +13,7 @@ THIS_FOLDER = Path(__file__).parent
|
||||
SAMPLES_FOLDER = THIS_FOLDER / "samples"
|
||||
HA_CONFIG_EXAMPLE = SAMPLES_FOLDER / "config"
|
||||
HA_CONFIG2_EXAMPLE = SAMPLES_FOLDER / "config-2"
|
||||
HA_CONFIG3_EXAMPLE = SAMPLES_FOLDER / "config-3"
|
||||
|
||||
|
||||
def get_example_automation_loader(
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
name: Shortumation
|
||||
version: v0.3.0
|
||||
version: v0.3.2
|
||||
slug: shortumation
|
||||
image: asosnovsky/shortumation-{arch}
|
||||
url: "https://github.com/asosnovsky/Shortumation"
|
||||
|
||||
+4
-8
@@ -2,7 +2,7 @@
|
||||
set -e
|
||||
|
||||
api_location=${1}
|
||||
web_location=${2}
|
||||
# web_location=${2}
|
||||
|
||||
function install_yarn() {
|
||||
pushd $web_location
|
||||
@@ -18,11 +18,7 @@ function install_py() {
|
||||
popd
|
||||
}
|
||||
|
||||
declare -i err=0 werr=0
|
||||
install_py &
|
||||
install_yarn &
|
||||
while wait -fn || werr=$?; ((werr != 127)); do
|
||||
err=$werr
|
||||
done
|
||||
install_py
|
||||
# install_yarn
|
||||
|
||||
echo "DONE BUILD"
|
||||
echo "DONE BUILD"
|
||||
+7
-8
@@ -2,18 +2,17 @@
|
||||
set -e
|
||||
|
||||
function prep_yarn() {
|
||||
curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
|
||||
ln -s /usr/bin/nodejs /usr/bin/node
|
||||
bash n lts
|
||||
npm i -g yarn
|
||||
}
|
||||
|
||||
function prep_py() {
|
||||
pip install -U wheel setuptools pip
|
||||
pip install -U wheel setuptools pip Cython
|
||||
}
|
||||
|
||||
declare -i err=0 werr=0
|
||||
prep_py &
|
||||
prep_yarn &
|
||||
while wait -fn || werr=$?; ((werr != 127)); do
|
||||
err=$werr
|
||||
done
|
||||
prep_py
|
||||
# prep_yarn
|
||||
|
||||
echo "DONE PREP"
|
||||
echo "DONE PREP"
|
||||
+1
-1
@@ -7,4 +7,4 @@ echo "--------------------"
|
||||
echo "BUILD_VERSION = "$BUILD_VERSION
|
||||
echo $(python --version)
|
||||
echo "--------------------"
|
||||
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
|
||||
python -m hypercorn src.app:app -b "0.0.0.0:8000"
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
"@mui/styles": "5.8.6",
|
||||
"@types/jest": "28.1.5",
|
||||
"@types/node": "17.0.36",
|
||||
"@types/react": "18.0.14",
|
||||
"@types/react": "18.0.15",
|
||||
"@types/react-dom": "18.0.6",
|
||||
"@types/ws": "8.5.3",
|
||||
"@uiw/react-codemirror": "4.10.4",
|
||||
|
||||
@@ -1,27 +1,46 @@
|
||||
import { AutomationData } from "types/automations";
|
||||
import { API } from "./base";
|
||||
import { ListData, ListParams } from "./types";
|
||||
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||
|
||||
import {
|
||||
AUTOMTAION_LIST,
|
||||
AUTOMTAION_ITEM,
|
||||
AUTOMTAION_ITEM_TAGS,
|
||||
} from "./paths";
|
||||
|
||||
export const makeAutomationAPI = (api: API) => ({
|
||||
async list({ offset, limit }: ListParams) {
|
||||
const data = await api.makeCall<ListData<AutomationData>, ListParams>({
|
||||
path: AUTOMTAION_LIST,
|
||||
data: {
|
||||
offset, limit,
|
||||
}
|
||||
offset,
|
||||
limit,
|
||||
},
|
||||
});
|
||||
return data;
|
||||
},
|
||||
async update({ index, auto }: { index: number, auto: AutomationData }) {
|
||||
async update({ index, auto }: { index: number; auto: AutomationData }) {
|
||||
return await api.makeCall({
|
||||
path: AUTOMTAION_ITEM,
|
||||
data: {
|
||||
index,
|
||||
data: auto
|
||||
data: auto,
|
||||
},
|
||||
})
|
||||
});
|
||||
},
|
||||
async updateTags({
|
||||
automation_id,
|
||||
tags,
|
||||
}: {
|
||||
automation_id: string;
|
||||
tags: Record<string, string>;
|
||||
}) {
|
||||
return await api.makeCall({
|
||||
path: AUTOMTAION_ITEM_TAGS,
|
||||
data: {
|
||||
automation_id,
|
||||
tags,
|
||||
},
|
||||
});
|
||||
},
|
||||
async remove({ index }: { index: number }) {
|
||||
return await api.makeCall({
|
||||
@@ -29,10 +48,9 @@ export const makeAutomationAPI = (api: API) => ({
|
||||
path: AUTOMTAION_ITEM,
|
||||
data: {
|
||||
index,
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
});
|
||||
},
|
||||
});
|
||||
|
||||
|
||||
export type AutomationAPI = ReturnType<typeof makeAutomationAPI>;
|
||||
@@ -1,15 +1,16 @@
|
||||
import { useEffect } from 'react';
|
||||
import { useDefaultApiState, makeReloadAutomations } from './util';
|
||||
import { AutomationAPI } from './automations';
|
||||
import { useEffect } from "react";
|
||||
import { useDefaultApiState, makeReloadAutomations } from "./util";
|
||||
import { AutomationAPI } from "./automations";
|
||||
|
||||
export type ApiService = ReturnType<typeof useAPIService>;
|
||||
export const useAPIService = (
|
||||
automationAPI: AutomationAPI
|
||||
) => {
|
||||
export const useAPIService = (automationAPI: AutomationAPI) => {
|
||||
// state
|
||||
const [state, setState] = useDefaultApiState();
|
||||
const { reload, wrapCall } = makeReloadAutomations(automationAPI, state, setState);
|
||||
|
||||
const { reload, wrapCall } = makeReloadAutomations(
|
||||
automationAPI,
|
||||
state,
|
||||
setState
|
||||
);
|
||||
|
||||
// initial load of autos
|
||||
useEffect(() => {
|
||||
@@ -21,5 +22,6 @@ export const useAPIService = (
|
||||
state,
|
||||
removeAutomation: wrapCall(automationAPI.remove),
|
||||
updateAutomation: wrapCall(automationAPI.update),
|
||||
}
|
||||
}
|
||||
updateTags: wrapCall(automationAPI.updateTags),
|
||||
};
|
||||
};
|
||||
@@ -1,57 +1,93 @@
|
||||
import { useMockAPI } from "./mock"
|
||||
import { useMockAPI } from "./mock";
|
||||
import { makeAutomationAPI } from "./automations";
|
||||
import { createMockAuto } from '../utils/mocks';
|
||||
import { createMockAuto } from "../utils/mocks";
|
||||
import { AutomationData } from "types/automations";
|
||||
|
||||
const fakeUseRef = (a: any) => ({ current: a });
|
||||
|
||||
test('mock api uses initial autos for initial population -- empty', async () => {
|
||||
test("mock api uses initial autos for initial population -- empty", async () => {
|
||||
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
||||
const data = await mockApi.list({ limit: 10, offset: 0 });
|
||||
expect(data.ok).toBe(true);
|
||||
expect((data as any).data.data).toHaveLength(0);
|
||||
expect((data as any).data.totalItems).toBe(0);
|
||||
})
|
||||
});
|
||||
|
||||
test('mock api uses initial autos for initial population -- some data', async () => {
|
||||
const initials = [
|
||||
createMockAuto(),
|
||||
createMockAuto()
|
||||
];
|
||||
test("mock api uses initial autos for initial population -- some data", async () => {
|
||||
const initials = [createMockAuto(), createMockAuto()];
|
||||
const mockApi = makeAutomationAPI(useMockAPI(initials, fakeUseRef as any));
|
||||
const data = await mockApi.list({ limit: 10, offset: 0 });
|
||||
expect(data.ok).toBe(true);
|
||||
expect((data as any).data.data).toHaveLength(2);
|
||||
expect((data as any).data.totalItems).toBe(2);
|
||||
})
|
||||
});
|
||||
|
||||
test('populate mock api with some data', async () => {
|
||||
test("populate mock api with some data", async () => {
|
||||
const mockApi = makeAutomationAPI(useMockAPI([], fakeUseRef as any));
|
||||
await mockApi.update({index: 0, auto: createMockAuto()})
|
||||
await mockApi.update({ index: 0, auto: createMockAuto() });
|
||||
let data = await mockApi.list({ limit: 10, offset: 0 });
|
||||
expect(data.ok).toBe(true);
|
||||
expect((data as any).data.data).toHaveLength(1);
|
||||
expect((data as any).data.totalItems).toBe(1);
|
||||
await mockApi.update({index: 1, auto: createMockAuto()})
|
||||
await mockApi.update({ index: 1, auto: createMockAuto() });
|
||||
data = await mockApi.list({ limit: 10, offset: 0 });
|
||||
expect((data as any).data.data).toHaveLength(2);
|
||||
expect((data as any).data.totalItems).toBe(2);
|
||||
})
|
||||
});
|
||||
|
||||
test('delete/update data from mock api', async () => {
|
||||
const mockApi = makeAutomationAPI(useMockAPI([
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
], fakeUseRef as any));
|
||||
let data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
|
||||
test("delete/update data from mock api", async () => {
|
||||
const mockApi = makeAutomationAPI(
|
||||
useMockAPI(
|
||||
[
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
],
|
||||
fakeUseRef as any
|
||||
)
|
||||
);
|
||||
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||
const toBeEdited = data[0];
|
||||
toBeEdited.metadata.alias = "Bob is my uncle";
|
||||
await mockApi.update({index: 0, auto: toBeEdited})
|
||||
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
|
||||
await mockApi.update({ index: 0, auto: toBeEdited });
|
||||
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||
expect(data[0].metadata.alias).toEqual("Bob is my uncle");
|
||||
await mockApi.remove({index: 0})
|
||||
data = (await mockApi.list({ limit: 10, offset: 0 }) as any).data.data;
|
||||
await mockApi.remove({ index: 0 });
|
||||
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data.data;
|
||||
expect(data[0].metadata.alias === "Bob is my uncle").toEqual(false);
|
||||
})
|
||||
});
|
||||
|
||||
test("update tags from mock api", async () => {
|
||||
const mockApi = makeAutomationAPI(
|
||||
useMockAPI(
|
||||
[
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
createMockAuto(),
|
||||
],
|
||||
fakeUseRef as any
|
||||
)
|
||||
);
|
||||
let data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
|
||||
.data as AutomationData[];
|
||||
const autoId = data[0].metadata.id;
|
||||
expect(data[0].tags).toStrictEqual({});
|
||||
mockApi.updateTags({
|
||||
automation_id: autoId,
|
||||
tags: {
|
||||
room: "bathroom",
|
||||
type: "popup",
|
||||
},
|
||||
});
|
||||
data = ((await mockApi.list({ limit: 10, offset: 0 })) as any).data
|
||||
.data as AutomationData[];
|
||||
expect(data[0].metadata.id).toEqual(autoId);
|
||||
expect(data[0].tags).toStrictEqual({
|
||||
room: "bathroom",
|
||||
type: "popup",
|
||||
});
|
||||
});
|
||||
@@ -1,33 +1,34 @@
|
||||
import { useRef } from 'react';
|
||||
import { AutomationData } from 'types/automations';
|
||||
import { API } from './base';
|
||||
import { AUTOMTAION_LIST, AUTOMTAION_ITEM } from './paths';
|
||||
|
||||
import { useRef } from "react";
|
||||
import { AutomationData } from "types/automations";
|
||||
import { API } from "./base";
|
||||
import {
|
||||
AUTOMTAION_LIST,
|
||||
AUTOMTAION_ITEM,
|
||||
AUTOMTAION_ITEM_TAGS,
|
||||
} from "./paths";
|
||||
|
||||
export const useMockAPI = (
|
||||
initialAutos: AutomationData[] = [],
|
||||
makeRef = useRef,
|
||||
makeRef = useRef
|
||||
): API => {
|
||||
const automationsRef = makeRef(initialAutos);
|
||||
return {
|
||||
async makeCall({
|
||||
path,
|
||||
method = "POST",
|
||||
data = {}
|
||||
}) {
|
||||
async makeCall({ path, method = "POST", data = {} }) {
|
||||
// console.debug("[[mockCall]]", method, path, data);
|
||||
if (path === AUTOMTAION_LIST) {
|
||||
return {
|
||||
ok: true,
|
||||
data: JSON.parse(JSON.stringify({
|
||||
totalItems: automationsRef.current.length,
|
||||
params: { offset: 0, limit: 100 },
|
||||
data: automationsRef.current,
|
||||
}))
|
||||
} as any
|
||||
data: JSON.parse(
|
||||
JSON.stringify({
|
||||
totalItems: automationsRef.current.length,
|
||||
params: { offset: 0, limit: 100 },
|
||||
data: automationsRef.current,
|
||||
})
|
||||
),
|
||||
} as any;
|
||||
}
|
||||
if (path === AUTOMTAION_ITEM) {
|
||||
if (method === 'POST') {
|
||||
if (method === "POST") {
|
||||
const { index, data: auto } = data as any;
|
||||
if (index >= automationsRef.current.length) {
|
||||
automationsRef.current = [...automationsRef.current, auto];
|
||||
@@ -35,29 +36,45 @@ export const useMockAPI = (
|
||||
automationsRef.current = [
|
||||
...automationsRef.current.slice(0, index),
|
||||
auto,
|
||||
...automationsRef.current.slice(index + 1)
|
||||
...automationsRef.current.slice(index + 1),
|
||||
];
|
||||
}
|
||||
return {
|
||||
ok: true,
|
||||
data: {}
|
||||
}
|
||||
data: {},
|
||||
};
|
||||
} else if (method === "DELETE") {
|
||||
const { index } = data as any;
|
||||
automationsRef.current = [
|
||||
...automationsRef.current.slice(0, index),
|
||||
...automationsRef.current.slice(index + 1)
|
||||
...automationsRef.current.slice(index + 1),
|
||||
];
|
||||
return {
|
||||
ok: true,
|
||||
data: {}
|
||||
data: {},
|
||||
};
|
||||
}
|
||||
}
|
||||
if (path === AUTOMTAION_ITEM_TAGS) {
|
||||
if (method === "POST") {
|
||||
const { automation_id, tags } = data as any;
|
||||
for (let i = 0; i < automationsRef.current.length; i++) {
|
||||
const auto = automationsRef.current[i];
|
||||
if (auto.metadata.id === automation_id) {
|
||||
automationsRef.current[i].tags = JSON.parse(JSON.stringify(tags));
|
||||
break;
|
||||
}
|
||||
}
|
||||
return {
|
||||
ok: true,
|
||||
data: {},
|
||||
};
|
||||
}
|
||||
}
|
||||
return {
|
||||
ok: false,
|
||||
error: "PATH NOT FOUND " + method + ": " + path,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
},
|
||||
};
|
||||
};
|
||||
@@ -1,5 +1,4 @@
|
||||
|
||||
|
||||
export const AUTOMTAION_ROOT = '/' as const;
|
||||
export const AUTOMTAION_ROOT = "/" as const;
|
||||
export const AUTOMTAION_LIST = `${AUTOMTAION_ROOT}list` as const;
|
||||
export const AUTOMTAION_ITEM = `${AUTOMTAION_ROOT}item` as const;
|
||||
export const AUTOMTAION_ITEM_TAGS = `${AUTOMTAION_ITEM}/tags` as const;
|
||||
@@ -1,42 +1,40 @@
|
||||
import { useState } from "react";
|
||||
import { ApiState } from "./types";
|
||||
import { AutomationAPI } from './automations';
|
||||
import { AutomationAPI } from "./automations";
|
||||
|
||||
|
||||
|
||||
export const useDefaultApiState = () => useState<ApiState>({
|
||||
automations: { ready: false },
|
||||
});
|
||||
export const useDefaultApiState = () =>
|
||||
useState<ApiState>({
|
||||
automations: { ready: false },
|
||||
});
|
||||
|
||||
export const makeReloadAutomations = (
|
||||
automationAPI: AutomationAPI,
|
||||
state: ApiState,
|
||||
setState: (s: ApiState) => void,
|
||||
setState: (s: ApiState) => void
|
||||
) => {
|
||||
const reload = async () => {
|
||||
let params = { offset: 0, limit: 100 };
|
||||
let params = { offset: 0, limit: 10000 };
|
||||
if (state.automations.ready && state.automations.ok) {
|
||||
params = state.automations.data.params
|
||||
params = state.automations.data.params;
|
||||
}
|
||||
const resp = await automationAPI.list(params);
|
||||
setState({
|
||||
...state, automations: {
|
||||
...state,
|
||||
automations: {
|
||||
ready: true,
|
||||
...resp,
|
||||
}
|
||||
},
|
||||
});
|
||||
}
|
||||
const wrapCall = <
|
||||
Call extends (a: any) => Promise<any>
|
||||
>(fcn: Call) => {
|
||||
};
|
||||
const wrapCall = <Call extends (a: any) => Promise<any>>(fcn: Call) => {
|
||||
return async (args: Parameters<Call>[0]): Promise<ReturnType<Call>> => {
|
||||
const resp = await fcn(args);
|
||||
await reload();
|
||||
return resp;
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
return {
|
||||
reload,
|
||||
wrapCall,
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
@@ -1,31 +1,16 @@
|
||||
.automation-editor--info-box {
|
||||
height: 100%;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-start;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
align-items: center;
|
||||
gap: 0.5em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box-inner {
|
||||
height: 100%;
|
||||
max-width: 95vw;
|
||||
max-height: 90vh;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.show {
|
||||
min-width: 20em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.hide {
|
||||
min-width: 1em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.hide>.automation-editor--info-box-inner {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tags {
|
||||
padding: 0.25em 0.75em 1em 0.75em;
|
||||
border-color: var(--mui-grey-400);
|
||||
|
||||
@@ -1,40 +1,35 @@
|
||||
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { makeTagDB } from "components/AutomationList/TagDB";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
import { AutoInfoBox } from "./AutoInfoBox";
|
||||
import { defaultAutomation } from 'utils/defaults';
|
||||
import { defaultAutomation } from "utils/defaults";
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList/Editor/InfoBox',
|
||||
title: "App/AutomationList/Editor/InfoBox",
|
||||
component: AutoInfoBox,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||
args: {
|
||||
tagDB: makeTagDB([
|
||||
defaultAutomation("test")
|
||||
])
|
||||
}
|
||||
tagDB: makeTagDB([defaultAutomation("test")]),
|
||||
},
|
||||
} as ComponentMeta<typeof AutoInfoBox>;
|
||||
|
||||
|
||||
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
||||
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
|
||||
export const NoTags: ComponentStory<typeof AutoInfoBox> = (args) => {
|
||||
const [[metadata, tags], setState] = useState([args.metadata, args.tags]);
|
||||
return (
|
||||
<Page>
|
||||
<AutoInfoBox
|
||||
{...args}
|
||||
className=""
|
||||
metadata={metadata}
|
||||
tags={tags}
|
||||
onUpdate={(m, t) => {
|
||||
args.onUpdate(m, t)
|
||||
setState([m, t])
|
||||
args.onUpdate(m, t);
|
||||
setState([m, t]);
|
||||
}}
|
||||
/>
|
||||
</Page>
|
||||
)
|
||||
}
|
||||
);
|
||||
};
|
||||
NoTags.args = {
|
||||
...NoTags.args,
|
||||
tags: [],
|
||||
@@ -43,13 +38,13 @@ NoTags.args = {
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
wowo: "!",
|
||||
},
|
||||
mode: 'single',
|
||||
mode: "single",
|
||||
},
|
||||
}
|
||||
};
|
||||
|
||||
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({})
|
||||
export const SomeTags: ComponentStory<typeof AutoInfoBox> = NoTags.bind({});
|
||||
SomeTags.args = {
|
||||
...SomeTags.args,
|
||||
tags: [
|
||||
@@ -61,8 +56,8 @@ SomeTags.args = {
|
||||
alias: "Bathroom Vent",
|
||||
description: "Turn the vent when the humidity is high",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
wowo: "!",
|
||||
},
|
||||
mode: 'single',
|
||||
mode: "single",
|
||||
},
|
||||
}
|
||||
};
|
||||
@@ -9,7 +9,6 @@ import { TagDB } from "components/AutomationList/TagDB";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
|
||||
interface Props {
|
||||
className: string;
|
||||
metadata: AutomationMetadata;
|
||||
tags: Array<[string, string]>;
|
||||
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
||||
@@ -20,7 +19,6 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
metadata,
|
||||
tags,
|
||||
onUpdate,
|
||||
className,
|
||||
children,
|
||||
tagDB,
|
||||
}) => {
|
||||
@@ -97,7 +95,7 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
]);
|
||||
// render
|
||||
return (
|
||||
<div className={`automation-editor--info-box ${className}`}>
|
||||
<div className="automation-editor--info-box">
|
||||
<div className="automation-editor--info-box-inner">
|
||||
<InputText
|
||||
label="ID"
|
||||
|
||||
@@ -29,13 +29,54 @@
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 0.25em;
|
||||
justify-content: flex-end;
|
||||
justify-content: space-between;
|
||||
margin-top: 0.25em;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper.changed>.automation-editor--flow-wrapper--toolbar * {
|
||||
.automation-editor--flow-wrapper--toolbar--title {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
gap: 0.25em;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper--toolbar--title--text .id {
|
||||
font-size: 0.75em;
|
||||
max-width: 15em;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
white-space: break-word;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
padding-bottom: 0.25em;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--title--text {
|
||||
min-width: 5em;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes {
|
||||
min-width: 6em;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiSelect-select {
|
||||
padding-left: 0.25em;
|
||||
padding-right: 0.25em;
|
||||
padding-top: 1.15em;
|
||||
padding-bottom: 0.25em;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper--toolbar .automation-editor--flow-wrapper--toolbar--modes .MuiInputLabel-root {
|
||||
font-size: 0.9em;
|
||||
left: -0.5em;
|
||||
}
|
||||
|
||||
.automation-editor.changed .automation-editor--flow-wrapper--toolbar--save-btn,
|
||||
.automation-editor--info-box--buttons.changed .automation-editor--flow-wrapper--toolbar--save-btn {
|
||||
border-color: var(--mui-success-light);
|
||||
color: var(--mui-success-light)
|
||||
color: var(--mui-success-light);
|
||||
}
|
||||
|
||||
|
||||
@@ -61,21 +102,6 @@
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.automation-editor .automation-editor--info-box--icon {
|
||||
position: absolute;
|
||||
left: 0.25em;
|
||||
bottom: 0em;
|
||||
z-index: 10;
|
||||
max-width: 1.5em;
|
||||
max-height: 1.5em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
||||
transform: rotate(180deg);
|
||||
z-index: 2;
|
||||
left: 0.1em;
|
||||
}
|
||||
|
||||
.automation-editor.loading .mock-list {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
@@ -96,4 +122,9 @@
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--buttons {
|
||||
display: flex;
|
||||
gap: 1em;
|
||||
}
|
||||
@@ -45,7 +45,8 @@ Simple.args = {
|
||||
Use: "Flushing",
|
||||
},
|
||||
metadata: {
|
||||
id: "random",
|
||||
id:
|
||||
"random" + String(Date.now()) + String(Date.now()) + String(Date.now()),
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
|
||||
@@ -3,8 +3,9 @@ import Icon from "@mui/material/Icon";
|
||||
import { CheckMarkIcon } from "components/Icons";
|
||||
import { FC, useState } from "react";
|
||||
import { AutomationData } from "types/automations";
|
||||
import { Modal } from "components/Modal";
|
||||
import { AutoInfoBox } from "./AutoInfoBox";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import ModeEditOutlineTwoToneIcon from "@mui/icons-material/ModeEditOutlineTwoTone";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { useAutomatioEditorState, EditorData } from "./state";
|
||||
import { MiniFailure } from "types/validators/helper";
|
||||
@@ -12,10 +13,12 @@ import InputYaml from "components/Inputs/InputYaml";
|
||||
import { TagDB } from "components/AutomationList/TagDB";
|
||||
import Skeleton from "@mui/material/Skeleton";
|
||||
import LinearProgress from "@mui/material/LinearProgress";
|
||||
import { ArrowBack } from "@mui/icons-material";
|
||||
import { useCookies } from "react-cookie";
|
||||
import { DAGDims } from "components/DAGGraph/elements/types";
|
||||
import { DAGAutomationGraph } from "components/DAGGraph";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import { InputTextView } from "components/Inputs/InputTextView";
|
||||
import { ControlButton } from "react-flow-renderer";
|
||||
|
||||
interface Props {
|
||||
automation?: AutomationData;
|
||||
@@ -40,7 +43,7 @@ export const AutomationEditor: FC<Props> = ({
|
||||
save,
|
||||
saveAndUpdate,
|
||||
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||
const [closeInfo, setCloseInfo] = useState(false);
|
||||
const [infoBoxOpen, setInfoBox] = useState(false);
|
||||
const [
|
||||
{ ckFlipped },
|
||||
setCookies,
|
||||
@@ -71,30 +74,111 @@ export const AutomationEditor: FC<Props> = ({
|
||||
);
|
||||
}
|
||||
return (
|
||||
<div className="automation-editor">
|
||||
<div className={["automation-editor", state.status].join(" ")}>
|
||||
{state.status === "saving" && (
|
||||
<LinearProgress className="linear-loader" />
|
||||
)}
|
||||
<AutoInfoBox
|
||||
className={closeInfo ? "hide" : "show"}
|
||||
metadata={state.data.metadata}
|
||||
tags={state.data.tags}
|
||||
onUpdate={updateMetadata}
|
||||
tagDB={tagDB}
|
||||
>
|
||||
<ButtonIcon
|
||||
className="automation-editor--info-box--icon"
|
||||
onClick={() => setCloseInfo(!closeInfo)}
|
||||
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
||||
color="success"
|
||||
icon={<ArrowBack />}
|
||||
/>
|
||||
</AutoInfoBox>
|
||||
<Modal open={infoBoxOpen}>
|
||||
<AutoInfoBox
|
||||
metadata={state.data.metadata}
|
||||
tags={state.data.tags}
|
||||
onUpdate={updateMetadata}
|
||||
tagDB={tagDB}
|
||||
>
|
||||
<div
|
||||
className={[
|
||||
"automation-editor--info-box--buttons",
|
||||
state.status,
|
||||
].join(" ")}
|
||||
>
|
||||
<Button onClick={() => setInfoBox(false)}>Close</Button>
|
||||
<Button
|
||||
className={"automation-editor--flow-wrapper--toolbar--save-btn"}
|
||||
onClick={save}
|
||||
disabled={state.status !== "changed"}
|
||||
>
|
||||
Save <CheckMarkIcon color="#bf4" />
|
||||
</Button>
|
||||
</div>
|
||||
</AutoInfoBox>
|
||||
</Modal>
|
||||
|
||||
<div
|
||||
className={["automation-editor--flow-wrapper", state.status].join(" ")}
|
||||
>
|
||||
<div className="automation-editor--flow-wrapper--toolbar">
|
||||
<div className="automation-editor--flow-wrapper--toolbar--title">
|
||||
<span className="automation-editor--flow-wrapper--toolbar--title--text">
|
||||
<div className="id">{state.data.metadata.id}</div>
|
||||
<InputTextView
|
||||
value={state.data.metadata.alias ?? ""}
|
||||
placeholder="Name"
|
||||
onChange={(alias) =>
|
||||
updateMetadata(
|
||||
{
|
||||
...state.data.metadata,
|
||||
alias,
|
||||
},
|
||||
state.data.tags
|
||||
)
|
||||
}
|
||||
/>
|
||||
</span>
|
||||
<InputList
|
||||
fullWidth={false}
|
||||
label="Mode"
|
||||
className="automation-editor--flow-wrapper--toolbar--modes"
|
||||
current={{
|
||||
id: state.data.metadata.mode,
|
||||
label: "",
|
||||
}}
|
||||
onChange={({ id }) =>
|
||||
updateMetadata(
|
||||
{
|
||||
...state.data.metadata,
|
||||
mode: id,
|
||||
},
|
||||
state.data.tags
|
||||
)
|
||||
}
|
||||
getKey={({ id }) => id}
|
||||
getDescription={({ label }) => label}
|
||||
options={[
|
||||
{
|
||||
id: "single",
|
||||
label: "Do not start a new run. Issue a warning.",
|
||||
},
|
||||
{
|
||||
id: "parallel",
|
||||
label:
|
||||
"Start a new, independent run in parallel with previous runs.",
|
||||
},
|
||||
{
|
||||
id: "queued",
|
||||
label:
|
||||
"Start a new run after all previous runs complete. Runs are guaranteed to execute in the order they were queued.",
|
||||
},
|
||||
{
|
||||
id: "restart",
|
||||
label: "Start a new run after first stopping previous run.",
|
||||
},
|
||||
]}
|
||||
/>
|
||||
<InputTextView
|
||||
className="description"
|
||||
value={state.data.metadata.description ?? ""}
|
||||
placeholder="Description"
|
||||
onChange={(description) =>
|
||||
updateMetadata(
|
||||
{
|
||||
...state.data.metadata,
|
||||
description,
|
||||
},
|
||||
state.data.tags
|
||||
)
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
{!dims.flipped && (
|
||||
<Button
|
||||
className={"automation-editor--flow-wrapper--toolbar--flip-btn"}
|
||||
@@ -120,6 +204,11 @@ export const AutomationEditor: FC<Props> = ({
|
||||
onTriggerUpdate={updateTrigger}
|
||||
onConditionUpdate={updateCondition}
|
||||
isFlipped={flipped}
|
||||
additionalControls={
|
||||
<ControlButton onClick={() => setInfoBox(!infoBoxOpen)}>
|
||||
<ModeEditOutlineTwoToneIcon />
|
||||
</ControlButton>
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -5,6 +5,7 @@ import { AutomationList } from ".";
|
||||
import { bigMockAutoList } from "utils/mocks";
|
||||
import { Page } from "components/Page";
|
||||
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
|
||||
import { AutomationData } from "types/automations";
|
||||
|
||||
export default {
|
||||
title: "App/AutomationList",
|
||||
@@ -16,12 +17,15 @@ export default {
|
||||
} as ComponentMeta<typeof AutomationList>;
|
||||
|
||||
const Template: ComponentStory<typeof AutomationList> = (args) => {
|
||||
const [autos, setAutos] = useState(args.automations);
|
||||
const [autos, setAutos] = useState(args.automations.data);
|
||||
return (
|
||||
<Page>
|
||||
<AutomationList
|
||||
{...args}
|
||||
automations={autos}
|
||||
automations={{
|
||||
...args.automations,
|
||||
data: autos,
|
||||
}}
|
||||
onAdd={(a) => {
|
||||
args.onAdd(a);
|
||||
setAutos([...autos, a]);
|
||||
@@ -39,107 +43,115 @@ const Template: ComponentStory<typeof AutomationList> = (args) => {
|
||||
);
|
||||
};
|
||||
|
||||
export const EmptyStart = Template.bind({});
|
||||
EmptyStart.args = {
|
||||
...EmptyStart.args,
|
||||
automations: [],
|
||||
const make = (autos: AutomationData[]) => {
|
||||
const NewTemp = Template.bind({});
|
||||
NewTemp.args = {
|
||||
...NewTemp.args,
|
||||
automations: {
|
||||
data: autos,
|
||||
params: {
|
||||
offset: 0,
|
||||
limit: 100,
|
||||
},
|
||||
totalItems: autos.length,
|
||||
},
|
||||
};
|
||||
|
||||
return NewTemp;
|
||||
};
|
||||
|
||||
export const FewAutos = Template.bind({});
|
||||
FewAutos.args = {
|
||||
...FewAutos.args,
|
||||
automations: bigMockAutoList,
|
||||
};
|
||||
export const EmptyStart = make([]);
|
||||
|
||||
export const BadAutmations = Template.bind({});
|
||||
BadAutmations.args = {
|
||||
...BadAutmations.args,
|
||||
automations: [
|
||||
{
|
||||
metadata: {
|
||||
alias: "Set Thermostat to 76 at 8am",
|
||||
description: "",
|
||||
mode: "single",
|
||||
} as any,
|
||||
trigger: [
|
||||
{
|
||||
at: "08:00:00",
|
||||
platform: "time",
|
||||
export const FewAutos = make(bigMockAutoList);
|
||||
|
||||
export const BadAutmations = make([
|
||||
{
|
||||
metadata: {
|
||||
alias: "Set Thermostat to 76 at 8am",
|
||||
description: "",
|
||||
mode: "single",
|
||||
} as any,
|
||||
trigger: [
|
||||
{
|
||||
at: "08:00:00",
|
||||
platform: "time",
|
||||
},
|
||||
],
|
||||
condition: [
|
||||
{
|
||||
condition: "state",
|
||||
entity_id: "climate.thermostat",
|
||||
state: "cool",
|
||||
},
|
||||
],
|
||||
sequence: [
|
||||
{
|
||||
data: {
|
||||
temperature: 76,
|
||||
},
|
||||
],
|
||||
condition: [
|
||||
{
|
||||
condition: "state",
|
||||
service: "climate.set_temperature",
|
||||
target: {
|
||||
entity_id: "climate.thermostat",
|
||||
state: "cool",
|
||||
},
|
||||
],
|
||||
sequence: [
|
||||
{
|
||||
data: {
|
||||
temperature: 76,
|
||||
},
|
||||
service: "climate.set_temperature",
|
||||
target: {
|
||||
entity_id: "climate.thermostat",
|
||||
},
|
||||
},
|
||||
],
|
||||
tags: {},
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "Bad Choose Sequence",
|
||||
alias: "Bad Choose",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
},
|
||||
trigger: [],
|
||||
sequence: [
|
||||
{
|
||||
choose: {},
|
||||
},
|
||||
] as any,
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Bad Trigger",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
],
|
||||
tags: {},
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "Bad Choose Example",
|
||||
alias: "Bad Choose",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
trigger: ["haha I am a string"] as any,
|
||||
sequence: [],
|
||||
mode: "single",
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {} as any,
|
||||
trigger: [],
|
||||
sequence: [],
|
||||
trigger: [],
|
||||
sequence: [
|
||||
{
|
||||
choose: [],
|
||||
},
|
||||
] as any,
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Bad Trigger",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
wowo: "!",
|
||||
},
|
||||
mode: "single",
|
||||
},
|
||||
],
|
||||
};
|
||||
trigger: ["haha I am a string"] as any,
|
||||
sequence: [],
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {} as any,
|
||||
trigger: [],
|
||||
sequence: [],
|
||||
},
|
||||
]);
|
||||
|
||||
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = (
|
||||
args
|
||||
) => {
|
||||
const [autos, setAutos] = useState(args.automations);
|
||||
const [autos, setAutos] = useState(args.automations.data);
|
||||
return (
|
||||
<Page>
|
||||
<AutomationList
|
||||
{...args}
|
||||
automations={autos}
|
||||
automations={{
|
||||
...args.automations,
|
||||
data: autos,
|
||||
}}
|
||||
onAdd={(a) => {
|
||||
window.setTimeout(() => {
|
||||
args.onAdd(a);
|
||||
@@ -164,5 +176,12 @@ export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = (
|
||||
};
|
||||
FewAutosWithSlowLoader.args = {
|
||||
...FewAutosWithSlowLoader.args,
|
||||
automations: bigMockAutoList,
|
||||
automations: {
|
||||
data: bigMockAutoList,
|
||||
params: {
|
||||
limit: 100,
|
||||
offset: 0,
|
||||
},
|
||||
totalItems: 100,
|
||||
},
|
||||
};
|
||||
@@ -65,8 +65,20 @@
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.automation-list-box--bottom>button {
|
||||
background-color: #070;
|
||||
color: var(--mui-grey-400);
|
||||
.automation-list-box--bottom>.automation-list-box--bottom--add {
|
||||
background-color: var(--mui-primary-main);
|
||||
color: var(--mui-primary-contrastText);
|
||||
padding: 0.5em 2em;
|
||||
}
|
||||
|
||||
.automation-list-box--bottom>.automation-list-box--bottom--add:hover {
|
||||
color: var(--mui-primary-light);
|
||||
}
|
||||
|
||||
.automation-list-box--bottom--load svg {
|
||||
color: var(--mui-primary-main);
|
||||
}
|
||||
|
||||
.automation-list-box--bottom--load.less svg {
|
||||
transform: rotate(180deg);
|
||||
}
|
||||
@@ -5,6 +5,7 @@ import { createMockAuto } from "utils/mocks";
|
||||
import { Page } from "components/Page";
|
||||
import { CookiesProvider } from "react-cookie";
|
||||
import { makeTagDB } from "./TagDB";
|
||||
import { AutomationData } from "types/automations";
|
||||
|
||||
export default {
|
||||
title: "App/AutomationList/Box",
|
||||
@@ -20,7 +21,7 @@ const Template: ComponentStory<typeof AutomationListBox> = (args) => {
|
||||
<CookiesProvider>
|
||||
<AutomationListBox
|
||||
{...args}
|
||||
tagsDB={makeTagDB(args.automations)}
|
||||
tagsDB={makeTagDB(args.automations.data)}
|
||||
automations={args.automations}
|
||||
selected={selected}
|
||||
onSelectAutomation={(i) => {
|
||||
@@ -33,41 +34,46 @@ const Template: ComponentStory<typeof AutomationListBox> = (args) => {
|
||||
);
|
||||
};
|
||||
|
||||
export const EmptyStart = Template.bind({});
|
||||
EmptyStart.args = {
|
||||
...EmptyStart.args,
|
||||
automations: [],
|
||||
const make = (autos: AutomationData[]) => {
|
||||
const NewTemp = Template.bind({});
|
||||
NewTemp.args = {
|
||||
...NewTemp.args,
|
||||
automations: {
|
||||
data: autos,
|
||||
params: {
|
||||
offset: 0,
|
||||
limit: 100,
|
||||
},
|
||||
totalItems: autos.length,
|
||||
},
|
||||
};
|
||||
|
||||
return NewTemp;
|
||||
};
|
||||
|
||||
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(),
|
||||
],
|
||||
};
|
||||
export const EmptyStart = make([]);
|
||||
|
||||
export const OneAuto = Template.bind({});
|
||||
OneAuto.args = {
|
||||
...OneAuto.args,
|
||||
automations: [
|
||||
createMockAuto({
|
||||
Type: "Climate",
|
||||
}),
|
||||
],
|
||||
};
|
||||
export const FewAutos = make([
|
||||
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(),
|
||||
]);
|
||||
|
||||
export const OneAuto = make([
|
||||
createMockAuto({
|
||||
Type: "Climate",
|
||||
}),
|
||||
]);
|
||||
@@ -8,14 +8,21 @@ import { makeGrouping } from "./automationGrouper";
|
||||
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
|
||||
import { useCookies } from "react-cookie";
|
||||
import { TagDB } from "components/AutomationList/TagDB";
|
||||
// import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
// import ReadMoreOutlinedIcon from "@mui/icons-material/ReadMoreOutlined";
|
||||
import { ListData, ListParams } from "apiService/types";
|
||||
import Chip from "@mui/material/Chip";
|
||||
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
|
||||
|
||||
export type AutomationListBoxProps = {
|
||||
automations: AutomationData[];
|
||||
automations: ListData<AutomationData>;
|
||||
selected: number;
|
||||
onSelectAutomation: (i: number) => void;
|
||||
onRemove: (i: number) => void;
|
||||
onAdd: () => void;
|
||||
onUpdateTags: (id: string, tags: Record<string, string>) => void;
|
||||
onUpdate: (a: AutomationData, i: number) => void;
|
||||
onLoadMore: (p: ListParams) => void;
|
||||
tagsDB: TagDB;
|
||||
};
|
||||
|
||||
@@ -54,11 +61,17 @@ const useAutomationListBoxState = () => {
|
||||
};
|
||||
|
||||
export const AutomationListBox: FC<AutomationListBoxProps> = ({
|
||||
automations,
|
||||
automations: {
|
||||
data: automations,
|
||||
// params: autoParams,
|
||||
totalItems: totalAutomations,
|
||||
},
|
||||
selected,
|
||||
onSelectAutomation,
|
||||
onAdd,
|
||||
onRemove,
|
||||
// onLoadMore,
|
||||
onUpdateTags,
|
||||
tagsDB,
|
||||
onUpdate,
|
||||
}) => {
|
||||
@@ -101,11 +114,44 @@ export const AutomationListBox: FC<AutomationListBoxProps> = ({
|
||||
/>
|
||||
</div>
|
||||
<div className="automation-list-box--bottom">
|
||||
<Button onClick={onAdd}>Add</Button>
|
||||
<span>
|
||||
Showing Automations: {filteredAutomations.length} out of{" "}
|
||||
{automations.length}
|
||||
</span>
|
||||
<Button className="automation-list-box--bottom--add" onClick={onAdd}>
|
||||
Add
|
||||
</Button>
|
||||
{automations.length < totalAutomations ? (
|
||||
<>
|
||||
<Chip
|
||||
label={`Only loaded ${automations.length} out of ${totalAutomations}`}
|
||||
variant="outlined"
|
||||
color="warning"
|
||||
icon={<InfoOutlinedIcon />}
|
||||
onClick={() =>
|
||||
window.open(
|
||||
"https://github.com/asosnovsky/Shortumation/issues/78",
|
||||
"_blank"
|
||||
)
|
||||
}
|
||||
/>
|
||||
<small>support for more is not yet implemented</small>
|
||||
</>
|
||||
) : (
|
||||
""
|
||||
)}
|
||||
{/* {autoParams.offset > 0 && (
|
||||
<ButtonIcon
|
||||
borderless
|
||||
className="automation-list-box--bottom--load less"
|
||||
icon={<ReadMoreOutlinedIcon />}
|
||||
onClick={() => onLoadMore()}
|
||||
/>
|
||||
)} */}
|
||||
{/* {filteredAutomations.length} out of {totalAutomations} */}
|
||||
{/* {autoParams.offset + automations.length < totalAutomations && (
|
||||
<ButtonIcon
|
||||
borderless
|
||||
className="automation-list-box--bottom--load more"
|
||||
icon={<ReadMoreOutlinedIcon />}
|
||||
/>
|
||||
)} */}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -177,9 +177,10 @@ export const AutomationListBoxItem: FC<{
|
||||
onSave,
|
||||
}) => {
|
||||
// state
|
||||
const [{ tags, isModified }, setState] = useState({
|
||||
const [{ tags, isModified, alias }, setState] = useState({
|
||||
isModified: false,
|
||||
tags: Object.entries(auto.tags),
|
||||
alias: auto.metadata.alias ?? "",
|
||||
});
|
||||
|
||||
// effects
|
||||
@@ -187,14 +188,22 @@ export const AutomationListBoxItem: FC<{
|
||||
setState({
|
||||
isModified: false,
|
||||
tags: Object.entries(auto.tags),
|
||||
alias: auto.metadata.alias ?? "",
|
||||
});
|
||||
}, [auto]);
|
||||
|
||||
// alias
|
||||
const setAlias = (a: string) =>
|
||||
setState({
|
||||
isModified: true,
|
||||
tags,
|
||||
alias: a,
|
||||
});
|
||||
const setTags = (t: [string, string][]) =>
|
||||
setState({
|
||||
isModified: true,
|
||||
tags: t,
|
||||
alias,
|
||||
});
|
||||
// sub elements
|
||||
let title = "BadAuto<<Missing Metadata>>";
|
||||
@@ -215,10 +224,14 @@ export const AutomationListBoxItem: FC<{
|
||||
onClick={() => onSelectAutomation(autoIndex)}
|
||||
>
|
||||
<MetadataBox
|
||||
metadata={auto.metadata}
|
||||
metadata={{
|
||||
...auto.metadata,
|
||||
alias,
|
||||
}}
|
||||
tags={tags}
|
||||
tagsDB={tagsDB}
|
||||
onUpdate={setTags}
|
||||
onTagUpdate={setTags}
|
||||
onAliasUpdate={setAlias}
|
||||
/>
|
||||
<div className="automation-list-box--body--item--buttons">
|
||||
{isModified && (
|
||||
@@ -229,6 +242,10 @@ export const AutomationListBoxItem: FC<{
|
||||
onSave({
|
||||
...auto,
|
||||
tags: Object.fromEntries(tags),
|
||||
metadata: {
|
||||
...auto.metadata,
|
||||
alias,
|
||||
},
|
||||
})
|
||||
}
|
||||
/>
|
||||
|
||||
@@ -7,6 +7,13 @@
|
||||
|
||||
.automation-list-box--body--item--title>b {
|
||||
font-size: 1em;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.25em;
|
||||
}
|
||||
|
||||
.automation-list-box--body--item--title .input-text-view span {
|
||||
max-height: 1.5em;
|
||||
}
|
||||
|
||||
.automation-list-box--body--item--title>span, .automation-list-box--body--item--title>b>span {
|
||||
@@ -80,4 +87,15 @@
|
||||
|
||||
.automation-list-box--body--item--tags--item>.text .icon:hover svg {
|
||||
fill: var(--mui-common-black);
|
||||
}
|
||||
|
||||
.automation-list-box--body--item--tags--item .delete {
|
||||
font-size: 1em;
|
||||
color: var(--mui-error-light);
|
||||
}
|
||||
|
||||
.automation-list-box--body--item--tags--item .delete:hover {
|
||||
color: var(--mui-error-dark);
|
||||
outline: 1px solid var(--mui-error-dark);
|
||||
border-radius: 20px;
|
||||
}
|
||||
@@ -4,13 +4,16 @@ import { FC, useState } from "react";
|
||||
import { AutomationMetadata } from "types/automations";
|
||||
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
|
||||
import { TagDB } from "./TagDB";
|
||||
import DeleteIcon from "@mui/icons-material/ClearTwoTone";
|
||||
import { InputTextView } from "components/Inputs/InputTextView";
|
||||
|
||||
export const MetadataBox: FC<{
|
||||
metadata: AutomationMetadata;
|
||||
onUpdate: (t: [string, string][]) => void;
|
||||
onAliasUpdate: (t: string) => void;
|
||||
onTagUpdate: (t: [string, string][]) => void;
|
||||
tags: [string, string][];
|
||||
tagsDB: TagDB;
|
||||
}> = ({ tags, onUpdate, tagsDB, metadata }) => {
|
||||
}> = ({ tags, onTagUpdate, onAliasUpdate, tagsDB, metadata }) => {
|
||||
// state
|
||||
const [newTag, setNewTag] = useState<
|
||||
| {
|
||||
@@ -30,9 +33,12 @@ export const MetadataBox: FC<{
|
||||
if (metadata) {
|
||||
title = (
|
||||
<>
|
||||
<b>
|
||||
{String(metadata.alias ?? "").slice(0, 15)}{" "}
|
||||
<span>({String(metadata.id).slice(0, 5)})</span>
|
||||
<b className="text">
|
||||
<InputTextView
|
||||
value={metadata.alias ?? ""}
|
||||
onChange={onAliasUpdate}
|
||||
/>
|
||||
<span>({String(metadata.id).slice(0, 10)})</span>
|
||||
</b>
|
||||
<span>{String(metadata.description ?? "").slice(0, 25)}</span>
|
||||
</>
|
||||
@@ -47,8 +53,14 @@ export const MetadataBox: FC<{
|
||||
options={[tagOptions, tagsDB.getTagValues(tagName)]}
|
||||
key={tagIndex}
|
||||
value={[tagName, tagValue]}
|
||||
onDelete={() =>
|
||||
onTagUpdate([
|
||||
...tags.slice(0, tagIndex),
|
||||
...tags.slice(tagIndex + 1),
|
||||
])
|
||||
}
|
||||
onChange={([newName, newValue]) =>
|
||||
onUpdate([
|
||||
onTagUpdate([
|
||||
...tags.slice(0, tagIndex),
|
||||
[newName, newValue],
|
||||
...tags.slice(tagIndex + 1),
|
||||
@@ -56,29 +68,34 @@ export const MetadataBox: FC<{
|
||||
}
|
||||
/>
|
||||
))}
|
||||
{newTag.on && (
|
||||
{newTag.on ? (
|
||||
<MetadataBoxTag
|
||||
options={[tagOptions, tagsDB.getTagValues(newTag.name)]}
|
||||
key="new"
|
||||
value={[newTag.name, newTag.value]}
|
||||
initialState={[true, true]}
|
||||
initialState={true}
|
||||
onChange={([name, value]) => {
|
||||
if (name.trim() !== "" && value.trim() !== "") {
|
||||
setNewTag({
|
||||
on: false,
|
||||
});
|
||||
onUpdate([...tags, [name, value]]);
|
||||
} else {
|
||||
setNewTag({
|
||||
on: true,
|
||||
name,
|
||||
value,
|
||||
});
|
||||
setNewTag({
|
||||
on: true,
|
||||
name,
|
||||
value,
|
||||
});
|
||||
}}
|
||||
onToggle={(em) => {
|
||||
if (!em) {
|
||||
if (newTag.name.trim() !== "" && newTag.value.trim() !== "") {
|
||||
onTagUpdate(tags.concat([[newTag.name, newTag.value]]));
|
||||
setNewTag({
|
||||
on: false,
|
||||
});
|
||||
}
|
||||
}
|
||||
setNewTag({
|
||||
on: false,
|
||||
});
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{!newTag.on && (
|
||||
) : (
|
||||
<span
|
||||
className="automation-list-box--body--item--tags--add"
|
||||
onClick={() =>
|
||||
@@ -101,16 +118,29 @@ export const MetadataBoxTag: FC<{
|
||||
value: [string, string];
|
||||
onChange: (t: [string, string]) => void;
|
||||
options: [string[], string[]];
|
||||
initialState?: [boolean, boolean];
|
||||
initialState?: boolean;
|
||||
onToggle?: (em: boolean) => void;
|
||||
onDelete?: () => void;
|
||||
}> = (props) => {
|
||||
const [[editMode1, editMode2], setEditMode] = useState(
|
||||
props.initialState ? props.initialState : [false, false]
|
||||
const [editMode, setEditMode] = useState(
|
||||
props.initialState ? props.initialState : false
|
||||
);
|
||||
const toggle1 = () => setEditMode([!editMode1, editMode2]);
|
||||
const toggle2 = () => setEditMode([editMode1, !editMode2]);
|
||||
const toggle = () => {
|
||||
if (editMode) {
|
||||
if (props.value[0].trim() === "" || props.value[1].trim() === "") {
|
||||
props.onToggle && props.onToggle(true);
|
||||
return setEditMode(true);
|
||||
}
|
||||
}
|
||||
props.onToggle && props.onToggle(!editMode);
|
||||
setEditMode(!editMode);
|
||||
};
|
||||
return (
|
||||
<span className="automation-list-box--body--item--tags--item">
|
||||
{editMode1 ? (
|
||||
{props.onDelete && (
|
||||
<DeleteIcon onClick={props.onDelete} className="delete" />
|
||||
)}
|
||||
{editMode ? (
|
||||
<InputAutoComplete
|
||||
multiple={false}
|
||||
className="text"
|
||||
@@ -118,17 +148,17 @@ export const MetadataBoxTag: FC<{
|
||||
options={props.options[0]}
|
||||
label=""
|
||||
value={props.value[0]}
|
||||
onEnter={toggle1}
|
||||
onEnter={toggle}
|
||||
onChange={(v) => props.onChange([v ?? "", props.value[1]])}
|
||||
onlyShowLabel
|
||||
endAdornment={<CheckMarkIcon className="icon" onClick={toggle1} />}
|
||||
endAdornment={<CheckMarkIcon className="icon" onClick={toggle} />}
|
||||
/>
|
||||
) : (
|
||||
<b className="text" onClick={toggle1}>
|
||||
<b className="text" onClick={toggle}>
|
||||
{props.value[0]}:
|
||||
</b>
|
||||
)}
|
||||
{editMode2 ? (
|
||||
{editMode ? (
|
||||
<InputAutoComplete
|
||||
multiple={false}
|
||||
className="text"
|
||||
@@ -136,13 +166,13 @@ export const MetadataBoxTag: FC<{
|
||||
options={props.options[1]}
|
||||
label=""
|
||||
value={props.value[1]}
|
||||
onEnter={toggle2}
|
||||
onEnter={toggle}
|
||||
onChange={(v) => props.onChange([props.value[0], v ?? ""])}
|
||||
onlyShowLabel
|
||||
endAdornment={<CheckMarkIcon className="icon" onClick={toggle2} />}
|
||||
endAdornment={<CheckMarkIcon className="icon" onClick={toggle} />}
|
||||
/>
|
||||
) : (
|
||||
<span className="text" onClick={toggle2}>
|
||||
<span className="text" onClick={toggle}>
|
||||
{props.value[1]}
|
||||
</span>
|
||||
)}
|
||||
|
||||
@@ -6,7 +6,7 @@ import { Page } from "components/Page";
|
||||
import { DEFAULT_DIMS } from "components/DAGGraph/elements/constants";
|
||||
|
||||
export default {
|
||||
title: "App/AutomationList/Connected",
|
||||
title: "App/AutomationList/MockConnected",
|
||||
component: ConnectedAutomationList,
|
||||
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||
args: {
|
||||
|
||||
@@ -17,28 +17,6 @@
|
||||
left: 0.25em;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box {
|
||||
min-width: 100vw;
|
||||
min-height: calc(100vh - 5em);
|
||||
max-width: 100vw;
|
||||
max-height: calc(100vh - 5em);
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box-inner {
|
||||
margin-top: 2.5em;
|
||||
padding-left: 0.5em;
|
||||
padding-right: 0.5em;
|
||||
margin-bottom: 2em;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box--icon {
|
||||
left: 0.5em;
|
||||
bottom: 0em;
|
||||
background-color: var(--mui-common-black);
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
|
||||
|
||||
/* list hide */
|
||||
.automation-list--root.mobile .automation-list--list.hide {
|
||||
@@ -50,29 +28,11 @@
|
||||
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
|
||||
transform: rotate(270deg);
|
||||
position: fixed;
|
||||
top: 0;
|
||||
top: 0.5em;
|
||||
z-index: 5;
|
||||
}
|
||||
|
||||
/* info box hide */
|
||||
.automation-list--root.mobile .automation-editor--info-box.hide {
|
||||
width: 100vw;
|
||||
min-height: 0;
|
||||
max-height: 0;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
|
||||
transform: rotate(270deg);
|
||||
position: fixed;
|
||||
top: 0em;
|
||||
left: 0.25em;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.automation-list--root.mobile .automation-editor--flow-wrapper.unchanged>.automation-editor--flow-wrapper--toolbar {
|
||||
height: 0;
|
||||
opacity: 0;
|
||||
overflow: hidden;
|
||||
.automation-list--root.mobile .automation-editor--flow-wrapper>.automation-editor--flow-wrapper--toolbar .input-text-view,
|
||||
.automation-list--root.mobile .automation-editor--flow-wrapper>.automation-editor--flow-wrapper--toolbar .id {
|
||||
display: none;
|
||||
}
|
||||
@@ -16,12 +16,15 @@ import { useHA } from "haService";
|
||||
import { ArrowBack } from "@mui/icons-material";
|
||||
import { useSnackbar } from "notistack";
|
||||
import { DAGDims } from "components/DAGGraph/elements/types";
|
||||
import { ListData, ListParams } from "apiService/types";
|
||||
|
||||
interface AutomationListParams {
|
||||
automations: AutomationData[];
|
||||
automations: ListData<AutomationData>;
|
||||
onUpdate: (i: number, auto: AutomationData) => void;
|
||||
onUpdateTags: (id: string, tags: Record<string, string>) => void;
|
||||
onAdd: (auto: AutomationData) => void;
|
||||
onRemove: (i: number) => void;
|
||||
onLoadMore: (p: ListParams) => void;
|
||||
dims: DAGDims;
|
||||
children?: ReactNode;
|
||||
}
|
||||
@@ -54,7 +57,9 @@ export const useAutomationListState = () => {
|
||||
|
||||
export const AutomationList: FC<AutomationListParams> = ({
|
||||
automations,
|
||||
onLoadMore,
|
||||
onUpdate,
|
||||
onUpdateTags,
|
||||
onAdd,
|
||||
onRemove,
|
||||
dims,
|
||||
@@ -67,8 +72,11 @@ export const AutomationList: FC<AutomationListParams> = ({
|
||||
const { isMobile } = useWindowSize();
|
||||
const firstRender = useRef(true);
|
||||
// alias
|
||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
||||
const tagDB = makeTagDB(automations);
|
||||
const currentAuto =
|
||||
automations.data.length > 0
|
||||
? automations.data[current - automations.params.offset]
|
||||
: null;
|
||||
const tagDB = makeTagDB(automations.data);
|
||||
// effect
|
||||
useEffect(() => {
|
||||
if (firstRender.current) {
|
||||
@@ -90,9 +98,10 @@ export const AutomationList: FC<AutomationListParams> = ({
|
||||
<AutomationListBox
|
||||
automations={automations}
|
||||
onUpdate={(a, i) => onUpdate(i, a)}
|
||||
onUpdateTags={onUpdateTags}
|
||||
onAdd={() => {
|
||||
onAdd(defaultAutomation(String(Date.now())));
|
||||
setCurrent(automations.length);
|
||||
setCurrent(automations.data.length);
|
||||
if (isMobile) {
|
||||
setHideList(true);
|
||||
}
|
||||
@@ -103,6 +112,7 @@ export const AutomationList: FC<AutomationListParams> = ({
|
||||
setHideList(true);
|
||||
}
|
||||
}}
|
||||
onLoadMore={onLoadMore}
|
||||
selected={current}
|
||||
onRemove={onRemove}
|
||||
tagsDB={tagDB}
|
||||
@@ -145,16 +155,32 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
||||
dims,
|
||||
}) => {
|
||||
const { reloadAutomations } = useHA();
|
||||
const [saving, setSaving] = useState(false);
|
||||
const updateTags = async (id: string, tags: Record<string, string>) => {
|
||||
const resp = await methods.updateTags({
|
||||
automation_id: id,
|
||||
tags,
|
||||
});
|
||||
setSaving(true);
|
||||
await reloadAutomations();
|
||||
setSaving(false);
|
||||
return resp;
|
||||
};
|
||||
const removeAutomation = async (args: any) => {
|
||||
const resp = await methods.removeAutomation(args);
|
||||
setSaving(true);
|
||||
await reloadAutomations();
|
||||
setSaving(false);
|
||||
return resp;
|
||||
};
|
||||
const updateAutomation = async (args: any) => {
|
||||
const resp = await methods.updateAutomation(args);
|
||||
setSaving(true);
|
||||
await reloadAutomations();
|
||||
setSaving(false);
|
||||
return resp;
|
||||
};
|
||||
|
||||
if (!automations.ready) {
|
||||
return (
|
||||
<div className="automation-list--root loading">
|
||||
@@ -169,14 +195,19 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
||||
return <span>Error {automations.error}</span>;
|
||||
}
|
||||
return (
|
||||
<AutomationList
|
||||
dims={dims}
|
||||
automations={automations.data.data}
|
||||
onAdd={(auto) =>
|
||||
updateAutomation({ auto, index: automations.data.totalItems + 1 })
|
||||
}
|
||||
onRemove={(index) => removeAutomation({ index })}
|
||||
onUpdate={(index, auto) => updateAutomation({ index, auto })}
|
||||
/>
|
||||
<>
|
||||
{saving && <LinearProgress />}
|
||||
<AutomationList
|
||||
dims={dims}
|
||||
automations={automations.data}
|
||||
onUpdateTags={updateTags}
|
||||
onLoadMore={() => {}}
|
||||
onAdd={(auto) =>
|
||||
updateAutomation({ auto, index: automations.data.totalItems + 1 })
|
||||
}
|
||||
onRemove={(index) => removeAutomation({ index })}
|
||||
onUpdate={(index, auto) => updateAutomation({ index, auto })}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
};
|
||||
@@ -49,6 +49,7 @@
|
||||
.condition-node-base.is-edited>.condition-node-base--body {
|
||||
max-height: calc(100%-2px-1em);
|
||||
max-width: calc(100vw-2px-1em);
|
||||
min-width: 15em;
|
||||
border-color: var(--mui-success-main);
|
||||
border-style: solid;
|
||||
border-width: 1px;
|
||||
@@ -63,4 +64,44 @@
|
||||
align-items: center;
|
||||
padding: 0.5em;
|
||||
background-color: var(--mui-secondary-contrastText);
|
||||
}
|
||||
|
||||
.condition-node--time-editor {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 0.25em;
|
||||
}
|
||||
|
||||
.condition-node--time-editor--ba {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
gap: 0.5em;
|
||||
padding-top: 1.5em;
|
||||
padding-bottom: 0.25em;
|
||||
position: relative;
|
||||
width: fit-content;
|
||||
max-width: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.condition-node--time-editor--ba button.remove {
|
||||
padding: 0.25em;
|
||||
min-width: fit-content;
|
||||
color: var(--mui-error-light);
|
||||
border-color: transparent;
|
||||
}
|
||||
|
||||
.condition-node--time-editor--ba button.remove:hover {
|
||||
border-color: var(--mui-error-light);
|
||||
border-radius: 20px;
|
||||
}
|
||||
|
||||
.condition-node--time-editor--ba .label {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0.2em;
|
||||
}
|
||||
@@ -56,7 +56,12 @@ export const ConditionNodeBase: FC<ConditionNodeBaseProps> = (props) => {
|
||||
} else {
|
||||
const Editor = getEditor(condition);
|
||||
childrenConditions = (
|
||||
<Editor condition={condition} onChange={updateCondition} ha={ha} />
|
||||
<Editor
|
||||
condition={condition}
|
||||
onChange={updateCondition}
|
||||
ha={ha}
|
||||
initialViewMode="edit"
|
||||
/>
|
||||
);
|
||||
}
|
||||
// icons
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import "./ConditionNodeSettings.css";
|
||||
|
||||
import { ButtonIcon, ButtonIconProps } from "components/Icons/ButtonIcons";
|
||||
import { FC } from "react";
|
||||
|
||||
import CodeOutlinedIcon from "@mui/icons-material/CodeOutlined";
|
||||
import CodeOffOutlinedIcon from "@mui/icons-material/CodeOffOutlined";
|
||||
import EditOutlinedIcon from "@mui/icons-material/EditOutlined";
|
||||
@@ -8,7 +9,8 @@ import SaveIcon from "@mui/icons-material/Save";
|
||||
import EditOffIcon from "@mui/icons-material/EditOff";
|
||||
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
|
||||
import SettingsApplicationsIcon from "@mui/icons-material/SettingsApplications";
|
||||
import { FC } from "react";
|
||||
|
||||
import { ButtonIcon, ButtonIconProps } from "components/Icons/ButtonIcons";
|
||||
import { SpeedDial } from "components/SpeedDial";
|
||||
|
||||
export type ConditionNodeSettingsProps = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { FC } from "react";
|
||||
import { FC, useState } from "react";
|
||||
import {
|
||||
AutomationCondition,
|
||||
DeviceCondition,
|
||||
@@ -13,7 +13,10 @@ import {
|
||||
import InputNumber from "components/Inputs/InputNumber";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import { InputEntity } from "components/Inputs/InputEntities";
|
||||
import { ConditionNodeBase } from "./ConditionNodeBase";
|
||||
import {
|
||||
ConditionNodeBase,
|
||||
ConditionNodeBaseViewMode,
|
||||
} from "./ConditionNodeBase";
|
||||
import { genUpdateMethods } from "./nestedUpdater";
|
||||
import { InputTime } from "components/Inputs/InputTime";
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
@@ -21,12 +24,20 @@ import { HAService } from "haService";
|
||||
import { DeviceEditor } from "components/DeviceEditor";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import AddIcon from "@mui/icons-material/Add";
|
||||
import { getEntityDomains } from "utils/automations";
|
||||
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
|
||||
import { InputTimeEntity } from "components/Inputs/InputTimeEntity";
|
||||
import { prettyName } from "utils/formatting";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { RemoveCircle } from "@mui/icons-material";
|
||||
|
||||
interface Editor<C extends AutomationCondition>
|
||||
extends FC<{
|
||||
condition: C;
|
||||
onChange: (condition: C) => void;
|
||||
ha: HAService;
|
||||
initialViewMode: ConditionNodeBaseViewMode;
|
||||
}> {}
|
||||
|
||||
export const getEditor = (condition: AutomationCondition): Editor<any> => {
|
||||
@@ -168,6 +179,7 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
||||
export const LogicViewer: Editor<LogicCondition> = ({
|
||||
condition,
|
||||
onChange,
|
||||
initialViewMode,
|
||||
}) => {
|
||||
return (
|
||||
<>
|
||||
@@ -178,6 +190,7 @@ export const LogicViewer: Editor<LogicCondition> = ({
|
||||
condition={c}
|
||||
{...genUpdateMethods(condition, onChange)(i)}
|
||||
disableDelete={false}
|
||||
initialViewMode={initialViewMode}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
@@ -207,10 +220,17 @@ export const LogicViewer: Editor<LogicCondition> = ({
|
||||
export const StateEditor: Editor<StateCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
ha,
|
||||
}) => {
|
||||
const restrictToDomain =
|
||||
!condition.entity_id || condition.entity_id.length === 0
|
||||
? undefined
|
||||
: getEntityDomains(condition.entity_id);
|
||||
|
||||
return (
|
||||
<>
|
||||
<InputEntity
|
||||
restrictToDomain={restrictToDomain}
|
||||
value={condition.entity_id}
|
||||
multiple
|
||||
onChange={(entity_id) =>
|
||||
@@ -220,19 +240,24 @@ export const StateEditor: Editor<StateCondition> = ({
|
||||
})
|
||||
}
|
||||
/>
|
||||
<InputText
|
||||
<InputAutoComplete
|
||||
label="Attribute"
|
||||
value={condition.attribute ?? ""}
|
||||
options={ha.entities.getAttributes(condition.entity_id)}
|
||||
multiple={false}
|
||||
onChange={(attribute) =>
|
||||
onChange({
|
||||
...condition,
|
||||
attribute,
|
||||
attribute: attribute ?? undefined,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<InputText
|
||||
label="State"
|
||||
value={String(condition.state)}
|
||||
placeholder={ha.entities
|
||||
.getStates(condition.entity_id, condition.attribute)
|
||||
.join(" or ")}
|
||||
onChange={(state) =>
|
||||
onChange({
|
||||
...condition,
|
||||
@@ -254,31 +279,86 @@ export const StateEditor: Editor<StateCondition> = ({
|
||||
);
|
||||
};
|
||||
|
||||
type TimeEditorShows = "after" | "before" | "weekday";
|
||||
export const TimeEditor: Editor<TimeCondition> = ({ onChange, condition }) => {
|
||||
const [shows, setShows] = useState<TimeEditorShows[]>(
|
||||
Object.keys(condition).filter((k) =>
|
||||
["after", "before", "weekday"].includes(k)
|
||||
) as any
|
||||
);
|
||||
return (
|
||||
<>
|
||||
<InputTime
|
||||
label="After"
|
||||
value={condition.after}
|
||||
onChange={(after) =>
|
||||
onChange({
|
||||
...condition,
|
||||
after,
|
||||
})
|
||||
<div className="condition-node--time-editor">
|
||||
{shows.map((show) => {
|
||||
if (show === "after" || show === "before") {
|
||||
return (
|
||||
<div className="condition-node--time-editor--ba" key={show}>
|
||||
<b className="label">{prettyName(show)}</b>
|
||||
<InputTimeEntity
|
||||
value={condition[show] ?? ""}
|
||||
onChange={(v) =>
|
||||
onChange({
|
||||
...condition,
|
||||
[show]: v,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<Button
|
||||
className="remove"
|
||||
onClick={() => {
|
||||
setShows(shows.filter((k) => k !== show));
|
||||
const upd = { ...condition };
|
||||
delete upd[show];
|
||||
onChange({ ...upd });
|
||||
}}
|
||||
>
|
||||
<RemoveCircle />
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<div>
|
||||
<InputAutoComplete
|
||||
label="Weekday"
|
||||
value={condition.weekday ?? []}
|
||||
multiple={true}
|
||||
getID={(opt) => opt}
|
||||
getLabel={(opt) => {
|
||||
return {
|
||||
mon: "Monday",
|
||||
tue: "Tuesday",
|
||||
wed: "Wednesday",
|
||||
thu: "Thursday",
|
||||
fri: "Friday",
|
||||
sat: "Saturday",
|
||||
sun: "Sunday",
|
||||
}[opt];
|
||||
}}
|
||||
onChange={(weekday: any) =>
|
||||
onChange({
|
||||
...condition,
|
||||
weekday: weekday ?? [],
|
||||
})
|
||||
}
|
||||
options={["mon", "tue", "wed", "thu", "fri", "sat", "sun"]}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
/>
|
||||
<InputTime
|
||||
label="Before"
|
||||
value={condition.before}
|
||||
onChange={(before) =>
|
||||
onChange({
|
||||
...condition,
|
||||
before,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
||||
</>
|
||||
})}
|
||||
{shows.length < 3 && (
|
||||
<InputList
|
||||
className="condition-node--time-editor--new"
|
||||
label="Option"
|
||||
options={["after", "before", "weekday"].filter(
|
||||
(k: any) => !shows.includes(k)
|
||||
)}
|
||||
onChange={(k: any) => {
|
||||
setShows(shows.concat([k]));
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -307,12 +387,12 @@ export const ZoneEditor: Editor<ZoneCondition> = ({ onChange, condition }) => {
|
||||
<>
|
||||
<InputEntity
|
||||
label="Zone"
|
||||
value={condition.zone}
|
||||
multiple={false}
|
||||
value={condition.zone ?? []}
|
||||
multiple
|
||||
onChange={(zone) =>
|
||||
onChange({
|
||||
...condition,
|
||||
zone: zone ?? "",
|
||||
zone: zone ?? [],
|
||||
})
|
||||
}
|
||||
restrictToDomain={["zone"]}
|
||||
@@ -329,16 +409,6 @@ export const ZoneEditor: Editor<ZoneCondition> = ({ onChange, condition }) => {
|
||||
}
|
||||
restrictToDomain={["person", "device_tracker"]}
|
||||
/>
|
||||
<InputText
|
||||
label="State"
|
||||
value={String(condition.state)}
|
||||
onChange={(state) =>
|
||||
onChange({
|
||||
...condition,
|
||||
state,
|
||||
})
|
||||
}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
};
|
||||
@@ -9,6 +9,9 @@ export default {
|
||||
title: "ConditionEditor",
|
||||
component: ConditionEditor,
|
||||
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||
args: {
|
||||
initialViewMode: "edit",
|
||||
},
|
||||
} as ComponentMeta<typeof ConditionEditor>;
|
||||
|
||||
const Template: ComponentStory<typeof ConditionEditor> = ({
|
||||
@@ -79,6 +82,29 @@ LogicCondition.args = {
|
||||
],
|
||||
} as AutomationCondition,
|
||||
};
|
||||
export const TimeCondition = Template.bind({});
|
||||
TimeCondition.args = {
|
||||
condition: {
|
||||
condition: "or",
|
||||
conditions: [
|
||||
{
|
||||
condition: "time",
|
||||
},
|
||||
{
|
||||
condition: "time",
|
||||
after: "10:00:00",
|
||||
},
|
||||
{
|
||||
condition: "time",
|
||||
before: "input_datetime.test",
|
||||
},
|
||||
{
|
||||
condition: "time",
|
||||
weekday: ["fri"],
|
||||
},
|
||||
],
|
||||
} as AutomationCondition,
|
||||
};
|
||||
|
||||
export const MultipleConditions: ComponentStory<typeof ConditionEditor> = (
|
||||
args
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
.dag-graphboard {
|
||||
min-height: 100%;
|
||||
min-width: 100%;
|
||||
}
|
||||
|
||||
.dag-graphboard.loading {
|
||||
position: relative;
|
||||
min-height: 100%;
|
||||
min-width: 100%;
|
||||
}
|
||||
|
||||
.dag-graphboard.loading span {
|
||||
|
||||
@@ -22,6 +22,7 @@ export const DAGGraphBoardInner: FC<DAGGraphBoardProps> = ({
|
||||
modalState,
|
||||
state,
|
||||
closeModal,
|
||||
additionalControls,
|
||||
}) => {
|
||||
// render unready or errored states
|
||||
if (!state.ready) {
|
||||
@@ -69,7 +70,9 @@ export const DAGGraphBoardInner: FC<DAGGraphBoardProps> = ({
|
||||
nodesDraggable={false}
|
||||
{...elements}
|
||||
>
|
||||
<Controls showInteractive={false} />
|
||||
<Controls showInteractive={false} showFitView>
|
||||
{additionalControls}
|
||||
</Controls>
|
||||
</ReactFlow>
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -21,6 +21,7 @@ export type DAGGraphBoardProps = {
|
||||
state: DAGGraphBoardState;
|
||||
modalState?: ModalState;
|
||||
closeModal: () => void;
|
||||
additionalControls?: ReactNode;
|
||||
};
|
||||
|
||||
export type ModalState<
|
||||
|
||||
@@ -13,8 +13,8 @@ export const DEFAULT_DIMS: DAGDims = {
|
||||
width: NODE_WIDTH,
|
||||
},
|
||||
distanceFactor: {
|
||||
node: 1.5,
|
||||
collection: 1,
|
||||
node: [1.5, 1.5],
|
||||
collection: [1.2, 1.1],
|
||||
},
|
||||
position: {
|
||||
x: 50,
|
||||
|
||||
@@ -9,11 +9,11 @@ export const moveAlong = (
|
||||
reversed: boolean = false
|
||||
): XYPosition => {
|
||||
const moveOnY = {
|
||||
y: startPoint.y + dims[by].height * dims.distanceFactor.node * increment,
|
||||
y: startPoint.y + dims[by].height * dims.distanceFactor[by][0] * increment,
|
||||
x: startPoint.x,
|
||||
};
|
||||
const moveOnX = {
|
||||
x: startPoint.x + dims[by].width * dims.distanceFactor.node * increment,
|
||||
x: startPoint.x + dims[by].width * dims.distanceFactor[by][1] * increment,
|
||||
y: startPoint.y,
|
||||
};
|
||||
if (reversed) {
|
||||
@@ -30,11 +30,15 @@ export const moveAlongRelativeTo = (
|
||||
) =>
|
||||
dims.flipped
|
||||
? {
|
||||
x: relatedPos.x + dims.distanceFactor.node * dims[incrementBy].width,
|
||||
x:
|
||||
relatedPos.x +
|
||||
dims.distanceFactor[incrementBy][0] * dims[incrementBy].width,
|
||||
y: offsetPos.y,
|
||||
}
|
||||
: {
|
||||
y: relatedPos.y + dims.distanceFactor.node * dims[incrementBy].height,
|
||||
y:
|
||||
relatedPos.y +
|
||||
dims.distanceFactor[incrementBy][1] * dims[incrementBy].height,
|
||||
x: offsetPos.x,
|
||||
};
|
||||
|
||||
@@ -42,16 +46,21 @@ export const moveFromTo = (
|
||||
from: keyof DAGEntities,
|
||||
to: keyof DAGEntities,
|
||||
startPoint: XYPosition,
|
||||
dims: DAGDims
|
||||
dims: DAGDims,
|
||||
byFrom: boolean = false
|
||||
): XYPosition => {
|
||||
if (!dims.flipped) {
|
||||
return {
|
||||
x: startPoint.x + dims[from].width * dims.distanceFactor.collection,
|
||||
x:
|
||||
startPoint.x +
|
||||
dims[from].width * dims.distanceFactor[byFrom ? from : to][0],
|
||||
y: startPoint.y + (dims[from].height - dims[to].height) / 2,
|
||||
};
|
||||
} else {
|
||||
return {
|
||||
y: startPoint.y + dims[from].height * dims.distanceFactor.collection,
|
||||
y:
|
||||
startPoint.y +
|
||||
dims[from].height * dims.distanceFactor[byFrom ? from : to][1],
|
||||
x: startPoint.x + (dims[from].width - dims[to].width) / 2,
|
||||
};
|
||||
}
|
||||
@@ -62,6 +71,6 @@ export const offsetBy = (
|
||||
position: XYPosition,
|
||||
dims: DAGDims
|
||||
): XYPosition => ({
|
||||
x: position.x + dims.distanceFactor[by] * dims[by].width,
|
||||
y: position.y + dims.distanceFactor[by] * dims[by].height,
|
||||
x: position.x + dims.distanceFactor[by][0] * 0.9 * dims[by].width,
|
||||
y: position.y + dims.distanceFactor[by][1] * 0.9 * dims[by].height,
|
||||
});
|
||||
@@ -0,0 +1,135 @@
|
||||
import { XYPosition } from "react-flow-renderer";
|
||||
|
||||
import AddBox from "@mui/icons-material/AddBox";
|
||||
|
||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
||||
import { validateNode } from "utils/automations";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { AutomationTrigger } from "types/automations/triggers";
|
||||
|
||||
import { DAGDims, ElementMaker, ElementMakerProps } from "./types";
|
||||
import { DAGElementsOutputState } from "./outputState";
|
||||
import { convertFailuresToSequenceNodeDataProps } from "./util";
|
||||
|
||||
import { ButtonNodeMaker } from "../nodes/ButtonNode";
|
||||
import { CollectionNodeMaker } from "../nodes/CollectionNode";
|
||||
|
||||
export const makeTriggerNodes: ElementMaker<AutomationTrigger> = (
|
||||
nodes,
|
||||
{ dims, namer, stateUpdater, nodeId, position }
|
||||
) => {
|
||||
const outputState = new DAGElementsOutputState(position, dims);
|
||||
outputState.addNode(
|
||||
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
|
||||
...dims.collection,
|
||||
collectionType: "trigger",
|
||||
onAddNode: () => stateUpdater.basic.trigger.addNode(null),
|
||||
nodes: nodes.map((node, index) => {
|
||||
const failures = validateNode(node, ["trigger"]);
|
||||
|
||||
if (failures) {
|
||||
return {
|
||||
enabled: node.enabled ?? true,
|
||||
...stateUpdater.createNodeActions("trigger", index, {}),
|
||||
...convertFailuresToSequenceNodeDataProps(failures),
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
enabled: node.enabled ?? true,
|
||||
label: getDescriptionFromAutomationNode(node, namer, true),
|
||||
...stateUpdater.createNodeActions("trigger", index, {}),
|
||||
};
|
||||
}),
|
||||
})
|
||||
);
|
||||
return outputState;
|
||||
};
|
||||
|
||||
export const makeConditionNodes: ElementMaker<AutomationCondition> = (
|
||||
nodes,
|
||||
{ nodeId, stateUpdater, position, dims, namer, lastNodeId }
|
||||
) => {
|
||||
const outputState = new DAGElementsOutputState(position, dims);
|
||||
outputState.addNode(
|
||||
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
|
||||
...dims.collection,
|
||||
collectionType: "condition",
|
||||
hasInput: !!lastNodeId,
|
||||
onAddNode: () => stateUpdater.basic.condition.addNode(null),
|
||||
nodes: nodes.map((node, index) => {
|
||||
const failures = validateNode(node, ["condition"]);
|
||||
|
||||
if (failures) {
|
||||
return {
|
||||
enabled: node.enabled ?? true,
|
||||
...stateUpdater.createNodeActions("condition", index, {}),
|
||||
...convertFailuresToSequenceNodeDataProps(failures),
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
enabled: node.enabled ?? true,
|
||||
label: getDescriptionFromAutomationNode(node, namer, true),
|
||||
...stateUpdater.createNodeActions("condition", index, {}),
|
||||
};
|
||||
}),
|
||||
})
|
||||
);
|
||||
if (lastNodeId && outputState.lastNodeId) {
|
||||
outputState.addEdge(lastNodeId, outputState.lastNodeId, { animated: true });
|
||||
}
|
||||
return outputState;
|
||||
};
|
||||
|
||||
type MakeAddButtonArgs = {
|
||||
position: XYPosition;
|
||||
nodeId: string;
|
||||
outputState: DAGElementsOutputState;
|
||||
dims: DAGDims;
|
||||
onClick: () => void;
|
||||
};
|
||||
export const makeAddButton = (args: MakeAddButtonArgs) => {
|
||||
const addElement = args.outputState.addNode(
|
||||
ButtonNodeMaker.makeElement(
|
||||
{
|
||||
id: `${args.nodeId}-add-new`,
|
||||
position: args.position,
|
||||
},
|
||||
args.dims,
|
||||
{
|
||||
text: "Option",
|
||||
icon: <AddBox />,
|
||||
onClick: args.onClick,
|
||||
}
|
||||
)
|
||||
);
|
||||
args.outputState.addEdge(args.nodeId, addElement.id, {
|
||||
animated: true,
|
||||
sourceHandle: "side",
|
||||
});
|
||||
};
|
||||
|
||||
type DrawConditionArgs = {
|
||||
conditions: AutomationCondition[];
|
||||
args: ElementMakerProps;
|
||||
onRemove: () => void;
|
||||
};
|
||||
export const drawCondition = ({
|
||||
conditions,
|
||||
onRemove,
|
||||
args,
|
||||
}: DrawConditionArgs) => {
|
||||
const conditionState = makeConditionNodes(conditions, args);
|
||||
(conditionState.data.nodes[0].data as any).title = `Option ${
|
||||
args.nodeIndex + 1
|
||||
}`;
|
||||
|
||||
(conditionState.data.nodes[0].data as any).onDelete = onRemove;
|
||||
conditionState.data.edges[0].sourceHandle = `side`;
|
||||
conditionState.data.edges[0].label = args.nodeIndex > 0 ? "else if" : "if";
|
||||
conditionState.data.edges[0].style = {
|
||||
stroke: "var(--mui-info-main)",
|
||||
};
|
||||
return conditionState;
|
||||
};
|
||||
@@ -468,3 +468,52 @@ ParallelAuto.args = {
|
||||
],
|
||||
},
|
||||
};
|
||||
|
||||
export const BadNodes = Template.bind({});
|
||||
BadNodes.args = {
|
||||
...BadNodes.args,
|
||||
automation: {
|
||||
condition: [
|
||||
{
|
||||
event: "triggerme",
|
||||
},
|
||||
{
|
||||
condition: "and",
|
||||
thisshouldnotbehere: "1",
|
||||
conditions: "1234",
|
||||
},
|
||||
] as any,
|
||||
trigger: [
|
||||
{ platform: "homeassistant" },
|
||||
{ platfom: "bobid" },
|
||||
{ condition: "and" },
|
||||
"text?",
|
||||
] as any,
|
||||
sequence: [
|
||||
{
|
||||
parallel: {
|
||||
bad: "me",
|
||||
},
|
||||
},
|
||||
{
|
||||
platform: "event",
|
||||
},
|
||||
] as any,
|
||||
},
|
||||
};
|
||||
|
||||
export const IfElseNode = Template.bind({});
|
||||
IfElseNode.args = {
|
||||
...IfElseNode.args,
|
||||
automation: {
|
||||
condition: [],
|
||||
trigger: [],
|
||||
sequence: [
|
||||
{
|
||||
if: [],
|
||||
else: [],
|
||||
then: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
@@ -1,29 +1,30 @@
|
||||
import { DAGDims, ElementMaker, ElementMakerBaseProps } from "./types";
|
||||
import { AutomationTrigger } from "types/automations/triggers";
|
||||
import * as distance from "./distance";
|
||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
||||
import {
|
||||
AutomationActionData,
|
||||
AutomationSequenceNode,
|
||||
} from "types/automations";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { CollectionNodeMaker } from "../nodes/CollectionNode";
|
||||
import { XYPosition } from "react-flow-renderer";
|
||||
import { DAGElementsOutputState } from "./outputState";
|
||||
import { SequenceNodeMaker } from "../nodes/SequenceNode";
|
||||
import {
|
||||
getNodeType,
|
||||
convertScriptConditionFieldToAutomationConditions,
|
||||
validateNode,
|
||||
} from "utils/automations";
|
||||
import { ButtonNodeMaker } from "../nodes/ButtonNode";
|
||||
import { AddIcon } from "components/Icons";
|
||||
import { useDAGElementsState } from "./state";
|
||||
import AddBox from "@mui/icons-material/AddBox";
|
||||
import { DAGGraphChooseUpdater, DAGGraphUpdater } from "../updater";
|
||||
import { DAGGraphChooseUpdater } from "../updater";
|
||||
import { getSpecialNodeMaker, makeSpecialNodeMaker } from "./specialnodes";
|
||||
import { getNodeSubType } from "../../../utils/automations";
|
||||
import DeleteForeverIcon from "@mui/icons-material/DeleteForever";
|
||||
import Add from "@mui/icons-material/Add";
|
||||
import { SequenceNodeDataProps } from "../nodes/SequenceNode/types";
|
||||
import { convertFailuresToSequenceNodeDataProps } from "./util";
|
||||
import { convertChooseActionToOrignal } from "../updater/util";
|
||||
import * as helpers from "./helpers";
|
||||
|
||||
export const useAutomationNodes = (
|
||||
automation: AutomationActionData,
|
||||
@@ -35,7 +36,7 @@ export const useAutomationNodes = (
|
||||
const state = useDAGElementsState();
|
||||
const outputState = new DAGElementsOutputState(dims.position, dims);
|
||||
outputState.extend(
|
||||
makeTriggerNodes(automation.trigger, {
|
||||
helpers.makeTriggerNodes(automation.trigger, {
|
||||
...args,
|
||||
state,
|
||||
dims,
|
||||
@@ -44,9 +45,8 @@ export const useAutomationNodes = (
|
||||
nodeIndex: 0,
|
||||
})
|
||||
);
|
||||
|
||||
outputState.extend(
|
||||
makeConditionNodes(automation.condition, {
|
||||
helpers.makeConditionNodes(automation.condition, {
|
||||
...args,
|
||||
state,
|
||||
dims,
|
||||
@@ -71,7 +71,8 @@ export const useAutomationNodes = (
|
||||
"collection",
|
||||
"node",
|
||||
outputState.getLastNodePos(),
|
||||
dims
|
||||
dims,
|
||||
true
|
||||
),
|
||||
nodeId: `${dims.flipped}-sequence`,
|
||||
nodeIndex: 2,
|
||||
@@ -82,50 +83,6 @@ export const useAutomationNodes = (
|
||||
return outputState.data;
|
||||
};
|
||||
|
||||
export const makeTriggerNodes: ElementMaker<AutomationTrigger> = (
|
||||
nodes,
|
||||
{ dims, namer, stateUpdater, nodeId, position }
|
||||
) => {
|
||||
const outputState = new DAGElementsOutputState(position, dims);
|
||||
outputState.addNode(
|
||||
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
|
||||
...dims.collection,
|
||||
collectionType: "trigger",
|
||||
onAddNode: () => stateUpdater.basic.trigger.addNode(null),
|
||||
nodes: nodes.map((node, index) => ({
|
||||
enabled: node.enabled ?? true,
|
||||
label: getDescriptionFromAutomationNode(node, namer, true),
|
||||
...stateUpdater.createNodeActions("trigger", index, {}),
|
||||
})),
|
||||
})
|
||||
);
|
||||
return outputState;
|
||||
};
|
||||
|
||||
export const makeConditionNodes: ElementMaker<AutomationCondition> = (
|
||||
nodes,
|
||||
{ nodeId, stateUpdater, position, dims, namer, lastNodeId }
|
||||
) => {
|
||||
const outputState = new DAGElementsOutputState(position, dims);
|
||||
outputState.addNode(
|
||||
CollectionNodeMaker.makeElement({ id: nodeId, position }, dims, {
|
||||
...dims.collection,
|
||||
collectionType: "condition",
|
||||
hasInput: !!lastNodeId,
|
||||
onAddNode: () => stateUpdater.basic.condition.addNode(null),
|
||||
nodes: nodes.map((node, index) => ({
|
||||
enabled: node.enabled ?? true,
|
||||
label: getDescriptionFromAutomationNode(node, namer, true),
|
||||
...stateUpdater.createNodeActions("condition", index, {}),
|
||||
})),
|
||||
})
|
||||
);
|
||||
if (lastNodeId && outputState.lastNodeId) {
|
||||
outputState.addEdge(lastNodeId, outputState.lastNodeId, { animated: true });
|
||||
}
|
||||
return outputState;
|
||||
};
|
||||
|
||||
export const makeSequenceNodes: ElementMaker<AutomationSequenceNode> = (
|
||||
nodes,
|
||||
args
|
||||
@@ -134,10 +91,25 @@ export const makeSequenceNodes: ElementMaker<AutomationSequenceNode> = (
|
||||
const outputState = new DAGElementsOutputState(position, dims);
|
||||
nodes.forEach((node, nodeIndex) => {
|
||||
// the JSON.stringify is hack to make the edges render nicely
|
||||
const nodeId = `${args.nodeId}-${
|
||||
args.nodeIndex
|
||||
}-${nodeIndex}-${JSON.stringify(node)}`;
|
||||
outputState.incNextPos("node");
|
||||
const nodeId = `${args.nodeId}-${args.nodeIndex}-${nodeIndex}`;
|
||||
let nodeData: SequenceNodeDataProps = {
|
||||
color: getNodeType(node) === "action" ? "green" : "blue",
|
||||
enabled: node.enabled ?? true,
|
||||
label: getDescriptionFromAutomationNode(node, namer, true),
|
||||
...state.getIsClosedActions(nodeId, node),
|
||||
...stateUpdater.createNodeActions("sequence", nodeIndex, {
|
||||
includeAdd: true,
|
||||
flipped: dims.flipped,
|
||||
}),
|
||||
};
|
||||
const failures = validateNode(node, ["action", "condition"]);
|
||||
if (failures) {
|
||||
nodeData = {
|
||||
...nodeData,
|
||||
...convertFailuresToSequenceNodeDataProps(failures),
|
||||
};
|
||||
}
|
||||
const element = outputState.addNode(
|
||||
SequenceNodeMaker.makeElement(
|
||||
{
|
||||
@@ -145,49 +117,38 @@ export const makeSequenceNodes: ElementMaker<AutomationSequenceNode> = (
|
||||
position: outputState.nextPos,
|
||||
},
|
||||
dims,
|
||||
{
|
||||
color: getNodeType(node) === "action" ? "green" : "blue",
|
||||
enabled: node.enabled ?? true,
|
||||
label: getDescriptionFromAutomationNode(node, namer, true),
|
||||
...state.getIsClosedActions(nodeId, node),
|
||||
...stateUpdater.createNodeActions("sequence", nodeIndex, {
|
||||
includeAdd: true,
|
||||
flipped: dims.flipped,
|
||||
}),
|
||||
}
|
||||
nodeData
|
||||
),
|
||||
true
|
||||
);
|
||||
if (nodeIndex === 0 && lastNodeId) {
|
||||
outputState.addEdge(lastNodeId, element.id);
|
||||
}
|
||||
const specialNodeMaker = getSpecialNodeMaker(
|
||||
getNodeSubType(node, true) as any
|
||||
);
|
||||
if (specialNodeMaker) {
|
||||
outputState.extend(
|
||||
specialNodeMaker([node] as any, {
|
||||
...args,
|
||||
nodeId,
|
||||
lastNodeId: element.id,
|
||||
position: outputState.getLastNodePos(),
|
||||
nodeIndex,
|
||||
}),
|
||||
true
|
||||
if (!failures) {
|
||||
const specialNodeMaker = getSpecialNodeMaker(
|
||||
getNodeSubType(node, true) as any
|
||||
);
|
||||
if (specialNodeMaker) {
|
||||
outputState.extend(
|
||||
specialNodeMaker([node] as any, {
|
||||
...args,
|
||||
nodeId,
|
||||
lastNodeId: element.id,
|
||||
position: outputState.getLastNodePos(),
|
||||
nodeIndex,
|
||||
}),
|
||||
true
|
||||
);
|
||||
}
|
||||
}
|
||||
outputState.incNextPos("node");
|
||||
});
|
||||
|
||||
const addElement = outputState.addNode(
|
||||
ButtonNodeMaker.makeElement(
|
||||
{
|
||||
id: `${args.nodeId}-add-new`,
|
||||
position: distance.moveAlong(
|
||||
"node",
|
||||
outputState.getLastNodePos(position),
|
||||
1,
|
||||
dims
|
||||
),
|
||||
position: outputState.nextPos,
|
||||
},
|
||||
dims,
|
||||
{
|
||||
@@ -207,51 +168,19 @@ export const makeSequenceNodes: ElementMaker<AutomationSequenceNode> = (
|
||||
|
||||
export const makeChooseeNodes = makeSpecialNodeMaker(
|
||||
"choose",
|
||||
(node, outputState, args) => {
|
||||
(incmNode, outputState, args) => {
|
||||
const node = convertChooseActionToOrignal(incmNode);
|
||||
// offset position
|
||||
let offsetPos: XYPosition = distance.offsetBy(
|
||||
"node",
|
||||
args.position,
|
||||
args.dims
|
||||
);
|
||||
let pos: XYPosition = distance.offsetBy("node", args.position, args.dims);
|
||||
let lastConditionState: DAGElementsOutputState | null = null;
|
||||
// functions
|
||||
const drawCondition = (
|
||||
{ stateUpdater, onRemove }: DAGGraphChooseUpdater,
|
||||
position: XYPosition,
|
||||
lastNodeId: string | undefined,
|
||||
nodeIndex: number,
|
||||
conditions: AutomationCondition[]
|
||||
) => {
|
||||
const conditionState = makeConditionNodes(conditions, {
|
||||
...args,
|
||||
stateUpdater,
|
||||
position,
|
||||
lastNodeId,
|
||||
nodeIndex,
|
||||
nodeId: `${args.nodeId}-choose-${nodeIndex}-condition`,
|
||||
});
|
||||
lastConditionState = conditionState;
|
||||
(conditionState.data.nodes[0].data as any).title = `Option ${
|
||||
nodeIndex + 1
|
||||
}`;
|
||||
|
||||
(conditionState.data.nodes[0].data as any).onDelete = onRemove;
|
||||
conditionState.data.edges[0].sourceHandle = `side`;
|
||||
conditionState.data.edges[0].label = `Option ${nodeIndex + 1}`;
|
||||
conditionState.data.edges[0].style = {
|
||||
stroke: "var(--mui-info-main)",
|
||||
};
|
||||
outputState.extend(conditionState);
|
||||
return conditionState;
|
||||
};
|
||||
const drawSequence = (
|
||||
{ stateUpdater }: DAGGraphChooseUpdater,
|
||||
position: XYPosition,
|
||||
lastNodeId: string | undefined,
|
||||
nodeIndex: number,
|
||||
sequence: AutomationSequenceNode[],
|
||||
label: "else" | undefined
|
||||
isElse: boolean = false
|
||||
) => {
|
||||
const output = makeSequenceNodes(sequence, {
|
||||
...args,
|
||||
@@ -264,8 +193,8 @@ export const makeChooseeNodes = makeSpecialNodeMaker(
|
||||
if (lastNodeId && output.data.nodes.length > 0) {
|
||||
outputState.addEdge(lastNodeId, output.data.nodes[0].id, {
|
||||
animated: true,
|
||||
label,
|
||||
sourceHandle: label === "else" ? "side" : undefined,
|
||||
label: isElse ? "else" : "then",
|
||||
sourceHandle: isElse ? "side" : undefined,
|
||||
style: {
|
||||
stroke: "var(--mui-error-main)",
|
||||
zIndex: -1,
|
||||
@@ -277,33 +206,36 @@ export const makeChooseeNodes = makeSpecialNodeMaker(
|
||||
|
||||
// process options
|
||||
for (let sIndex = 0; sIndex < node.choose.length; sIndex++) {
|
||||
const stateUpdater = args.stateUpdater.createChoosNodeUpdater(
|
||||
args.nodeIndex,
|
||||
sIndex
|
||||
);
|
||||
let pos = offsetPos;
|
||||
const { stateUpdater, onRemove } =
|
||||
args.stateUpdater.createChoosNodeUpdater(args.nodeIndex, sIndex);
|
||||
// let pos = offsetPos;
|
||||
let lastNodeId = args.lastNodeId;
|
||||
const conditionState = drawCondition(
|
||||
stateUpdater,
|
||||
pos,
|
||||
lastNodeId,
|
||||
sIndex,
|
||||
node.choose[sIndex].conditions
|
||||
);
|
||||
pos = distance.moveFromTo("collection", "node", pos, args.dims);
|
||||
const conditionState = helpers.drawCondition({
|
||||
conditions: node.choose[sIndex].conditions,
|
||||
onRemove,
|
||||
args: {
|
||||
...args,
|
||||
stateUpdater,
|
||||
position: pos,
|
||||
lastNodeId,
|
||||
nodeIndex: sIndex,
|
||||
nodeId: `${args.nodeId}-choose-${sIndex}-condition`,
|
||||
},
|
||||
});
|
||||
outputState.extend(conditionState);
|
||||
lastConditionState = conditionState;
|
||||
lastNodeId = conditionState.lastNodeId;
|
||||
const sequence = node.choose[sIndex].sequence;
|
||||
const output = drawSequence(
|
||||
stateUpdater,
|
||||
pos,
|
||||
{ stateUpdater, onRemove },
|
||||
distance.moveFromTo("collection", "node", pos, args.dims),
|
||||
lastNodeId,
|
||||
sIndex,
|
||||
sequence,
|
||||
undefined
|
||||
);
|
||||
offsetPos = distance.moveAlongRelativeTo(
|
||||
offsetPos,
|
||||
pos = distance.moveAlongRelativeTo(
|
||||
pos,
|
||||
output.bbox[1],
|
||||
args.dims,
|
||||
"collection"
|
||||
@@ -311,40 +243,9 @@ export const makeChooseeNodes = makeSpecialNodeMaker(
|
||||
outputState.extend(output);
|
||||
}
|
||||
|
||||
// else
|
||||
const stateUpdater = args.stateUpdater.createChoosNodeUpdater(
|
||||
args.nodeIndex,
|
||||
"else"
|
||||
);
|
||||
let pos = offsetPos;
|
||||
let lastNodeId = args.lastNodeId;
|
||||
const elseOutput = drawSequence(
|
||||
stateUpdater,
|
||||
pos,
|
||||
lastNodeId,
|
||||
node.choose.length,
|
||||
node.default ?? [],
|
||||
"else"
|
||||
);
|
||||
offsetPos = distance.moveAlongRelativeTo(
|
||||
offsetPos,
|
||||
elseOutput.bbox[1],
|
||||
args.dims,
|
||||
"node"
|
||||
);
|
||||
outputState.extend(elseOutput);
|
||||
|
||||
// add btn
|
||||
let addPos = distance.moveAlong(
|
||||
"node",
|
||||
elseOutput.data.nodes[0].position,
|
||||
1 / args.dims.distanceFactor.node,
|
||||
args.dims,
|
||||
true
|
||||
);
|
||||
console.log({ addPos, lastConditionState });
|
||||
if (lastConditionState !== null) {
|
||||
addPos = distance.moveFromTo(
|
||||
pos = distance.moveFromTo(
|
||||
"collection",
|
||||
"node",
|
||||
(lastConditionState as DAGElementsOutputState).nextPos,
|
||||
@@ -354,37 +255,42 @@ export const makeChooseeNodes = makeSpecialNodeMaker(
|
||||
}
|
||||
);
|
||||
}
|
||||
const addElement = outputState.addNode(
|
||||
ButtonNodeMaker.makeElement(
|
||||
{
|
||||
id: `${args.nodeId}-choose-add-new`,
|
||||
position: addPos,
|
||||
},
|
||||
args.dims,
|
||||
{
|
||||
text: "Option",
|
||||
icon: <AddBox />,
|
||||
onClick: () =>
|
||||
args.stateUpdater.basic.sequence.updateNode(
|
||||
helpers.makeAddButton({
|
||||
outputState,
|
||||
dims: args.dims,
|
||||
nodeId: args.nodeId,
|
||||
position: pos,
|
||||
onClick: () =>
|
||||
args.stateUpdater.basic.sequence.updateNode(
|
||||
{
|
||||
...node,
|
||||
choose: [
|
||||
...node.choose,
|
||||
{
|
||||
...node,
|
||||
choose: [
|
||||
...node.choose,
|
||||
{
|
||||
conditions: [],
|
||||
sequence: [],
|
||||
},
|
||||
],
|
||||
conditions: [],
|
||||
sequence: [],
|
||||
},
|
||||
args.nodeIndex
|
||||
),
|
||||
}
|
||||
)
|
||||
);
|
||||
outputState.addEdge(args.nodeId, addElement.id, {
|
||||
animated: true,
|
||||
sourceHandle: "side",
|
||||
],
|
||||
},
|
||||
args.nodeIndex
|
||||
),
|
||||
});
|
||||
|
||||
// else
|
||||
const stateUpdater = args.stateUpdater.createChoosNodeUpdater(
|
||||
args.nodeIndex,
|
||||
"else"
|
||||
);
|
||||
let lastNodeId = args.lastNodeId;
|
||||
const elseOutput = drawSequence(
|
||||
stateUpdater,
|
||||
distance.moveAlong("node", pos, 1, args.dims, true),
|
||||
lastNodeId,
|
||||
node.choose.length,
|
||||
node.default ?? [],
|
||||
true
|
||||
);
|
||||
outputState.extend(elseOutput);
|
||||
}
|
||||
);
|
||||
|
||||
@@ -407,7 +313,7 @@ export const makeRepeatNodes = makeSpecialNodeMaker(
|
||||
|
||||
// while
|
||||
if ("while" in node.repeat) {
|
||||
whileState = makeConditionNodes(
|
||||
whileState = helpers.makeConditionNodes(
|
||||
convertScriptConditionFieldToAutomationConditions(node.repeat.while),
|
||||
{
|
||||
...args,
|
||||
@@ -458,7 +364,7 @@ export const makeRepeatNodes = makeSpecialNodeMaker(
|
||||
);
|
||||
// until
|
||||
if ("until" in node.repeat) {
|
||||
untilState = makeConditionNodes(
|
||||
untilState = helpers.makeConditionNodes(
|
||||
convertScriptConditionFieldToAutomationConditions(node.repeat.until),
|
||||
{
|
||||
...args,
|
||||
@@ -556,18 +462,19 @@ export const makeParallelNodes = makeSpecialNodeMaker(
|
||||
{
|
||||
icon: <Add />,
|
||||
onClick: () =>
|
||||
args.stateUpdater.basic.sequence.updateNode(
|
||||
{
|
||||
...node,
|
||||
parallel: [
|
||||
...node.parallel,
|
||||
args.openModal({
|
||||
allowedTypes: ["condition", "action"],
|
||||
node: args.stateUpdater.basic.sequence.defaultNode,
|
||||
saveBtnCreateText: true,
|
||||
update: (n) =>
|
||||
args.stateUpdater.basic.sequence.updateNode(
|
||||
{
|
||||
sequence: [],
|
||||
...node,
|
||||
parallel: [...node.parallel, n],
|
||||
},
|
||||
],
|
||||
},
|
||||
args.nodeIndex
|
||||
),
|
||||
args.nodeIndex
|
||||
),
|
||||
}),
|
||||
}
|
||||
);
|
||||
outputState.addNode(addBtn);
|
||||
|
||||
@@ -105,6 +105,6 @@ export class DAGElementsOutputState {
|
||||
if (!this.lastNode) {
|
||||
return;
|
||||
}
|
||||
this.nextPos = moveAlong(by, this.nextPos, 1, this.dims);
|
||||
this.nextPos = moveAlong(by, this.nextPos, 0.5, this.dims);
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import { AutomationNodeSubtype } from "types/automations";
|
||||
import { ActionType, ActionTypeMapping } from "types/automations/actions";
|
||||
import { DAGElementsOutputState } from "./outputState";
|
||||
import { ElementMaker, ElementMakerProps } from "./types";
|
||||
@@ -41,3 +42,6 @@ export const makeSpecialNodeMaker = <
|
||||
export const getSpecialNodeMaker = <AT extends ActionType>(
|
||||
nodeType: AT
|
||||
): ElementMaker<AT> | null => SpecialNodeRegistry[nodeType] ?? null;
|
||||
|
||||
export const isSpecialNode = (nodeType: AutomationNodeSubtype) =>
|
||||
nodeType in SpecialNodeRegistry;
|
||||
@@ -1,5 +1,7 @@
|
||||
import { useState } from "react";
|
||||
import { AutomationNode } from "types/automations";
|
||||
import { isSpecialNode } from "./specialnodes";
|
||||
import { getNodeSubType } from "utils/automations";
|
||||
|
||||
export type DAGNodeState = Partial<{
|
||||
isClosed: boolean;
|
||||
@@ -27,7 +29,7 @@ export const useDAGElementsState = () => {
|
||||
},
|
||||
|
||||
getIsClosedActions(nodeId: string, node: AutomationNode) {
|
||||
if ("choose" in node || "repeat" in node) {
|
||||
if (isSpecialNode(getNodeSubType(node))) {
|
||||
return {
|
||||
isClosed: this.get(nodeId).isClosed ?? false,
|
||||
setIsClosed: (v: boolean) => this.set(nodeId, "isClosed", v),
|
||||
|
||||
@@ -20,7 +20,7 @@ export type DAGEntities = {
|
||||
};
|
||||
export type DAGDims = DAGEntities & {
|
||||
position: XYPosition;
|
||||
distanceFactor: Record<keyof DAGEntities, number>;
|
||||
distanceFactor: Record<keyof DAGEntities, [number, number]>;
|
||||
flipped: boolean;
|
||||
};
|
||||
export type ElementMakerBaseProps = {
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
import { MiniFailure } from "types/validators/helper";
|
||||
import { SequenceNodeColor } from "../nodes/SequenceNode/types";
|
||||
import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
|
||||
|
||||
export const convertFailuresToSequenceNodeDataProps = (
|
||||
failures: MiniFailure[]
|
||||
) => {
|
||||
return {
|
||||
label: (
|
||||
<>
|
||||
<InfoOutlinedIcon />
|
||||
<div className="daggraph--error">
|
||||
{failures.map((f, i) => (
|
||||
<span key={i}>{f.message}</span>
|
||||
))}
|
||||
</div>
|
||||
</>
|
||||
),
|
||||
color: "error" as SequenceNodeColor,
|
||||
};
|
||||
};
|
||||
@@ -1,49 +0,0 @@
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
import { FC } from "react";
|
||||
import { DAGGraphBoardProps } from "../board/types";
|
||||
|
||||
export const ErroredBoard: FC<
|
||||
DAGGraphBoardProps & {
|
||||
error: Error | any;
|
||||
}
|
||||
> = (props) => {
|
||||
// const makeSet = <K extends keyof FailedStateData>(k: K) => (d: FailedStateData[K]) => this.setState({
|
||||
// ...this.state,
|
||||
// [k]: d,
|
||||
// });
|
||||
// const makeSave = <K extends keyof FailedStateData>(k: K) => () => {
|
||||
// if (!this.state.hasError) {
|
||||
// return
|
||||
// }
|
||||
// if (k === 'condition') {
|
||||
// this.props.onConditionUpdate(this.state.condition)
|
||||
// } else if (k === 'sequence') {
|
||||
// this.props.onSequenceUpdate(this.state.sequence)
|
||||
// } else if (k === 'trigger') {
|
||||
// this.props.onTriggerUpdate(this.state.trigger)
|
||||
// }
|
||||
// }
|
||||
return (
|
||||
<div className="dag-flow-safe">
|
||||
<h1>An Error has occured.</h1>
|
||||
<h1>Failed to Open Autmation!</h1>
|
||||
Something is likely not configured in your automation properly.
|
||||
<hr />
|
||||
<h2>Error:</h2>
|
||||
{/* <h2>{String(this.state.error)}</h2> */}
|
||||
<br />
|
||||
{/* {JSON.stringify(this.state.error, null, 4)} */}
|
||||
{/* {this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
|
||||
<span key={i}>{s}</span><br key={`br-${i}`} />
|
||||
</>)} */}
|
||||
<h2>Automation YAML</h2>
|
||||
{/* <InputYaml label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
|
||||
<Button onClick={makeSave('trigger')}>Save Triggers</Button>
|
||||
<InputYaml label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
|
||||
<Button onClick={makeSave('condition')}>Save Conditions</Button>
|
||||
<InputYaml label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
|
||||
<Button onClick={makeSave('sequence')}>Save Actions</Button> */}
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -1,8 +1,5 @@
|
||||
import { FC, useState } from "react";
|
||||
import {
|
||||
AutomationActionData,
|
||||
AutomationSequenceNode,
|
||||
} from "types/automations";
|
||||
import { FC, useState, ReactNode } from "react";
|
||||
import { AutomationSequenceNode } from "types/automations";
|
||||
import { useHA } from "haService";
|
||||
import { ModalState } from "./board/types";
|
||||
import { createUpdater } from "./updater";
|
||||
@@ -20,7 +17,9 @@ export const DAGAutomationGraph: FC<{
|
||||
onTriggerUpdate: (t: AutomationTrigger[]) => void;
|
||||
onConditionUpdate: (c: AutomationCondition[]) => void;
|
||||
isFlipped: boolean;
|
||||
additionalControls?: ReactNode;
|
||||
}> = (props) => {
|
||||
console.log({ props });
|
||||
const { namer } = useHA();
|
||||
const [modalState, setModalState] =
|
||||
useState<ModalState | undefined>(undefined);
|
||||
@@ -65,6 +64,7 @@ export const DAGAutomationGraph: FC<{
|
||||
elements: elementData,
|
||||
},
|
||||
}}
|
||||
additionalControls={props.additionalControls}
|
||||
/>
|
||||
);
|
||||
};
|
||||
@@ -62,14 +62,14 @@ const Template: ComponentStory<typeof ButtonNode> = (args) => {
|
||||
? {
|
||||
x:
|
||||
DEFAULT_DIMS.node.width *
|
||||
DEFAULT_DIMS.distanceFactor.node,
|
||||
DEFAULT_DIMS.distanceFactor.node[0],
|
||||
y: 0,
|
||||
}
|
||||
: {
|
||||
x: 0,
|
||||
y:
|
||||
DEFAULT_DIMS.node.height *
|
||||
DEFAULT_DIMS.distanceFactor.node,
|
||||
DEFAULT_DIMS.distanceFactor.node[1],
|
||||
},
|
||||
},
|
||||
dims,
|
||||
|
||||
@@ -71,11 +71,11 @@ export const CollectionNode: FC<CollectionNodeProps> = ({
|
||||
<div className="collection-nodes--inner">
|
||||
{nodes.map((n, i) => (
|
||||
<SequenceNodeElement
|
||||
{...n}
|
||||
{...sequenceNode}
|
||||
key={i}
|
||||
color={color}
|
||||
flipped={flipped}
|
||||
{...n}
|
||||
{...sequenceNode}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -179,7 +179,7 @@ export const ReturnTarget: ComponentStory<typeof Demo> = (args) => {
|
||||
50 +
|
||||
args.height *
|
||||
2 *
|
||||
DEFAULT_DIMS.distanceFactor.collection,
|
||||
DEFAULT_DIMS.distanceFactor.collection[1],
|
||||
},
|
||||
},
|
||||
DEFAULT_DIMS,
|
||||
|
||||
@@ -6,6 +6,7 @@ import { AutomationActionData } from "types/automations";
|
||||
export type CollectionNodeChildProps = Partial<SequenceNodeActions> & {
|
||||
enabled: boolean;
|
||||
label: ReactNode;
|
||||
color?: SequenceNodeColor;
|
||||
};
|
||||
export type CollectionNodeDataProps = Size & {
|
||||
nodes: CollectionNodeChildProps[];
|
||||
|
||||
@@ -3,7 +3,6 @@ import { NodeTypes } from "react-flow-renderer";
|
||||
import { makeNodeMaker } from "./NodeMaker";
|
||||
import { DAGDims } from "../elements/types";
|
||||
|
||||
export type NodeManager = typeof NodeManager;
|
||||
export const NodeManager = (() => {
|
||||
const nodeTypes: NodeTypes = {};
|
||||
return {
|
||||
|
||||
@@ -68,12 +68,12 @@ export const Colors: ComponentStory<typeof SequenceNode> = (args) => {
|
||||
x:
|
||||
50 +
|
||||
DEFAULT_DIMS.node.height *
|
||||
DEFAULT_DIMS.distanceFactor.node *
|
||||
DEFAULT_DIMS.distanceFactor.node[0] *
|
||||
i,
|
||||
y:
|
||||
50 +
|
||||
DEFAULT_DIMS.node.height *
|
||||
DEFAULT_DIMS.distanceFactor.node *
|
||||
DEFAULT_DIMS.distanceFactor.node[1] *
|
||||
i,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { ReactNode } from "react";
|
||||
|
||||
export type SequenceNodeColor = "red" | "blue" | "green" | "lblue";
|
||||
export type SequenceNodeColor = "red" | "blue" | "green" | "lblue" | "error";
|
||||
export type SequenceNodeOnMove<Direction extends string> = Record<
|
||||
Direction,
|
||||
() => void
|
||||
|
||||
@@ -11,6 +11,8 @@ export const useSequenceNodeColor = (color: SequenceNodeColor): string => {
|
||||
: color === "lblue"
|
||||
? theme.palette.info.light
|
||||
: color === "red"
|
||||
? theme.palette.warning.dark
|
||||
: color === "error"
|
||||
? theme.palette.error.dark
|
||||
: "none";
|
||||
};
|
||||
@@ -5,13 +5,15 @@ import {
|
||||
import { ModalState } from "../board/types";
|
||||
import { SequenceNodeActions } from "../nodes/SequenceNode/types";
|
||||
import { DAGUpdaterArgs, DAGUpdaterInput } from "./types";
|
||||
import { mapAutoActionKeyToNodeType } from "./util";
|
||||
import {
|
||||
convertChooseActionToOrignal,
|
||||
mapAutoActionKeyToNodeType,
|
||||
} from "./util";
|
||||
import {
|
||||
ChooseAction,
|
||||
RepeatAction,
|
||||
ParallelAction,
|
||||
} from "types/automations/actions";
|
||||
import { ScriptConditionField } from "types/automations/common";
|
||||
import { convertScriptConditionFieldToAutomationConditions } from "utils/automations";
|
||||
import { AutomationNode } from "types/automations";
|
||||
|
||||
@@ -173,7 +175,9 @@ export const createUpdater = (
|
||||
};
|
||||
},
|
||||
createChoosNodeUpdater(i: number, j: number | "else") {
|
||||
const node = args.sequence.data[i] as ChooseAction;
|
||||
const node = convertChooseActionToOrignal(
|
||||
args.sequence.data[i] as ChooseAction
|
||||
);
|
||||
if (j === "else") {
|
||||
return {
|
||||
stateUpdater: createUpdater({
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { AutomationActionData, AutomationNodeTypes } from "types/automations";
|
||||
import { ChooseAction, OriginalChooseAction } from "types/automations/actions";
|
||||
|
||||
export const mapAutoActionKeyToNodeType = (
|
||||
k: keyof AutomationActionData
|
||||
@@ -8,3 +9,21 @@ export const mapAutoActionKeyToNodeType = (
|
||||
: k === "trigger"
|
||||
? ["trigger"]
|
||||
: ["action", "condition"];
|
||||
|
||||
export const convertChooseActionToOrignal = (
|
||||
node: ChooseAction
|
||||
): OriginalChooseAction => {
|
||||
if ("if" in node) {
|
||||
return {
|
||||
choose: [
|
||||
{
|
||||
conditions: node.if,
|
||||
sequence: node.then,
|
||||
},
|
||||
],
|
||||
default: node.else,
|
||||
};
|
||||
} else {
|
||||
return node;
|
||||
}
|
||||
};
|
||||
@@ -16,10 +16,10 @@ export const InputArea: FC<InputAreaProps> = (props) => {
|
||||
return (
|
||||
<InputAutoComplete
|
||||
{...props}
|
||||
validateOption={(v) => areas.validateOptions(v)}
|
||||
options={areas.getOptions()}
|
||||
label={props.label ?? "Area"}
|
||||
getID={areas.getID}
|
||||
getLabel={areas.getLabel}
|
||||
options={areas.getOptions()}
|
||||
onlyShowLabel
|
||||
/>
|
||||
);
|
||||
|
||||
@@ -13,7 +13,7 @@ export const InputDevice: FC<InputDeviceProps> = (props) => {
|
||||
return (
|
||||
<InputAutoComplete
|
||||
{...props}
|
||||
label={props.label ?? "Device ID"}
|
||||
label={props.label ?? "Device"}
|
||||
getID={dr.getID}
|
||||
getLabel={dr.getLabel}
|
||||
options={dr.getOptions()}
|
||||
|
||||
@@ -10,6 +10,8 @@ export type InputEntityProps = InputAutoCompletePropsBase & {
|
||||
restrictToDomain?: string[];
|
||||
restrictedIntegrations?: string[];
|
||||
preSelectedEntityIds?: string[];
|
||||
restrictedDeviceClass?: string[];
|
||||
restrictMode?: "and" | "or";
|
||||
};
|
||||
|
||||
export const InputEntity: FC<InputEntityProps> = (props) => {
|
||||
@@ -17,7 +19,9 @@ export const InputEntity: FC<InputEntityProps> = (props) => {
|
||||
const entities = useHAEntities();
|
||||
let options = entities.getOptions(
|
||||
props.restrictToDomain,
|
||||
props.restrictedIntegrations
|
||||
props.restrictedIntegrations,
|
||||
props.restrictedDeviceClass,
|
||||
props.restrictMode ?? "and"
|
||||
);
|
||||
if (props.preSelectedEntityIds) {
|
||||
options = options.filter((opt) =>
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
.MuiMenuItem-root.input-list--menu-item {
|
||||
display: inherit;
|
||||
}
|
||||
|
||||
.input-list--menu-item .input-list--menu-item--description {
|
||||
font-size: 0.75em;
|
||||
max-width: 80vw;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
|
||||
.MuiSelect-select .input-list--menu-item--description {
|
||||
display: none;
|
||||
}
|
||||
@@ -1,3 +1,5 @@
|
||||
import "./InputList.css";
|
||||
|
||||
import FormHelperText from "@mui/material/FormHelperText";
|
||||
import InputLabel from "@mui/material/InputLabel";
|
||||
import MenuItem from "@mui/material/MenuItem";
|
||||
@@ -15,11 +17,13 @@ export type Props<T extends string | Object> = {
|
||||
className?: string;
|
||||
prettyOptionLabels?: boolean;
|
||||
getKey?: (n: T) => string;
|
||||
getDescription?: (n: T) => string;
|
||||
placeholder?: any;
|
||||
title?: string;
|
||||
helperText?: string;
|
||||
endAdornment?: ReactNode;
|
||||
disabled?: boolean;
|
||||
fullWidth?: boolean;
|
||||
};
|
||||
export function InputList<T extends string | Object>({
|
||||
current,
|
||||
@@ -30,11 +34,13 @@ export function InputList<T extends string | Object>({
|
||||
className,
|
||||
prettyOptionLabels = true,
|
||||
getKey = String,
|
||||
getDescription,
|
||||
placeholder,
|
||||
title,
|
||||
helperText,
|
||||
endAdornment,
|
||||
disabled,
|
||||
fullWidth = true,
|
||||
}: Props<T>) {
|
||||
const invalidCurrent =
|
||||
current && !options.map(getKey).includes(getKey(current));
|
||||
@@ -43,7 +49,7 @@ export function InputList<T extends string | Object>({
|
||||
className={className}
|
||||
variant="filled"
|
||||
sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}
|
||||
fullWidth
|
||||
fullWidth={fullWidth}
|
||||
disabled={disabled}
|
||||
>
|
||||
<InputLabel>{label}</InputLabel>
|
||||
@@ -62,12 +68,20 @@ export function InputList<T extends string | Object>({
|
||||
label={label}
|
||||
variant="filled"
|
||||
error={invalidCurrent}
|
||||
fullWidth
|
||||
fullWidth={fullWidth}
|
||||
disabled={disabled}
|
||||
>
|
||||
{options.map((t, i) => (
|
||||
<MenuItem key={i} value={getKey(t)}>
|
||||
<MenuItem key={i} value={getKey(t)} className="input-list--menu-item">
|
||||
{prettyOptionLabels ? prettyName(getKey(t)) : getKey(t)}
|
||||
{!!getDescription && (
|
||||
<>
|
||||
<br />
|
||||
<div className="input-list--menu-item--description">
|
||||
{getDescription(t)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</MenuItem>
|
||||
))}
|
||||
</Select>
|
||||
|
||||
@@ -4,7 +4,7 @@ import TextField from "@mui/material/TextField";
|
||||
|
||||
export interface Props {
|
||||
textBoxFor?: string;
|
||||
label: string | JSX.Element;
|
||||
label?: string | JSX.Element;
|
||||
value: string;
|
||||
onChange: (v: string) => void;
|
||||
onEnter?: () => void;
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
.input-text-view {
|
||||
max-height: 2em;
|
||||
}
|
||||
|
||||
.input-text-view.view span {
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
word-break: break-all;
|
||||
word-wrap: break-word;
|
||||
line-break: loose;
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
|
||||
.input-text-view.edit .MuiFilledInput-input {
|
||||
padding-top: 0.5em;
|
||||
padding-bottom: 0.5em;
|
||||
}
|
||||
|
||||
|
||||
.input-text-view.edit .MuiSvgIcon-root {
|
||||
color: var(--mui-primary-light);
|
||||
}
|
||||
|
||||
.input-text-view.edit .MuiSvgIcon-root:hover {
|
||||
cursor: pointer;
|
||||
color: var(--mui-primary-main);
|
||||
}
|
||||
|
||||
.input-text-view.view .input-text-view--placeholder {
|
||||
color: var(--mui-grey-500);
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
|
||||
.input-text-view.view {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.25em;
|
||||
cursor: text;
|
||||
}
|
||||
|
||||
.input-text-view.view .input-text-view--edit {
|
||||
font-size: 0.75em;
|
||||
}
|
||||
|
||||
.input-text-view.view .input-text-view--edit:hover {
|
||||
transform: rotate(15deg);
|
||||
cursor: pointer;
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import InputText from "./InputText";
|
||||
|
||||
import { InputTextView } from "./InputTextView";
|
||||
|
||||
export default {
|
||||
title: "Inputs/InputTextView",
|
||||
component: InputTextView,
|
||||
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||
args: {
|
||||
value: "example",
|
||||
},
|
||||
} as ComponentMeta<typeof InputTextView>;
|
||||
|
||||
export const Basic: ComponentStory<typeof InputTextView> = (args) => (
|
||||
<Page>
|
||||
<div
|
||||
style={{
|
||||
display: "flex",
|
||||
flexDirection: "column",
|
||||
gap: "1em",
|
||||
padding: "1em",
|
||||
}}
|
||||
>
|
||||
<InputTextView {...args} />
|
||||
<InputText {...args} />
|
||||
</div>
|
||||
</Page>
|
||||
);
|
||||
@@ -0,0 +1,54 @@
|
||||
import "./InputTextView.css";
|
||||
|
||||
import { FC, useState } from "react";
|
||||
import CheckCircleOutlineOutlinedIcon from "@mui/icons-material/CheckCircleOutlineOutlined";
|
||||
import ModeEditOutlineOutlinedIcon from "@mui/icons-material/ModeEditOutlineOutlined";
|
||||
import TextField from "@mui/material/TextField";
|
||||
|
||||
export type InputTextViewProps = {
|
||||
className?: string;
|
||||
value: string;
|
||||
onChange: (t: string) => void;
|
||||
initialViewMode?: boolean;
|
||||
placeholder?: string;
|
||||
};
|
||||
|
||||
export const InputTextView: FC<InputTextViewProps> = (props) => {
|
||||
const [viewMode, setViewMode] = useState(props.initialViewMode ?? true);
|
||||
|
||||
const className = [
|
||||
"input-text-view",
|
||||
viewMode ? "view" : "edit",
|
||||
props.className ?? "",
|
||||
].join(" ");
|
||||
|
||||
if (viewMode) {
|
||||
return (
|
||||
<div className={className} onClick={() => setViewMode(false)}>
|
||||
{!!props.value ? (
|
||||
<span>{props.value}</span>
|
||||
) : (
|
||||
<span className="input-text-view--placeholder">
|
||||
{props.placeholder}
|
||||
</span>
|
||||
)}
|
||||
<ModeEditOutlineOutlinedIcon className="input-text-view--edit" />
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
return (
|
||||
<TextField
|
||||
className={className}
|
||||
placeholder={props.placeholder}
|
||||
variant="filled"
|
||||
value={props.value}
|
||||
onChange={(e) => props.onChange(e.target.value)}
|
||||
InputProps={{
|
||||
endAdornment: (
|
||||
<CheckCircleOutlineOutlinedIcon onClick={() => setViewMode(true)} />
|
||||
),
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
};
|
||||
@@ -6,29 +6,35 @@ import { AutomationTime } from "types/automations/common";
|
||||
import { InputTime } from "./InputTime";
|
||||
|
||||
export default {
|
||||
title: 'Inputs/InputTime',
|
||||
title: "Inputs/InputTime",
|
||||
component: InputTime,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||
} as ComponentMeta<typeof InputTime>;
|
||||
|
||||
|
||||
const Template: ComponentStory<typeof InputTime> = args => {
|
||||
|
||||
const Template: ComponentStory<typeof InputTime> = (args) => {
|
||||
const [value, setValue] = useState<AutomationTime | undefined>(undefined);
|
||||
return <Page>
|
||||
<div style={{
|
||||
padding: '1em'
|
||||
}}>
|
||||
<InputTime {...args} value={value} onChange={t => {
|
||||
setValue(t)
|
||||
args.onChange(t)
|
||||
}} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
return (
|
||||
<Page>
|
||||
<div
|
||||
style={{
|
||||
padding: "1em",
|
||||
}}
|
||||
>
|
||||
<InputTime
|
||||
{...args}
|
||||
value={args.restrictEmpty ? "00:00:00" : value}
|
||||
onChange={(t) => {
|
||||
setValue(t);
|
||||
args.onChange(t);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
);
|
||||
};
|
||||
|
||||
export const SimpleText = Template.bind({})
|
||||
export const SimpleText = Template.bind({});
|
||||
SimpleText.args = {
|
||||
label: "Time Stamp",
|
||||
value: "10"
|
||||
}
|
||||
value: "10",
|
||||
};
|
||||
@@ -19,13 +19,14 @@ const fields: Array<keyof AutomationTimeObject> = [
|
||||
"seconds",
|
||||
"milliseconds",
|
||||
];
|
||||
export interface Props {
|
||||
export type InputTimeProps = {
|
||||
label: string;
|
||||
value?: AutomationTime;
|
||||
onChange: (v?: AutomationTimeObject) => void;
|
||||
className?: string;
|
||||
}
|
||||
export const InputTime: FC<Props> = (props) => {
|
||||
value?: AutomationTime;
|
||||
restrictEmpty?: boolean;
|
||||
};
|
||||
export const InputTime: FC<InputTimeProps> = (props) => {
|
||||
// state
|
||||
const [disabled, setDisabled] = useState(!props.value);
|
||||
const [displayValue, setDisplayValue] = useState(
|
||||
@@ -140,10 +141,12 @@ export const InputTime: FC<Props> = (props) => {
|
||||
onChange={(e) => updateOne(name)(e.target.value)}
|
||||
/>
|
||||
))}
|
||||
<ButtonIcon
|
||||
onClick={() => setDisabled(!disabled)}
|
||||
icon={disabled ? <EditIcon /> : <CloseIcon />}
|
||||
/>
|
||||
{!props.restrictEmpty && (
|
||||
<ButtonIcon
|
||||
onClick={() => setDisabled(!disabled)}
|
||||
icon={disabled ? <EditIcon /> : <CloseIcon />}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
.input-time-entity {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 0.5em;
|
||||
}
|
||||
|
||||
.input-time-entity button.MuiButtonBase-root {
|
||||
border-color: var(--mui-info-light);
|
||||
background-color: var(--mui-info-main);
|
||||
color: var(--mui-info-contrastText);
|
||||
}
|
||||
|
||||
.input-time-entity button.MuiButtonBase-root:hover {
|
||||
background-color: var(--mui-info-light);
|
||||
}
|
||||
|
||||
.input-time-entity .input-autocomplete {
|
||||
min-width: 10em;
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
|
||||
import { InputTimeEntity } from "./InputTimeEntity";
|
||||
|
||||
export default {
|
||||
title: "Inputs/InputTimeEntity",
|
||||
component: InputTimeEntity,
|
||||
parameters: { actions: { argTypesRegex: "^on.*" } },
|
||||
} as ComponentMeta<typeof InputTimeEntity>;
|
||||
|
||||
const Template: ComponentStory<typeof InputTimeEntity> = (args) => {
|
||||
const [value, setValue] = useState("");
|
||||
return (
|
||||
<Page>
|
||||
<div
|
||||
style={{
|
||||
padding: "1em",
|
||||
}}
|
||||
>
|
||||
<InputTimeEntity
|
||||
{...args}
|
||||
value={value}
|
||||
onChange={(t) => {
|
||||
setValue(t);
|
||||
args.onChange(t);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
);
|
||||
};
|
||||
|
||||
export const SimpleText = Template.bind({});
|
||||
@@ -0,0 +1,68 @@
|
||||
import "./InputTimeEntity.css";
|
||||
|
||||
import { FC, ReactNode } from "react";
|
||||
|
||||
import AccessTimeOutlinedIcon from "@mui/icons-material/AccessTimeOutlined";
|
||||
import MoreTimeOutlinedIcon from "@mui/icons-material/MoreTimeOutlined";
|
||||
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import {
|
||||
convertObjectToAutomationTimeString,
|
||||
isAutomationTimeString24Hours,
|
||||
} from "utils/time";
|
||||
import { InputEntity } from "./InputEntities";
|
||||
import { InputTime } from "./InputTime";
|
||||
|
||||
export type InputTimeEntityProps = {
|
||||
value: string;
|
||||
onChange: (v: string) => void;
|
||||
className?: string;
|
||||
};
|
||||
export const InputTimeEntity: FC<InputTimeEntityProps> = ({
|
||||
value,
|
||||
onChange,
|
||||
className = "",
|
||||
}) => {
|
||||
const is24Hour = isAutomationTimeString24Hours(value);
|
||||
let editor: ReactNode;
|
||||
if (is24Hour) {
|
||||
editor = (
|
||||
<InputTime
|
||||
label=""
|
||||
value={value ?? "00:00:00"}
|
||||
restrictEmpty
|
||||
onChange={(t) =>
|
||||
onChange(t ? convertObjectToAutomationTimeString(t) : "00:00:00")
|
||||
}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
editor = (
|
||||
<InputEntity
|
||||
label="Time Entity"
|
||||
restrictMode="or"
|
||||
restrictedDeviceClass={["timestamp"]}
|
||||
restrictToDomain={["input_datetime"]}
|
||||
value={value}
|
||||
multiple={false}
|
||||
onChange={(t) => onChange(t ?? "")}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={"input-time-entity " + className}>
|
||||
{editor}{" "}
|
||||
<ButtonIcon
|
||||
icon={is24Hour ? <AccessTimeOutlinedIcon /> : <MoreTimeOutlinedIcon />}
|
||||
onClick={() => {
|
||||
if (is24Hour) {
|
||||
onChange("");
|
||||
} else {
|
||||
onChange("00:00:00");
|
||||
}
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -8,7 +8,7 @@ export const ActionChooseState: OptionManager<ChooseAction> = {
|
||||
choose: [],
|
||||
}),
|
||||
isReady: () => true,
|
||||
Component: ({}) => {
|
||||
Component: () => {
|
||||
return <></>;
|
||||
},
|
||||
};
|
||||
@@ -1,4 +1,3 @@
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
import { ParallelAction } from "types/automations/actions";
|
||||
import { OptionManager } from "./OptionManager";
|
||||
|
||||
@@ -8,15 +7,7 @@ export const ActionParallelState: OptionManager<ParallelAction> = {
|
||||
parallel: [],
|
||||
}),
|
||||
isReady: () => true,
|
||||
Component: ({ state, setState }) => {
|
||||
return (
|
||||
<>
|
||||
<InputYaml
|
||||
label="Actions"
|
||||
value={state.parallel ?? []}
|
||||
onChange={(parallel) => setState({ ...state, parallel })}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
Component: () => {
|
||||
return <></>;
|
||||
},
|
||||
};
|
||||
@@ -1,8 +1,6 @@
|
||||
import InputNumber from "components/Inputs/InputNumber";
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
import { useState } from "react";
|
||||
import { RepeatAction } from "types/automations/actions";
|
||||
import { OptionManager, updateActionData } from "./OptionManager";
|
||||
import { OptionManager } from "./OptionManager";
|
||||
import { InputAutoComplete } from "components/Inputs/InputAutoComplete";
|
||||
|
||||
const determineType = (repeatNode: RepeatAction["repeat"]) =>
|
||||
@@ -16,7 +14,7 @@ export const ActionRepeatState: OptionManager<RepeatAction> = {
|
||||
sequence: [],
|
||||
},
|
||||
}),
|
||||
isReady: ({}) => true,
|
||||
isReady: () => true,
|
||||
Component: ({ state, setState }) => {
|
||||
const repeatType = determineType(state.repeat);
|
||||
return (
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
.trigger-time--help {
|
||||
margin-top: 0.5em;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 0.5em;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.trigger-time--help .text {
|
||||
word-wrap: break-word;
|
||||
flex-wrap: wrap;
|
||||
overflow: hidden;
|
||||
text-overflow: clip;
|
||||
cursor: pointer;
|
||||
padding: 0.5em 0.75em;
|
||||
max-width: 40em;
|
||||
}
|
||||
|
||||
.trigger-time--help .text a {
|
||||
color: var(--mui-info-light);
|
||||
}
|
||||
|
||||
.trigger-time--help .text a:hover {
|
||||
color: var(--mui-info-main);
|
||||
border-radius: 10px;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.trigger-time--help .trigger-time--mode-selection {
|
||||
width: 10em;
|
||||
}
|
||||
|
||||
.trigger-time--pattern {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
gap: 0.5em;
|
||||
margin-top: 0.5em;
|
||||
}
|
||||
|
||||
.trigger-time--exact {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 0.25em;
|
||||
}
|
||||
|
||||
.trigger-time--exact .add {
|
||||
border-color: var(--mui-info-light);
|
||||
color: var(--mui-info-contrastText);
|
||||
background-color: var(--mui-info-main);
|
||||
}
|
||||
|
||||
.trigger-time--exact .add:hover {
|
||||
border-color: var(--mui-info-light);
|
||||
color: var(--mui-info-main);
|
||||
background-color: var(--mui-info-contrastText);
|
||||
}
|
||||
@@ -1,25 +1,151 @@
|
||||
import { OptionManager } from './OptionManager';
|
||||
import { AutomationTriggerTime } from 'types/automations/triggers';
|
||||
import { InputTime } from 'components/Inputs/InputTime';
|
||||
import { convertObjectToAutomationTimeString } from 'utils/time';
|
||||
import "./TriggerTime.css";
|
||||
|
||||
import HelpOutlinedIcon from "@mui/icons-material/HelpOutlined";
|
||||
|
||||
import { OptionManager } from "./OptionManager";
|
||||
import {
|
||||
AutomationTriggerTime,
|
||||
AutomationTriggerExactTime,
|
||||
AutomationTriggerTimePattern,
|
||||
} from "types/automations/triggers";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import { FC } from "react";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { useState } from "react";
|
||||
import AddIcon from "@mui/icons-material/Add";
|
||||
import { InputTimeEntity } from "components/Inputs/InputTimeEntity";
|
||||
|
||||
export const TriggerTime: OptionManager<AutomationTriggerTime> = {
|
||||
defaultState: () => ({
|
||||
"platform": 'time',
|
||||
"at": "",
|
||||
platform: "time",
|
||||
at: "00:00:00",
|
||||
}),
|
||||
isReady: () => true,
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
<InputTime
|
||||
label="At"
|
||||
value={state.at}
|
||||
onChange={_at => setState({
|
||||
...state,
|
||||
at: _at ? convertObjectToAutomationTimeString(_at) : "00:00:00",
|
||||
})}
|
||||
Component: ({ state, setState }) => {
|
||||
const [showHelp, setHelp] = useState(false);
|
||||
const setTimeType = (t: AutomationTriggerTime["platform"]) => {
|
||||
if (t === "time") {
|
||||
setState({
|
||||
platform: "time",
|
||||
at: ["00:00:00"],
|
||||
});
|
||||
} else {
|
||||
setState({
|
||||
platform: "time_pattern",
|
||||
});
|
||||
}
|
||||
};
|
||||
return (
|
||||
<>
|
||||
<div className="trigger-time--help">
|
||||
<InputList
|
||||
className="trigger-time--mode-selection"
|
||||
label="Mode"
|
||||
current={state.platform}
|
||||
onChange={setTimeType}
|
||||
options={["time", "time_pattern"]}
|
||||
/>
|
||||
{state.platform === "time_pattern" && (
|
||||
<>
|
||||
<Button onClick={() => setHelp(!showHelp)}>
|
||||
<HelpOutlinedIcon /> Help
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
{state.platform === "time_pattern" && showHelp && (
|
||||
<div className="text">
|
||||
You can prefix the value with a "/" to match whenever the value is
|
||||
divisible by that number. You can specify "*" to match any value.{" "}
|
||||
<a
|
||||
href="https://www.home-assistant.io/docs/automation/trigger/#time-pattern-trigger"
|
||||
target="_blank" rel="noreferrer"
|
||||
>
|
||||
More Info.
|
||||
</a>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{state.platform === "time_pattern" ? (
|
||||
<TriggerTimePattern state={state as any} setState={setState} />
|
||||
) : (
|
||||
<TriggerExactTime state={state as any} setState={setState} />
|
||||
)}
|
||||
</>
|
||||
);
|
||||
},
|
||||
};
|
||||
|
||||
export const TriggerExactTime: FC<{
|
||||
state: AutomationTriggerExactTime;
|
||||
setState: (t: AutomationTriggerExactTime) => void;
|
||||
}> = ({ state, setState }) => {
|
||||
const times = Array.isArray(state.at) ? state.at : [state.at];
|
||||
const update = (t: string, i: number) =>
|
||||
setState({
|
||||
...state,
|
||||
at: [...times.slice(0, i), t, ...times.slice(i + 1)],
|
||||
});
|
||||
const add = () =>
|
||||
setState({
|
||||
...state,
|
||||
at: [...times, "00:00:00"],
|
||||
});
|
||||
return (
|
||||
<div className="trigger-time--exact">
|
||||
{times.map((v, i) => {
|
||||
return (
|
||||
<InputTimeEntity
|
||||
key={i}
|
||||
className="trigger-time--exact--option"
|
||||
value={v ?? ""}
|
||||
onChange={(t) => update(t, i)}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
<Button onClick={add} className="add">
|
||||
<AddIcon />
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export const TriggerTimePattern: FC<{
|
||||
state: AutomationTriggerTimePattern;
|
||||
setState: (t: AutomationTriggerTimePattern) => void;
|
||||
}> = ({ state, setState }) => {
|
||||
return (
|
||||
<div className="trigger-time--pattern">
|
||||
<InputText
|
||||
label="Hours"
|
||||
value={state.hours ?? ""}
|
||||
onChange={(hours) =>
|
||||
setState({
|
||||
...state,
|
||||
hours,
|
||||
})
|
||||
}
|
||||
/>
|
||||
</>
|
||||
}
|
||||
}
|
||||
<InputText
|
||||
label="Minutes"
|
||||
value={state.minutes ?? ""}
|
||||
onChange={(minutes) =>
|
||||
setState({
|
||||
...state,
|
||||
minutes,
|
||||
})
|
||||
}
|
||||
/>
|
||||
<InputText
|
||||
label="Seconds"
|
||||
value={state.seconds ?? ""}
|
||||
onChange={(seconds) =>
|
||||
setState({
|
||||
...state,
|
||||
seconds,
|
||||
})
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
@@ -1,27 +0,0 @@
|
||||
import { OptionManager } from './OptionManager';
|
||||
import { AutomationTriggerTimePattern } from 'types/automations/triggers';
|
||||
import InputText from 'components/Inputs/InputText';
|
||||
|
||||
|
||||
export const TriggerTimePattern: OptionManager<AutomationTriggerTimePattern> = {
|
||||
defaultState: () => ({
|
||||
"platform": 'time_pattern',
|
||||
}),
|
||||
isReady: () => true,
|
||||
renderOptionList: (state, setState) => {
|
||||
return <>
|
||||
<InputText label="Hours" value={state.hours ?? ""} onChange={hours => setState({
|
||||
...state,
|
||||
hours
|
||||
})} />
|
||||
<InputText label="Minutes" value={state.minutes ?? ""} onChange={minutes => setState({
|
||||
...state,
|
||||
minutes
|
||||
})} />
|
||||
<InputText label="Seconds" value={state.seconds ?? ""} onChange={seconds => setState({
|
||||
...state,
|
||||
seconds
|
||||
})} />
|
||||
</>
|
||||
}
|
||||
}
|
||||
@@ -15,7 +15,6 @@ import { TriggerNumericState } from "./TriggerNumericState";
|
||||
import { TriggerState } from "./TriggerState";
|
||||
import { TriggerTemplate } from "./TriggerTemplate";
|
||||
import { TriggerTime } from "./TriggerTime";
|
||||
import { TriggerTimePattern } from "./TriggerTimePattern";
|
||||
import { TriggerWebhook } from "./TriggerWebhook";
|
||||
import { TriggerZone } from "./TriggerZone";
|
||||
import { TriggerDevice } from "./TriggerDevice";
|
||||
@@ -67,8 +66,6 @@ export const getOptionManager = <T extends AutomationNodeTypes>(
|
||||
return TriggerTemplate;
|
||||
case "time":
|
||||
return TriggerTime;
|
||||
case "time_pattern":
|
||||
return TriggerTimePattern;
|
||||
case "webhook":
|
||||
return TriggerWebhook;
|
||||
case "zone":
|
||||
|
||||
Loaded 100 of 118 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user