Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c27f2d13f0 | ||
|
|
26c81effd6 | ||
|
|
e72c83b980 | ||
|
|
e222c42150 | ||
|
|
e7b88fc6f6 | ||
|
|
079f353dbf | ||
|
|
e6e51be5a5 | ||
|
|
3a6b21a117 | ||
|
|
f42df5a70f | ||
|
|
0c3e9b5ace | ||
|
|
bc773154c6 | ||
|
|
a530e5e6e0 | ||
|
|
1ad87c205d | ||
|
|
d45f72b168 | ||
|
|
0c7db09c32 | ||
|
|
2b1648eff2 | ||
|
|
06356b46e9 | ||
|
|
21fe64f4bf | ||
|
|
e22f64dd51 | ||
|
|
f1b24ec783 | ||
|
|
8a90b56ac3 | ||
|
|
7d111c853b | ||
|
|
0c72481729 | ||
|
|
996626f9af | ||
|
|
878035e748 | ||
|
|
cc930ee4ac | ||
|
|
169a2e9059 | ||
|
|
6275123071 | ||
|
|
0001c93792 | ||
|
|
90d3fa0587 | ||
|
|
938040e519 | ||
|
|
14b3132c64 | ||
|
|
17c79d7aab | ||
|
|
67cc57f068 | ||
|
|
a4743b0353 | ||
|
|
5efda5f3b2 | ||
|
|
7d7a788723 | ||
|
|
cdf67aa1a9 | ||
|
|
98133607ca | ||
|
|
5729b74c89 | ||
|
|
fb8eb4f38c | ||
|
|
21adcb6973 | ||
|
|
8a33d05ced | ||
|
|
334268b5ee | ||
|
|
3b7b17021f | ||
|
|
44c4ac12dd | ||
|
|
f8233dd6ab | ||
|
|
54f528deb4 | ||
|
|
eb363acf81 | ||
|
|
415acf06cc | ||
|
|
0325b8eec3 | ||
|
|
d184871217 | ||
|
|
0499feb61d | ||
|
|
0030920558 | ||
|
|
f62f139f55 | ||
|
|
2d80798ccb | ||
|
|
3da5e1c88c | ||
|
|
7df34bdf7f | ||
|
|
554528ace0 | ||
|
|
298a233a5f | ||
|
|
cbbc099384 | ||
|
|
48decb2e16 | ||
|
|
7afda7eb1c | ||
|
|
f6270c94f3 | ||
|
|
952dcba3ac | ||
|
|
25770e1c1d | ||
|
|
029a2dac9f | ||
|
|
8732ab8dda | ||
|
|
42ab6e5913 | ||
|
|
c28796872f | ||
|
|
40690293a8 | ||
|
|
621f43e5c8 | ||
|
|
f3496f9d32 | ||
|
|
409cf2b21a | ||
|
|
ef92261666 | ||
|
|
83edaf9bf8 | ||
|
|
f8efd895a9 | ||
|
|
da0d153b81 | ||
|
|
bcd262dd46 | ||
|
|
ea47b3e1eb | ||
|
|
5192c09681 |
No files matched your search
@@ -2,3 +2,12 @@ webapp/node_modules
|
|||||||
webapp/build
|
webapp/build
|
||||||
webapp/.storybook
|
webapp/.storybook
|
||||||
webapp/.vscode
|
webapp/.vscode
|
||||||
|
webapp/.env.local
|
||||||
|
webapp/tmux.sh
|
||||||
|
api/.env
|
||||||
|
api/.coverage
|
||||||
|
api/venv
|
||||||
|
api/build
|
||||||
|
api/.mypy_cache
|
||||||
|
api/.vscode
|
||||||
|
api/.coverage
|
||||||
@@ -1,15 +1,15 @@
|
|||||||
name: Manual Build
|
name: "Manual Build"
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
version:
|
version:
|
||||||
type: string
|
type: string
|
||||||
|
description: "Version Number"
|
||||||
required: true
|
required: true
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Build & Publish ${{ github.event.inputs.version }} / ${{ matrix.arch }}
|
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||||
@@ -30,5 +30,4 @@ jobs:
|
|||||||
args: |
|
args: |
|
||||||
--${{ matrix.arch }} \
|
--${{ matrix.arch }} \
|
||||||
--version ${{ github.event.inputs.version }} \
|
--version ${{ github.event.inputs.version }} \
|
||||||
--additional-tag edge \
|
|
||||||
--target .
|
--target .
|
||||||
@@ -6,9 +6,8 @@ on:
|
|||||||
push:
|
push:
|
||||||
branch: [main]
|
branch: [main]
|
||||||
paths:
|
paths:
|
||||||
- 'config.yaml'
|
- "config.yaml"
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
metadata:
|
metadata:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Metadata
|
name: Metadata
|
||||||
@@ -29,37 +28,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
|
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
|
||||||
|
|
||||||
build:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
name: Build & Publish ${{ matrix.arch }}
|
|
||||||
needs:
|
|
||||||
- metadata
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Check out repository
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Login to DockerHub
|
|
||||||
uses: docker/login-action@v2.0.0
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
|
||||||
uses: home-assistant/builder@2022.03.1
|
|
||||||
with:
|
|
||||||
args: |
|
|
||||||
--${{ matrix.arch }} \
|
|
||||||
--target .
|
|
||||||
|
|
||||||
publish:
|
publish:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- metadata
|
- metadata
|
||||||
- build
|
|
||||||
name: Publish Github Release
|
name: Publish Github Release
|
||||||
steps:
|
steps:
|
||||||
- name: Publish Release ${{ needs.metadata.outputs.version }}
|
- name: Publish Release ${{ needs.metadata.outputs.version }}
|
||||||
@@ -73,5 +45,4 @@ jobs:
|
|||||||
owner: context.repo.owner,
|
owner: context.repo.owner,
|
||||||
repo: context.repo.repo,
|
repo: context.repo.repo,
|
||||||
tag_name: process.env.VERSION,
|
tag_name: process.env.VERSION,
|
||||||
body: process.env.CHANGELOG,
|
|
||||||
});
|
});
|
||||||
+55
-30
@@ -8,43 +8,37 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
metadata:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
name: Build Test for ${{ matrix.arch }}
|
name: Metadata
|
||||||
strategy:
|
outputs:
|
||||||
matrix:
|
version: ${{ steps.version.outputs.VERSION }}
|
||||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Cancel Previous Runs
|
|
||||||
uses: styfle/cancel-workflow-action@0.9.1
|
|
||||||
with:
|
|
||||||
all_but_latest: true
|
|
||||||
access_token: ${{ github.token }}
|
|
||||||
|
|
||||||
- name: Check out repository
|
- name: Check out repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
- name: Login to DockerHub
|
|
||||||
uses: docker/login-action@v2.0.0
|
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
fetch-depth: 0
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
- name: Get Version
|
||||||
|
id: version
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ::set-output name=VERSION::$(git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
|
||||||
|
- name: ${{ steps.version.outputs.VERSION }}
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
echo ${{ steps.version.outputs.VERSION }}
|
||||||
|
|
||||||
|
|
||||||
- name: ${{ matrix.arch }}
|
|
||||||
uses: home-assistant/builder@2022.03.1
|
|
||||||
with:
|
|
||||||
args: |
|
|
||||||
--test \
|
|
||||||
--${{ matrix.arch }} \
|
|
||||||
--target .
|
|
||||||
python:
|
python:
|
||||||
name: "Python Tests"
|
name: "Python Tests"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
action: [lint, coverage, security-checks]
|
action:
|
||||||
|
- lint
|
||||||
|
- coverage
|
||||||
|
- security-checks
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
@@ -55,26 +49,57 @@ jobs:
|
|||||||
run: cd api && make setup
|
run: cd api && make setup
|
||||||
- name: Echo dependencies
|
- name: Echo dependencies
|
||||||
run: cd api && ./venv/bin/pip freeze
|
run: cd api && ./venv/bin/pip freeze
|
||||||
- name: Running ${{ matrix.action }}
|
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||||
run: cd api && make ${{ matrix.action }}
|
run: cd api && make ${{ matrix.action }}
|
||||||
|
|
||||||
nodejs:
|
nodejs:
|
||||||
name: "NodeJs Tests"
|
name: "NodeJs Tests"
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
action: [test:ci, tsc:ci, build]
|
action:
|
||||||
|
- "test:ci"
|
||||||
|
- "tsc:ci"
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
- uses: actions/setup-node@v3
|
- uses: actions/setup-node@v3
|
||||||
with:
|
with:
|
||||||
node-version: 16
|
node-version: 16
|
||||||
cache: 'yarn'
|
cache: "yarn"
|
||||||
cache-dependency-path: webapp/yarn.lock
|
cache-dependency-path: webapp/yarn.lock
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: cd webapp && yarn install
|
run: cd webapp && yarn install
|
||||||
- name: Run Tests
|
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||||
run: cd webapp && yarn ${{ matrix.action }}
|
run: cd webapp && yarn ${{ matrix.action }}
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
name: Build & Publish ${{ matrix.arch }}
|
||||||
|
needs:
|
||||||
|
- metadata
|
||||||
|
- nodejs
|
||||||
|
- python
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Check out repository
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Login to DockerHub
|
||||||
|
uses: docker/login-action@v2.0.0
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||||
|
uses: home-assistant/builder@2022.03.1
|
||||||
|
with:
|
||||||
|
args: |
|
||||||
|
--${{ matrix.arch }} \
|
||||||
|
--no-latest \
|
||||||
|
--version ${{ needs.metadata.outputs.version }} \
|
||||||
|
--target .
|
||||||
Vendored
+4
-1
@@ -8,5 +8,8 @@
|
|||||||
"*test_*.py"
|
"*test_*.py"
|
||||||
],
|
],
|
||||||
"python.testing.pytestEnabled": false,
|
"python.testing.pytestEnabled": false,
|
||||||
"python.testing.unittestEnabled": true
|
"python.testing.unittestEnabled": true,
|
||||||
|
"yaml.schemas": {
|
||||||
|
"https://json.schemastore.org/github-action.json": ".github/workflows/*.yml"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+27
-1
@@ -1,4 +1,30 @@
|
|||||||
# Changelog
|
# Changelog 
|
||||||
|
|
||||||
|
## [0.1.14] - Material UI + Autocomplete v2
|
||||||
|
|
||||||
|
- Brought some Material UI elements for input and text
|
||||||
|
- Autocomplete for tags
|
||||||
|
- Using 'id' as alias for trigger (as it seems to break HA otherwise)
|
||||||
|
- Not using 'alias' for conditions, always auto-generating it (again, this used to break HA)
|
||||||
|
- Added missing `data` object to service-actions
|
||||||
|
|
||||||
|
## [0.1.13] - YAML
|
||||||
|
|
||||||
|
- Better YAML
|
||||||
|
- Rewrote yaml parser/loader to use pyyaml and safe mode
|
||||||
|
- Cleaned up description vs alias
|
||||||
|
|
||||||
|
## [0.1.12] - Less Intense Error Messages
|
||||||
|
|
||||||
|
- Added more node-based errors (this way it's easier to see where validations failed)
|
||||||
|
- Made the validators less strict in order to capture more edge cases that HA supports
|
||||||
|
- Nicer auto-generated descriptions for some trigger nodes
|
||||||
|
|
||||||
|
|
||||||
|
## [0.1.10] - More Bug Fixes
|
||||||
|
|
||||||
|
- Allowing null or undefined values for metadata fields
|
||||||
|
- Trigger.platform==time will now have the .at property better supported
|
||||||
|
|
||||||
## [0.1.9] - Fixed up invalid types for various triggers
|
## [0.1.9] - Fixed up invalid types for various triggers
|
||||||
|
|
||||||
|
|||||||
+20
-16
@@ -1,11 +1,16 @@
|
|||||||
# <--- Build Args -->
|
# <--- Pre-Build Args -->
|
||||||
ARG BUILD_ARCH
|
ARG BUILD_ARCH
|
||||||
ARG BUILD_VERSION
|
|
||||||
|
|
||||||
# <--- Image Setup -->
|
# <--- Image Setup -->
|
||||||
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
# <--- Post-Build Args -->
|
||||||
|
ARG BUILD_VERSION
|
||||||
|
|
||||||
|
# <--- Environment Variables -->
|
||||||
|
ENV BUILD_VERSION $BUILD_VERSION
|
||||||
|
|
||||||
# <--- System Wide Dependencies -->
|
# <--- System Wide Dependencies -->
|
||||||
ENV LANG C.UTF-8
|
ENV LANG C.UTF-8
|
||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
@@ -13,29 +18,26 @@ RUN apk add --no-cache \
|
|||||||
npm \
|
npm \
|
||||||
build-base \
|
build-base \
|
||||||
python3-dev
|
python3-dev
|
||||||
RUN pip install -U wheel setuptools pip && \
|
|
||||||
npm i -g yarn
|
# <--- Scripts -->
|
||||||
|
COPY docker/bin /app/bin
|
||||||
|
|
||||||
|
# <--- PREP -->
|
||||||
|
RUN /app/bin/prep.sh
|
||||||
|
|
||||||
# <--- Python Dependencies -->
|
# <--- Python Dependencies -->
|
||||||
COPY api/setup.py /app/setup.py
|
COPY api/setup.py /app/setup.py
|
||||||
RUN pip install . /app
|
|
||||||
|
|
||||||
# <--- Webapp Build -->
|
# <--- Webapp Build -->
|
||||||
COPY webapp/ /app/web-builder
|
COPY webapp/ /app/web-builder
|
||||||
RUN cd /app/web-builder && \
|
RUN cd /app/web-builder && \
|
||||||
yarn && \
|
echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
|
||||||
yarn build && \
|
|
||||||
cp -r /app/web-builder/build /app/web && \
|
# <--- BUILD -->
|
||||||
rm -rf /app/web-builder
|
RUN /app/bin/build.sh /app /app/web-builder
|
||||||
|
|
||||||
# <--- Api Code -->
|
# <--- Api Code -->
|
||||||
COPY api/src /app/src
|
COPY api/src /app/src
|
||||||
COPY run.sh /app/run.sh
|
|
||||||
RUN chmod +x /app/run.sh
|
|
||||||
|
|
||||||
# <--- Environment Variables -->
|
|
||||||
ENV HASSIO_TOKEN ""
|
|
||||||
ENV BUILD_VERSION $BUILD_VERSION
|
|
||||||
|
|
||||||
# <--- Ports -->
|
# <--- Ports -->
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
@@ -45,5 +47,7 @@ LABEL \
|
|||||||
io.hass.type="addon" \
|
io.hass.type="addon" \
|
||||||
io.hass.arch="armhf|aarch64|i386|amd64"
|
io.hass.arch="armhf|aarch64|i386|amd64"
|
||||||
|
|
||||||
CMD [ "/app/run.sh" ]
|
ENTRYPOINT [ "/app/bin/run.sh" ]
|
||||||
|
CMD [ "/app" ]
|
||||||
|
|
||||||
|
LABEL org.opencontainers.image.source https://github.com/asosnovsky/Shortumation
|
||||||
@@ -1,24 +1,44 @@
|
|||||||
DC=docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
|
BUILD_TAG=$(shell git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
|
||||||
|
DC=BUILD_TAG=${BUILD_TAG} docker-compose -f docker-compose.build.yaml -f docker-compose.test.yaml
|
||||||
|
|
||||||
|
build-with-builder:
|
||||||
|
docker run \
|
||||||
|
--rm \
|
||||||
|
--privileged \
|
||||||
|
-v ~/.docker:/root/.docker \
|
||||||
|
-v /var/run/docker.sock:/var/run/docker.sock:ro \
|
||||||
|
-v ${PWD}:/data \
|
||||||
|
homeassistant/amd64-builder \
|
||||||
|
--amd64 \
|
||||||
|
--test \
|
||||||
|
--version ${BUILD_TAG} \
|
||||||
|
-t /data
|
||||||
|
|
||||||
build:
|
build:
|
||||||
$(DC) build
|
$(DC) build
|
||||||
|
|
||||||
|
build-no-cache:
|
||||||
|
$(DC) build --no-cache
|
||||||
|
|
||||||
push:
|
push:
|
||||||
$(DC) push
|
$(DC) push
|
||||||
|
|
||||||
local_run:
|
start:
|
||||||
$(MAKE) build
|
|
||||||
$(DC) up -d
|
$(DC) up -d
|
||||||
sleep 1
|
sleep 1
|
||||||
$(DC) ps
|
$(DC) ps
|
||||||
|
|
||||||
local_logs:
|
logs:
|
||||||
$(DC) logs -f
|
$(DC) logs -f
|
||||||
|
|
||||||
local_ps:
|
ps:
|
||||||
$(DC) ps
|
$(DC) ps
|
||||||
|
|
||||||
|
stop:
|
||||||
local_stop:
|
|
||||||
$(DC) stop
|
$(DC) stop
|
||||||
|
|
||||||
|
bash:
|
||||||
|
$(DC) exec addon bash
|
||||||
|
|
||||||
|
config:
|
||||||
|
$(DC) config
|
||||||
@@ -1,10 +1,16 @@
|
|||||||
# Shortumation
|
# Shortumation 
|
||||||
|
|
||||||
|
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
||||||
|

|
||||||
|
| | Stable | amd64-edge | i386-edge | armv7-edge | aarch64-edge | armhf-edge |
|
||||||
|
| --- | --- | --- | --- | --- | --- | --- |
|
||||||
|
| Version |  |  |  |  |  |  |
|
||||||
|
|
||||||
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
||||||
|
|
||||||

|

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

|

|
||||||
|
|
||||||
|
|
||||||
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
A [home-assistant addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||||
|
|||||||
+12
@@ -0,0 +1,12 @@
|
|||||||
|
# Security Policy
|
||||||
|
|
||||||
|
## Supported Versions
|
||||||
|
|
||||||
|
| Version | Supported |
|
||||||
|
| ------- | ------------------ |
|
||||||
|
| 0.1.x | :white_check_mark: |
|
||||||
|
|
||||||
|
|
||||||
|
## Reporting a Vulnerability
|
||||||
|
|
||||||
|
Please open an issue with the tag 'Vulnerability', and include your reasoning in it.
|
||||||
+13
-16
@@ -1,17 +1,14 @@
|
|||||||
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:16)
|
list_autos # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:17)
|
||||||
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
|
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:28)
|
||||||
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
|
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
|
||||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
|
read_details # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:10)
|
||||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
|
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:10)
|
||||||
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
|
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
|
||||||
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
|
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
|
||||||
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
|
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
|
||||||
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
|
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
||||||
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
||||||
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
||||||
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:11)
|
||||||
|
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:12)
|
||||||
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
|
json_dumps # unused function (/home/ari/Projects/Shortumation/api/src/json_serializer.py:5)
|
||||||
logger # unused variable (/home/ari/Projects/Shortumation/api/src/logger.py:16)
|
|
||||||
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:13)
|
|
||||||
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:30)
|
|
||||||
_.to_yaml # unused method (/home/ari/Projects/Shortumation/api/src/yaml_serializer/types.py:54)
|
|
||||||
+1
-1
@@ -33,7 +33,7 @@ test:
|
|||||||
|
|
||||||
coverage:
|
coverage:
|
||||||
$(VENV_BIN)/coverage run -m unittest discover tests
|
$(VENV_BIN)/coverage run -m unittest discover tests
|
||||||
$(VENV_BIN)/coverage report -m --fail-under=90
|
$(VENV_BIN)/coverage report -m --fail-under=85
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
|
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
|
||||||
|
|||||||
+2
-1
@@ -4,7 +4,7 @@ import setuptools # type: ignore
|
|||||||
setuptools.setup(
|
setuptools.setup(
|
||||||
python_requires=">=3.9",
|
python_requires=">=3.9",
|
||||||
install_requires=[
|
install_requires=[
|
||||||
"ruamel.yaml==0.17.17",
|
"PyYAML==6.0",
|
||||||
"fastapi==0.70.0",
|
"fastapi==0.70.0",
|
||||||
"pydantic==1.8.2",
|
"pydantic==1.8.2",
|
||||||
"uvicorn[standard]==0.15.0",
|
"uvicorn[standard]==0.15.0",
|
||||||
@@ -21,6 +21,7 @@ setuptools.setup(
|
|||||||
"pre-commit==2.13.0",
|
"pre-commit==2.13.0",
|
||||||
"vulture==2.3",
|
"vulture==2.3",
|
||||||
"types-requests==2.25.6",
|
"types-requests==2.25.6",
|
||||||
|
"types-PyYAML==6.0.7",
|
||||||
"requests==2.27.0",
|
"requests==2.27.0",
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|||||||
+10
-5
@@ -3,16 +3,16 @@ from fastapi.middleware.cors import CORSMiddleware
|
|||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
from src.automations.manager import AutomationManager
|
from src.automations.manager import AutomationManager
|
||||||
from src.env import ORIGIN, ROOT_FOLDER
|
from src.env import API_PREFIX, ORIGIN, ROOT_FOLDER
|
||||||
|
|
||||||
from .routes import automations, details, ping
|
from .routes import automations, details, ping, socket
|
||||||
|
|
||||||
|
|
||||||
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||||
app = FastAPI()
|
app = FastAPI()
|
||||||
if (ROOT_FOLDER / "web").exists():
|
if (ROOT_FOLDER / "web").exists():
|
||||||
app.mount(
|
app.mount(
|
||||||
"/web",
|
f"{API_PREFIX}/web",
|
||||||
StaticFiles(
|
StaticFiles(
|
||||||
directory=ROOT_FOLDER / "web",
|
directory=ROOT_FOLDER / "web",
|
||||||
html=True,
|
html=True,
|
||||||
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
|||||||
allow_headers=["*"],
|
allow_headers=["*"],
|
||||||
)
|
)
|
||||||
app.include_router(ping.router, prefix="/ping")
|
app.include_router(ping.router, prefix="/ping")
|
||||||
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
|
app.include_router(
|
||||||
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
|
automations.make_automation_router(automation_mgr), prefix=f"{API_PREFIX}/automations"
|
||||||
|
)
|
||||||
|
app.include_router(
|
||||||
|
details.make_details_router(automation_mgr.hass_config), prefix=f"{API_PREFIX}/details"
|
||||||
|
)
|
||||||
|
app.include_router(socket.router, prefix=f"{API_PREFIX}/socket")
|
||||||
return app
|
return app
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
from datetime import datetime
|
|
||||||
|
|
||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
|
|
||||||
from src.env import BUILD_VERSION
|
from src.env import BUILD_VERSION, HASSIO_TOKEN, HASSIO_WS
|
||||||
from src.hass_config import HassConfig
|
from src.hass_config import HassConfig
|
||||||
|
|
||||||
|
|
||||||
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
|||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
@router.get("/")
|
@router.get("/")
|
||||||
def read_ping():
|
def read_details():
|
||||||
return {
|
return {
|
||||||
"version": BUILD_VERSION,
|
"version": BUILD_VERSION,
|
||||||
|
"hassio_token": HASSIO_TOKEN,
|
||||||
|
"hassio_url": HASSIO_WS,
|
||||||
"config": hass_config.get_configuration_path(),
|
"config": hass_config.get_configuration_path(),
|
||||||
"tags": hass_config.get_automation_tags_path(),
|
"tags": hass_config.get_automation_tags_path(),
|
||||||
"autos": hass_config.get_automation_path(),
|
"autos": hass_config.get_automation_path(),
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
|
||||||
|
from fastapi import APIRouter, WebSocket
|
||||||
|
|
||||||
|
from src.ws_redirect import WSRedirector
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
@router.websocket("/api/websocket")
|
||||||
|
async def websocket_endpoint(websocket: WebSocket):
|
||||||
|
async def on_message(msg: str):
|
||||||
|
await websocket.send_text(msg)
|
||||||
|
|
||||||
|
conn = WSRedirector(
|
||||||
|
on_message=on_message,
|
||||||
|
)
|
||||||
|
|
||||||
|
async def wait_for_data():
|
||||||
|
while True:
|
||||||
|
await conn.send(await websocket.receive_text())
|
||||||
|
|
||||||
|
await websocket.accept()
|
||||||
|
|
||||||
|
await asyncio.gather(
|
||||||
|
conn.start(),
|
||||||
|
wait_for_data(),
|
||||||
|
)
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Dict, List, Literal, Optional, Union
|
from typing import Dict, List, Optional, Union
|
||||||
|
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
from pydantic.fields import Field
|
from pydantic.fields import Field
|
||||||
|
|||||||
@@ -4,5 +4,8 @@ from decouple import Csv, config
|
|||||||
|
|
||||||
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
||||||
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
BUILD_VERSION = config("BUILD_VERSION", "0.0.0")
|
||||||
|
HASSIO_TOKEN = config("SUPERVISOR_TOKEN", "")
|
||||||
|
HASSIO_WS = config("HASSIO_WS", "ws://supervisor/core/websocket")
|
||||||
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
LOG_LEVEL = config("LOG_LEVEL", "INFO")
|
||||||
|
API_PREFIX = config("API_PREFIX", "")
|
||||||
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
ORIGIN = config("ORIGIN", cast=Csv(), default="*")
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import json
|
||||||
|
from typing import Any, Callable, Coroutine, Optional
|
||||||
|
|
||||||
|
import websockets
|
||||||
|
|
||||||
|
from src.env import HASSIO_TOKEN, HASSIO_WS
|
||||||
|
from src.logger import logger
|
||||||
|
|
||||||
|
OnMessage = Callable[[str], Coroutine]
|
||||||
|
|
||||||
|
|
||||||
|
class WSRedirector:
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
on_message: OnMessage,
|
||||||
|
token: str = HASSIO_TOKEN,
|
||||||
|
host: str = HASSIO_WS,
|
||||||
|
) -> None:
|
||||||
|
self._host = host
|
||||||
|
self._token = token
|
||||||
|
self._on_message = on_message
|
||||||
|
self._client: Optional[Any] = None
|
||||||
|
self._close: bool = False
|
||||||
|
|
||||||
|
@property
|
||||||
|
def is_closed(self):
|
||||||
|
return self._close
|
||||||
|
|
||||||
|
async def send(self, msg: str):
|
||||||
|
if self._client:
|
||||||
|
return await self._client.send(msg)
|
||||||
|
|
||||||
|
async def start(self):
|
||||||
|
async with websockets.connect(self._host) as websocket:
|
||||||
|
self._client = websocket
|
||||||
|
await websocket.send(json.dumps({"type": "auth", "access_token": self._token}))
|
||||||
|
while not self.is_closed:
|
||||||
|
msg = await websocket.recv()
|
||||||
|
logger.debug(f"WS:MSG: {msg}")
|
||||||
|
await self.process_message(msg)
|
||||||
|
|
||||||
|
async def process_message(self, msg: str):
|
||||||
|
await self._on_message(msg)
|
||||||
|
|
||||||
|
def close(self):
|
||||||
|
self._close = True
|
||||||
|
|
||||||
|
def __del__(self):
|
||||||
|
self.close()
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
import io
|
import io
|
||||||
from typing import Any, TextIO, Union
|
from typing import Any, TextIO, Union
|
||||||
|
|
||||||
from src.yaml_serializer.base_yaml import yaml
|
import yaml
|
||||||
|
|
||||||
|
from src.yaml_serializer.dumper import YamlSafeDumper
|
||||||
|
from src.yaml_serializer.loader import YamlSafeLoader
|
||||||
|
|
||||||
|
|
||||||
def dump_yaml(obj: Any) -> str:
|
def dump_yaml(obj: Any) -> str:
|
||||||
@@ -14,7 +17,14 @@ def dump_yaml(obj: Any) -> str:
|
|||||||
str
|
str
|
||||||
"""
|
"""
|
||||||
stream = io.StringIO()
|
stream = io.StringIO()
|
||||||
yaml.dump(obj, stream)
|
yaml.dump( # nosec
|
||||||
|
obj,
|
||||||
|
stream,
|
||||||
|
default_flow_style=False,
|
||||||
|
allow_unicode=True,
|
||||||
|
sort_keys=False,
|
||||||
|
Dumper=YamlSafeDumper,
|
||||||
|
)
|
||||||
stream.seek(0)
|
stream.seek(0)
|
||||||
return stream.read()
|
return stream.read()
|
||||||
|
|
||||||
@@ -28,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
|
|||||||
Returns:
|
Returns:
|
||||||
List[dict, list]
|
List[dict, list]
|
||||||
"""
|
"""
|
||||||
return yaml.load(yaml_stream)
|
return yaml.load(yaml_stream, Loader=YamlSafeLoader) # nosec
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
from ruamel.yaml import YAML
|
|
||||||
|
|
||||||
from src.yaml_serializer.types import (
|
|
||||||
IncludedYaml,
|
|
||||||
IncludedYamlDir,
|
|
||||||
SecretValue,
|
|
||||||
)
|
|
||||||
|
|
||||||
yaml = YAML()
|
|
||||||
yaml.register_class(IncludedYaml)
|
|
||||||
yaml.register_class(SecretValue)
|
|
||||||
yaml.register_class(IncludedYamlDir)
|
|
||||||
yaml.constructor.add_constructor("!include", IncludedYaml.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!secret", SecretValue.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!env_var", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
|
|
||||||
yaml.constructor.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
import yaml
|
||||||
|
|
||||||
|
from src.yaml_serializer.types import (
|
||||||
|
IncludedYaml,
|
||||||
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class YamlSafeDumper(yaml.SafeDumper):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
YamlSafeDumper.add_representer(IncludedYaml, IncludedYaml.to_yaml) # type: ignore
|
||||||
|
YamlSafeDumper.add_representer(SecretValue, SecretValue.to_yaml) # type: ignore
|
||||||
|
YamlSafeDumper.add_representer(IncludedYamlDir, IncludedYamlDir.to_yaml) # type: ignore
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import yaml
|
||||||
|
|
||||||
|
from src.yaml_serializer.types import (
|
||||||
|
IncludedYaml,
|
||||||
|
IncludedYamlDir,
|
||||||
|
SecretValue,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class YamlSafeLoader(yaml.SafeLoader):
|
||||||
|
pass
|
||||||
|
# def compose_node(self, parent: yaml.nodes.Node, index: int) -> yaml.nodes.Node: # type: ignore[override]
|
||||||
|
# """Annotate a node with the first line it was seen."""
|
||||||
|
# last_line: int = self.line
|
||||||
|
# node: yaml.nodes.Node = super().compose_node(parent, index) # type: ignore[assignment]
|
||||||
|
# node.__line__ = last_line + 1 # type: ignore[attr-defined]
|
||||||
|
# return node
|
||||||
|
|
||||||
|
|
||||||
|
YamlSafeLoader.add_constructor("!include", IncludedYaml.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!secret", SecretValue.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!env_var", IncludedYamlDir.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!include_dir_list", IncludedYamlDir.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!include_dir_merge_list", IncludedYamlDir.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!include_dir_named", IncludedYamlDir.from_yaml)
|
||||||
|
YamlSafeLoader.add_constructor("!include_dir_merge_named", IncludedYamlDir.from_yaml)
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
from typing import NamedTuple
|
from typing import NamedTuple
|
||||||
|
|
||||||
from ruamel.yaml.nodes import Node
|
from yaml.nodes import Node
|
||||||
from ruamel.yaml.representer import BaseRepresenter
|
from yaml.representer import BaseRepresenter
|
||||||
|
|
||||||
|
|
||||||
class IncludedYaml(NamedTuple):
|
class IncludedYaml(NamedTuple):
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
|
import yaml
|
||||||
from fastapi.testclient import TestClient
|
from fastapi.testclient import TestClient
|
||||||
from ruamel.yaml import YAML
|
|
||||||
|
|
||||||
from src.api.app import make_app
|
from src.api.app import make_app
|
||||||
from src.automations.types import (
|
from src.automations.types import (
|
||||||
@@ -151,7 +151,7 @@ class automation_update_tests(BaseTestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
self.assertEqual(resp.status_code, 200)
|
||||||
with (self.config_folder / "automations.yaml").open("r") as fp:
|
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||||
disk_data = dict(YAML().load(fp)[15])
|
disk_data = dict(yaml.safe_load(fp)[15])
|
||||||
trigger = list(map(dict, disk_data.pop("trigger")))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop("condition")
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop("action")))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
@@ -202,7 +202,7 @@ class automation_update_tests(BaseTestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(resp.status_code, 200)
|
self.assertEqual(resp.status_code, 200)
|
||||||
with (self.config_folder / "automations.yaml").open("r") as fp:
|
with (self.config_folder / "automations.yaml").open("r") as fp:
|
||||||
disk_data = dict(YAML().load(fp)[27])
|
disk_data = dict(yaml.safe_load(fp)[27])
|
||||||
trigger = list(map(dict, disk_data.pop("trigger")))
|
trigger = list(map(dict, disk_data.pop("trigger")))
|
||||||
condition = disk_data.pop("condition")
|
condition = disk_data.pop("condition")
|
||||||
action = list(map(dict, disk_data.pop("action")))
|
action = list(map(dict, disk_data.pop("action")))
|
||||||
|
|||||||
@@ -1,11 +1,6 @@
|
|||||||
import json
|
import json
|
||||||
from unittest import TestCase
|
from unittest import TestCase
|
||||||
|
|
||||||
from ruamel.yaml.scalarbool import ScalarBoolean
|
|
||||||
from ruamel.yaml.scalarfloat import ScalarFloat
|
|
||||||
from ruamel.yaml.scalarint import ScalarInt
|
|
||||||
from ruamel.yaml.scalarstring import ScalarString
|
|
||||||
|
|
||||||
from src.json_serializer import json_dumps
|
from src.json_serializer import json_dumps
|
||||||
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
from src.yaml_serializer.types import NOT_IMPLEMENTED_SV_MSG, SecretValue
|
||||||
|
|
||||||
@@ -34,25 +29,3 @@ class json_serializer_tests(TestCase):
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_convert_ruamel_types(self):
|
|
||||||
self.assertEqual(
|
|
||||||
json_dumps(
|
|
||||||
{
|
|
||||||
"int": ScalarInt(1),
|
|
||||||
"float": ScalarFloat(1.3),
|
|
||||||
"bool": ScalarBoolean(False),
|
|
||||||
"list": [1, ScalarString("w")],
|
|
||||||
"tup": (1, ScalarString("w")),
|
|
||||||
}
|
|
||||||
),
|
|
||||||
json.dumps(
|
|
||||||
{
|
|
||||||
"int": 1,
|
|
||||||
"float": 1.3,
|
|
||||||
"bool": 0,
|
|
||||||
"list": [1, "w"],
|
|
||||||
"tup": (1, "w"),
|
|
||||||
},
|
|
||||||
),
|
|
||||||
)
|
|
||||||
@@ -19,21 +19,29 @@ class dumping_yamls_tests(TestCase):
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
self.assertEqual(yaml, "automations: !include automations.yaml\n")
|
self.assertEqual(yaml, "automations: !include 'automations.yaml'\n")
|
||||||
|
|
||||||
def test_dumping_secrets(self):
|
def test_dumping_secrets(self):
|
||||||
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
|
yaml = dump_yaml({"google_password": SecretValue("gpass", "supersec")})
|
||||||
self.assertEqual(yaml, "google_password: !secret gpass\n")
|
self.assertEqual(yaml, "google_password: !secret 'gpass'\n")
|
||||||
|
|
||||||
def test_dumping_stub(self):
|
def test_dumping_stub(self):
|
||||||
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
|
yaml = dump_yaml({"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml")})
|
||||||
self.assertEqual(yaml, "sensor: !include_dir_list sensors/*yaml\n")
|
self.assertEqual(yaml, "sensor: !include_dir_list 'sensors/*yaml'\n")
|
||||||
|
|
||||||
def test_load_stub(self):
|
def test_load_stub(self):
|
||||||
yaml_obj = load_yaml(
|
yaml_obj = load_yaml(
|
||||||
io.StringIO(
|
io.StringIO(
|
||||||
"""
|
"""
|
||||||
name: cool
|
name: cool
|
||||||
|
date: "10:00"
|
||||||
|
bools:
|
||||||
|
- "yes"
|
||||||
|
- "no"
|
||||||
|
- true
|
||||||
|
- false
|
||||||
|
bobIsNull:
|
||||||
|
bobIsNull2: null
|
||||||
google_password: !secret gpass
|
google_password: !secret gpass
|
||||||
sensor: !include_dir_list sensors/*yaml
|
sensor: !include_dir_list sensors/*yaml
|
||||||
automations: !include automations.yaml
|
automations: !include automations.yaml
|
||||||
@@ -44,6 +52,10 @@ class dumping_yamls_tests(TestCase):
|
|||||||
dict(yaml_obj),
|
dict(yaml_obj),
|
||||||
{
|
{
|
||||||
"name": "cool",
|
"name": "cool",
|
||||||
|
"date": "10:00",
|
||||||
|
"bools": ["yes", "no", True, False],
|
||||||
|
"bobIsNull": None,
|
||||||
|
"bobIsNull2": None,
|
||||||
"google_password": SecretValue("gpass", "n/a"),
|
"google_password": SecretValue("gpass", "n/a"),
|
||||||
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
|
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
|
||||||
"automations": IncludedYaml("automations.yaml"),
|
"automations": IncludedYaml("automations.yaml"),
|
||||||
@@ -51,8 +63,17 @@ class dumping_yamls_tests(TestCase):
|
|||||||
)
|
)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
dump_yaml(yaml_obj),
|
dump_yaml(yaml_obj),
|
||||||
"name: cool\n"
|
"""name: cool
|
||||||
"google_password: !secret gpass\n"
|
date: '10:00'
|
||||||
"sensor: !include_dir_list sensors/*yaml\n"
|
bools:
|
||||||
f"automations: !include automations.yaml\n",
|
- 'yes'
|
||||||
|
- 'no'
|
||||||
|
- true
|
||||||
|
- false
|
||||||
|
bobIsNull: null
|
||||||
|
bobIsNull2: null
|
||||||
|
google_password: !secret 'gpass'
|
||||||
|
sensor: !include_dir_list 'sensors/*yaml'
|
||||||
|
automations: !include 'automations.yaml'
|
||||||
|
""",
|
||||||
)
|
)
|
||||||
+6
-7
@@ -1,5 +1,5 @@
|
|||||||
name: Shortumation
|
name: Shortumation
|
||||||
version: 0.1.9
|
version: v0.1.14
|
||||||
slug: shortumation
|
slug: shortumation
|
||||||
image: asosnovsky/shortumation-{arch}
|
image: asosnovsky/shortumation-{arch}
|
||||||
url: "https://github.com/asosnovsky/Shortumation"
|
url: "https://github.com/asosnovsky/Shortumation"
|
||||||
@@ -16,16 +16,15 @@ init: false
|
|||||||
ingress: true
|
ingress: true
|
||||||
ingress_port: 8000
|
ingress_port: 8000
|
||||||
ingress_entry: "web/"
|
ingress_entry: "web/"
|
||||||
panel_icon: mdi:home-automation
|
homeassistant_api: true
|
||||||
hassio_role: manager
|
|
||||||
privileged:
|
|
||||||
- SYS_RAWIO
|
|
||||||
host_network: false
|
|
||||||
auth_api: true
|
auth_api: true
|
||||||
|
panel_icon: mdi:home-automation
|
||||||
|
hassio_role: homeassistant
|
||||||
|
host_network: false
|
||||||
map:
|
map:
|
||||||
- config:rw
|
- config:rw
|
||||||
options: {}
|
options: {}
|
||||||
ports:
|
ports:
|
||||||
8000/tcp: 8000
|
8000/tcp:
|
||||||
ports_description:
|
ports_description:
|
||||||
8000/tcp: Main port for the API & Web.
|
8000/tcp: Main port for the API & Web.
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
addon:
|
addon:
|
||||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
|
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
|
||||||
build:
|
build:
|
||||||
context: "./"
|
context: "./"
|
||||||
dockerfile: "./Dockerfile"
|
dockerfile: "./Dockerfile"
|
||||||
args:
|
args:
|
||||||
- BUILD_ARCH=${ARCH:-amd64}
|
BUILD_ARCH: ${ARCH:-amd64}
|
||||||
|
BUILD_VERSION: ${BUILD_TAG:-edge}
|
||||||
@@ -3,5 +3,8 @@ services:
|
|||||||
addon:
|
addon:
|
||||||
volumes:
|
volumes:
|
||||||
- "./sample_config:/config"
|
- "./sample_config:/config"
|
||||||
|
- "./api/tests:/app/tests"
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
|
env_file:
|
||||||
|
- api/.env
|
||||||
Executable
+28
@@ -0,0 +1,28 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
api_location=${1}
|
||||||
|
web_location=${2}
|
||||||
|
|
||||||
|
function install_yarn() {
|
||||||
|
pushd $web_location
|
||||||
|
yarn
|
||||||
|
yarn build
|
||||||
|
cp -r $web_location/build $api_location/web
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
function install_py() {
|
||||||
|
pushd $api_location
|
||||||
|
pip install . $api_location
|
||||||
|
popd
|
||||||
|
}
|
||||||
|
|
||||||
|
declare -i err=0 werr=0
|
||||||
|
install_py &
|
||||||
|
install_yarn &
|
||||||
|
while wait -fn || werr=$?; ((werr != 127)); do
|
||||||
|
err=$werr
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "DONE BUILD"
|
||||||
Executable
+19
@@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
function prep_yarn() {
|
||||||
|
npm i -g yarn
|
||||||
|
}
|
||||||
|
|
||||||
|
function prep_py() {
|
||||||
|
pip install -U wheel setuptools pip
|
||||||
|
}
|
||||||
|
|
||||||
|
declare -i err=0 werr=0
|
||||||
|
prep_py &
|
||||||
|
prep_yarn &
|
||||||
|
while wait -fn || werr=$?; ((werr != 127)); do
|
||||||
|
err=$werr
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "DONE PREP"
|
||||||
Executable
+10
@@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
api_location=${1}
|
||||||
|
|
||||||
|
pushd $api_location
|
||||||
|
echo "--------------------"
|
||||||
|
echo "BUILD_VERSION = "$BUILD_VERSION
|
||||||
|
echo $(python --version)
|
||||||
|
echo "--------------------"
|
||||||
|
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo $(python --version)
|
|
||||||
python -m uvicorn src.app:app --host "0.0.0.0" --port 8000
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
0:
|
0:
|
||||||
Type: Generic
|
Type: Generic2
|
||||||
1:
|
1:
|
||||||
Type: Generic
|
Type: Generic
|
||||||
2:
|
2:
|
||||||
|
|||||||
@@ -1,4 +1,7 @@
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
|
'core': {
|
||||||
|
builder: 'webpack5'
|
||||||
|
},
|
||||||
"stories": [
|
"stories": [
|
||||||
"../src/**/*.stories.mdx",
|
"../src/**/*.stories.mdx",
|
||||||
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
||||||
@@ -8,5 +11,8 @@ module.exports = {
|
|||||||
"@storybook/addon-essentials",
|
"@storybook/addon-essentials",
|
||||||
"@storybook/preset-create-react-app",
|
"@storybook/preset-create-react-app",
|
||||||
"@storybook/addon-queryparams",
|
"@storybook/addon-queryparams",
|
||||||
]
|
],
|
||||||
|
"features": {
|
||||||
|
"emotionAlias": false,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
Vendored
+6
-13
@@ -2,24 +2,17 @@
|
|||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
{
|
{
|
||||||
"name": "Debug CRA Tests",
|
"name": "Debug Jest Tests",
|
||||||
"type": "node",
|
"type": "node",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
|
"runtimeArgs": [
|
||||||
"args": [
|
"--inspect-brk",
|
||||||
"test",
|
"${workspaceRoot}/node_modules/.bin/jest",
|
||||||
"--runInBand",
|
"--runInBand"
|
||||||
"--no-cache",
|
|
||||||
"--watchAll=false"
|
|
||||||
],
|
],
|
||||||
"cwd": "${workspaceRoot}",
|
|
||||||
"protocol": "inspector",
|
|
||||||
"console": "integratedTerminal",
|
"console": "integratedTerminal",
|
||||||
"internalConsoleOptions": "neverOpen",
|
"internalConsoleOptions": "neverOpen",
|
||||||
"env": {
|
"port": 9229
|
||||||
"CI": "true"
|
|
||||||
},
|
|
||||||
"disableOptimisticBPs": true
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
+28
-13
@@ -4,21 +4,31 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"homepage": ".",
|
"homepage": ".",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@types/jest": "^26.0.15",
|
"@emotion/react": "^11.9.0",
|
||||||
"@types/node": "^12.0.0",
|
"@emotion/styled": "^11.8.1",
|
||||||
"@types/react": "^17.0.0",
|
"@mui/material": "^5.8.0",
|
||||||
"@types/react-dom": "^17.0.0",
|
"@mui/styles": "^5.8.0",
|
||||||
|
"@types/jest": "^27.5.1",
|
||||||
|
"@types/node": "^17.0.36",
|
||||||
|
"@types/react": "^18.0.9",
|
||||||
|
"@types/react-dom": "^18.0.5",
|
||||||
|
"@types/ws": "^8.5.3",
|
||||||
|
"@uiw/react-codemirror": "^4.7.0",
|
||||||
|
"autosuggest-highlight": "^3.2.1",
|
||||||
|
"home-assistant-js-websocket": "^7.1.0",
|
||||||
"jss": "^10.8.2",
|
"jss": "^10.8.2",
|
||||||
"react": "^17.0.2",
|
"notistack": "^2.0.5",
|
||||||
"react-dom": "^17.0.2",
|
"react": "^18.1.0",
|
||||||
|
"react-dom": "^18.1.0",
|
||||||
"react-flow-renderer": "^10.1.2",
|
"react-flow-renderer": "^10.1.2",
|
||||||
"react-jss": "^10.8.2",
|
"react-jss": "^10.8.2",
|
||||||
"react-router-dom": "6",
|
"react-router-dom": "6",
|
||||||
"react-scripts": "4.0.3",
|
"react-scripts": "5.0.1",
|
||||||
"superstruct": "^0.15.4",
|
"superstruct": "^0.15.4",
|
||||||
"theming": "^3.3.0",
|
"theming": "^3.3.0",
|
||||||
"typescript": "^4.1.2",
|
"typescript": "^4.1.2",
|
||||||
"web-vitals": "^1.0.1",
|
"web-vitals": "^2.1.4",
|
||||||
|
"ws": "^8.7.0",
|
||||||
"yarn": "^1.22.17"
|
"yarn": "^1.22.17"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -66,16 +76,21 @@
|
|||||||
"@storybook/addon-essentials": "^6.4.22",
|
"@storybook/addon-essentials": "^6.4.22",
|
||||||
"@storybook/addon-links": "^6.4.22",
|
"@storybook/addon-links": "^6.4.22",
|
||||||
"@storybook/addon-queryparams": "^6.2.9",
|
"@storybook/addon-queryparams": "^6.2.9",
|
||||||
|
"@storybook/builder-webpack5": "^6.5.6",
|
||||||
|
"@storybook/manager-webpack5": "^6.5.6",
|
||||||
"@storybook/node-logger": "^6.4.22",
|
"@storybook/node-logger": "^6.4.22",
|
||||||
"@storybook/preset-create-react-app": "^3.2.0",
|
"@storybook/preset-create-react-app": "^4.1.1",
|
||||||
"@storybook/react": "^6.4.22",
|
"@storybook/react": "^6.4.22",
|
||||||
"@testing-library/jest-dom": "^5.11.4",
|
"@testing-library/jest-dom": "^5.11.4",
|
||||||
"@testing-library/react": "^11.1.0",
|
"@testing-library/react": "^13.3.0",
|
||||||
"@testing-library/user-event": "^12.1.10",
|
"@testing-library/user-event": "^14.2.0",
|
||||||
|
"@types/autosuggest-highlight": "^3.2.0",
|
||||||
"@types/chroma-js": "^2.1.3",
|
"@types/chroma-js": "^2.1.3",
|
||||||
"@types/js-yaml": "^4.0.5",
|
"@types/js-yaml": "^4.0.5",
|
||||||
"jest-environment-jsdom": "^27.5.1",
|
"jest-environment-jsdom": "^28.1.0",
|
||||||
"ts-node": "^10.4.0"
|
"ts-node": "^10.8.0",
|
||||||
|
"webpack": "^5.72.1",
|
||||||
|
"webpack-dev-server": "^4.9.0"
|
||||||
},
|
},
|
||||||
"moduleDirectories": [
|
"moduleDirectories": [
|
||||||
"node_modules",
|
"node_modules",
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { ErrorBoundary } from 'components/ErrorBoundary';
|
|||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const api = useConnectedApiService();
|
const api = useConnectedApiService();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="app">
|
<div className="app">
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
|
|||||||
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
|
|||||||
data = {}
|
data = {}
|
||||||
}) {
|
}) {
|
||||||
try {
|
try {
|
||||||
const reply = await fetch(baseURL + path, {
|
const payload: RequestInit = {
|
||||||
method,
|
method,
|
||||||
headers: {
|
headers: {
|
||||||
"Content-Type": "application/json"
|
"Content-Type": "application/json"
|
||||||
},
|
},
|
||||||
body: JSON.stringify(data),
|
};
|
||||||
});
|
if (method !== 'GET') {
|
||||||
|
payload["body"] = JSON.stringify(data);
|
||||||
|
}
|
||||||
|
const reply = await fetch(baseURL + path, payload);
|
||||||
let response: APIResponse<any>;
|
let response: APIResponse<any>;
|
||||||
if (reply.status === 200) {
|
if (reply.status === 200) {
|
||||||
response = {
|
response = {
|
||||||
|
|||||||
@@ -4,14 +4,19 @@ import { makeRemoteAPI } from "./base";
|
|||||||
import { useAPIService } from './core';
|
import { useAPIService } from './core';
|
||||||
import { useMockAPI } from "./mock";
|
import { useMockAPI } from "./mock";
|
||||||
|
|
||||||
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
const locationPrefixWeb = window.location.pathname.match(/(\/.+\/)web/i);
|
||||||
|
const baseURL = new URL(
|
||||||
|
process.env.NODE_ENV === 'development' ?
|
||||||
|
"http://localhost:8000" :
|
||||||
|
window.location.origin + (!locationPrefixWeb ? '' : locationPrefixWeb[1])
|
||||||
|
);
|
||||||
|
export const wsURL = baseURL + "socket"
|
||||||
|
console.log({ baseURL, wsURL })
|
||||||
|
export const remoteAutoAPI = makeRemoteAPI(
|
||||||
|
baseURL + "automations"
|
||||||
|
);
|
||||||
export const useConnectedApiService = () => useAPIService(
|
export const useConnectedApiService = () => useAPIService(
|
||||||
makeAutomationAPI(makeRemoteAPI(
|
makeAutomationAPI(remoteAutoAPI)
|
||||||
process.env.NODE_ENV === 'development' ?
|
|
||||||
"http://localhost:8000/automations" :
|
|
||||||
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
|
|
||||||
))
|
|
||||||
);
|
);
|
||||||
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
||||||
makeAutomationAPI(useMockAPI(initialAutos))
|
makeAutomationAPI(useMockAPI(initialAutos))
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ export const useMockAPI = (
|
|||||||
method = "POST",
|
method = "POST",
|
||||||
data = {}
|
data = {}
|
||||||
}) {
|
}) {
|
||||||
console.debug("[[mockCall]]", method, path, data);
|
// console.debug("[[mockCall]]", method, path, data);
|
||||||
if (path === AUTOMTAION_LIST) {
|
if (path === AUTOMTAION_LIST) {
|
||||||
return {
|
return {
|
||||||
ok: true,
|
ok: true,
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export interface ListParams {
|
|||||||
}
|
}
|
||||||
export type APIRequest<D> = {
|
export type APIRequest<D> = {
|
||||||
path: string;
|
path: string;
|
||||||
method?: "POST" | "DELETE",
|
method?: "POST" | "DELETE" | "GET",
|
||||||
data?: D;
|
data?: D;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,13 @@
|
|||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.automation-editor--info-box--tag-list {
|
||||||
|
max-height: 30vh;
|
||||||
|
overflow-y: scroll;
|
||||||
|
padding-left: 0.25em;
|
||||||
|
padding-right: 0.25em;
|
||||||
|
}
|
||||||
|
|
||||||
.automation-editor--info-box--tags>h1 {
|
.automation-editor--info-box--tags>h1 {
|
||||||
font-size: 1.5em;
|
font-size: 1.5em;
|
||||||
}
|
}
|
||||||
@@ -49,6 +56,7 @@
|
|||||||
|
|
||||||
.automation-editor--info-box--tag>div {
|
.automation-editor--info-box--tag>div {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box--tag>div>input {
|
.automation-editor--info-box--tag>div>input {
|
||||||
@@ -56,29 +64,11 @@
|
|||||||
padding: 1em 0.25em 0.2em 0.25em;
|
padding: 1em 0.25em 0.2em 0.25em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box--tag>button {
|
.automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
|
||||||
height: 1.25em;
|
height: 2em;
|
||||||
width: 1.25em;
|
width: 2em;
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-editor--info-box--tag--error {
|
|
||||||
width: 100%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-editor--info-box--tag--error.hide {
|
|
||||||
height: 0;
|
|
||||||
opacity: 0;
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.automation-editor--info-box--tag--error.show {
|
|
||||||
height: fit-content;
|
|
||||||
opacity: 1;
|
|
||||||
}
|
|
||||||
@@ -1,19 +1,29 @@
|
|||||||
|
|
||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { makeTagDB } from "components/AutomationList/TagDB";
|
||||||
|
import { Page } from "components/Page";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutoInfoBox } from "./AutoInfoBox";
|
import { AutoInfoBox } from "./AutoInfoBox";
|
||||||
|
import { defaultAutomation } from 'utils/defaults';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList/Editor/InfoBox',
|
title: 'App/AutomationList/Editor/InfoBox',
|
||||||
component: AutoInfoBox,
|
component: AutoInfoBox,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {
|
||||||
|
tagDB: makeTagDB([
|
||||||
|
defaultAutomation("test")
|
||||||
|
])
|
||||||
|
}
|
||||||
} as ComponentMeta<typeof AutoInfoBox>;
|
} as ComponentMeta<typeof AutoInfoBox>;
|
||||||
|
|
||||||
|
|
||||||
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
||||||
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
|
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
|
||||||
return (
|
return (
|
||||||
<div className="page">
|
<Page>
|
||||||
<AutoInfoBox
|
<AutoInfoBox
|
||||||
|
{...args}
|
||||||
className=""
|
className=""
|
||||||
metadata={metadata}
|
metadata={metadata}
|
||||||
tags={tags}
|
tags={tags}
|
||||||
@@ -22,7 +32,7 @@ export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
|||||||
setState([m, t])
|
setState([m, t])
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Page>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
NoTags.args = {
|
NoTags.args = {
|
||||||
|
|||||||
@@ -2,16 +2,19 @@ import "./AutoInfoBox.css";
|
|||||||
import { AutomationMetadata } from "types/automations";
|
import { AutomationMetadata } from "types/automations";
|
||||||
import { InputList } from "components/Inputs/InputList";
|
import { InputList } from "components/Inputs/InputList";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import InputTextArea from "components/Inputs/InputTextArea";
|
import { FC, ReactNode, useRef, useState } from 'react';
|
||||||
import { FC, useRef, useState } from 'react';
|
|
||||||
import { AddIcon, TrashIcon } from "components/Icons";
|
import { AddIcon, TrashIcon } from "components/Icons";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
|
import InputAutoText from "components/Inputs/InputAutoText";
|
||||||
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
className: string;
|
className: string;
|
||||||
metadata: AutomationMetadata;
|
metadata: AutomationMetadata;
|
||||||
tags: Array<[string, string]>;
|
tags: Array<[string, string]>;
|
||||||
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
||||||
|
tagDB: TagDB;
|
||||||
|
children?: ReactNode;
|
||||||
}
|
}
|
||||||
export const AutoInfoBox: FC<Props> = ({
|
export const AutoInfoBox: FC<Props> = ({
|
||||||
metadata,
|
metadata,
|
||||||
@@ -19,6 +22,7 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
onUpdate,
|
onUpdate,
|
||||||
className,
|
className,
|
||||||
children,
|
children,
|
||||||
|
tagDB,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
|
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
|
||||||
@@ -26,6 +30,7 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
const errorTimeoutId = useRef(-1);
|
const errorTimeoutId = useRef(-1);
|
||||||
|
|
||||||
// aliases
|
// aliases
|
||||||
|
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
|
||||||
const setError = (index: number | 'new', msg: string) => {
|
const setError = (index: number | 'new', msg: string) => {
|
||||||
_setError([index, msg])
|
_setError([index, msg])
|
||||||
if (errorTimeoutId.current >= 0) {
|
if (errorTimeoutId.current >= 0) {
|
||||||
@@ -69,7 +74,9 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
if (error) {
|
if (error) {
|
||||||
return setError('new', error)
|
return setError('new', error)
|
||||||
}
|
}
|
||||||
onUpdate(metadata, tags.concat([newTag]));
|
onUpdate(metadata, tags.concat([
|
||||||
|
newTag.map(x => x.trim()) as [string, string]
|
||||||
|
]));
|
||||||
setNewTag(['', '']);
|
setNewTag(['', '']);
|
||||||
}
|
}
|
||||||
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
|
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
|
||||||
@@ -80,8 +87,8 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
return <div className={`automation-editor--info-box ${className}`}>
|
return <div className={`automation-editor--info-box ${className}`}>
|
||||||
<div className="automation-editor--info-box-inner">
|
<div className="automation-editor--info-box-inner">
|
||||||
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
|
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
|
||||||
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} />
|
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
|
||||||
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} />
|
<InputText multiline label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
|
||||||
<InputList
|
<InputList
|
||||||
label="Mode"
|
label="Mode"
|
||||||
current={metadata.mode}
|
current={metadata.mode}
|
||||||
@@ -95,22 +102,42 @@ export const AutoInfoBox: FC<Props> = ({
|
|||||||
/>
|
/>
|
||||||
<div className="automation-editor--info-box--tags">
|
<div className="automation-editor--info-box--tags">
|
||||||
<h1>Tags</h1>
|
<h1>Tags</h1>
|
||||||
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
<div className="automation-editor--info-box--tag-list">
|
||||||
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
{tags.map(([tagName, tagValue], tagIndex) => <div key={tagIndex} className="automation-editor--info-box--tag">
|
||||||
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
|
<InputAutoText
|
||||||
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
|
value={tagName}
|
||||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
|
label="Name"
|
||||||
{error}
|
onChange={v => updateTagName(v, tagIndex)}
|
||||||
</span>
|
options={foundNewTagNames}
|
||||||
</div>)}
|
error={errorIndex === tagIndex ? error : undefined}
|
||||||
|
/>
|
||||||
|
<InputAutoText
|
||||||
|
value={tagValue}
|
||||||
|
label="Tag"
|
||||||
|
onChange={v => onUpdateTags(v, tagIndex)}
|
||||||
|
options={tagDB.getTagValues(tagName)}
|
||||||
|
error={errorIndex === tagIndex ? error : undefined}
|
||||||
|
/>
|
||||||
|
<Button className="automation-editor--info-box--tag--trash" onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
||||||
|
</div>)}
|
||||||
|
</div>
|
||||||
<hr />
|
<hr />
|
||||||
<div className="automation-editor--info-box--tag">
|
<div className="automation-editor--info-box--tag">
|
||||||
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
|
<InputAutoText
|
||||||
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
|
value={newTag[0]}
|
||||||
<Button onClick={addNewTag} ><AddIcon /></Button>
|
label="Name"
|
||||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
|
onChange={v => setNewTag([v, newTag[1]])}
|
||||||
{error}
|
options={foundNewTagNames}
|
||||||
</span>
|
error={errorIndex === 'new' ? error : undefined}
|
||||||
|
/>
|
||||||
|
<InputAutoText
|
||||||
|
value={newTag[1]}
|
||||||
|
label="Tag"
|
||||||
|
onChange={v => setNewTag([newTag[0], v])}
|
||||||
|
options={tagDB.getTagValues(newTag[0])}
|
||||||
|
error={errorIndex === 'new' ? error : undefined}
|
||||||
|
/>
|
||||||
|
<Button className="automation-editor--info-box--tag--add" onClick={addNewTag} ><AddIcon /></Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
.automation-editor {
|
.automation-editor {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
position: relative;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
@@ -75,3 +76,25 @@
|
|||||||
transform: rotate(180deg);
|
transform: rotate(180deg);
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.automation-editor.loading .mock-list {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
width: 40%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.automation-editor.loading .mock-graph {
|
||||||
|
position: absolute;
|
||||||
|
left: 40%;
|
||||||
|
width: 60%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-editor .linear-loader {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
@@ -2,7 +2,9 @@ import React from "react";
|
|||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
import { AutomationEditor } from './index';
|
import { AutomationEditor } from './index';
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import * as dgconst from 'components/DAGSvgs/constants';
|
import * as dgconst from 'components/DAGFlow/constants';
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { makeTagDB } from "components/AutomationList/TagDB";
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -10,21 +12,22 @@ export default {
|
|||||||
component: AutomationEditor,
|
component: AutomationEditor,
|
||||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
args: {
|
args: {
|
||||||
dims: dgconst.DEFAULT_DIMS
|
dims: dgconst.DEFAULT_DIMS,
|
||||||
}
|
}
|
||||||
} as ComponentMeta<typeof AutomationEditor>
|
} as ComponentMeta<typeof AutomationEditor>
|
||||||
|
|
||||||
const Template: ComponentStory<typeof AutomationEditor> = args => {
|
const Template: ComponentStory<typeof AutomationEditor> = args => {
|
||||||
const [state, setState] = useState(args.automation)
|
const [state, setState] = useState(args.automation)
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<AutomationEditor
|
<AutomationEditor
|
||||||
{...args}
|
{...args}
|
||||||
|
tagDB={makeTagDB(state ? [state] : [])}
|
||||||
automation={state}
|
automation={state}
|
||||||
onUpdate={s => {
|
onUpdate={s => {
|
||||||
window.setTimeout(() => setState(s), 3000)
|
window.setTimeout(() => setState(s), 3000)
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Loading = Template.bind({});
|
export const Loading = Template.bind({});
|
||||||
|
|||||||
@@ -10,16 +10,21 @@ import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
|
|||||||
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
||||||
import { MiniFailure } from 'types/validators/helper';
|
import { MiniFailure } from 'types/validators/helper';
|
||||||
import InputYaml from "components/Inputs/InputYaml";
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
|
import { TagDB } from "components/AutomationList/TagDB";
|
||||||
|
import Skeleton from "@mui/material/Skeleton";
|
||||||
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
automation?: AutomationData;
|
automation?: AutomationData;
|
||||||
dims: DAGAutomationFlowDims;
|
dims: DAGAutomationFlowDims;
|
||||||
onUpdate: (auto: AutomationData) => void;
|
onUpdate: (auto: AutomationData) => void;
|
||||||
|
tagDB: TagDB;
|
||||||
}
|
}
|
||||||
export const AutomationEditor: FC<Props> = ({
|
export const AutomationEditor: FC<Props> = ({
|
||||||
dims,
|
dims,
|
||||||
automation: propsAutos,
|
automation: propsAutos,
|
||||||
onUpdate: propsOnUpdate,
|
onUpdate: propsOnUpdate,
|
||||||
|
tagDB,
|
||||||
}) => {
|
}) => {
|
||||||
// state
|
// state
|
||||||
const {
|
const {
|
||||||
@@ -38,7 +43,9 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
// render
|
// render
|
||||||
if (state.status === 'loading') {
|
if (state.status === 'loading') {
|
||||||
return <div className="automation-editor loading">
|
return <div className="automation-editor loading">
|
||||||
Loading...
|
<LinearProgress className="linear-loader" />
|
||||||
|
<Skeleton className="mock-list" variant="rectangular" />
|
||||||
|
<Skeleton className="mock-graph" variant="rectangular" />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
if (state.status === 'invalid') {
|
if (state.status === 'invalid') {
|
||||||
@@ -50,17 +57,20 @@ export const AutomationEditor: FC<Props> = ({
|
|||||||
/>
|
/>
|
||||||
}
|
}
|
||||||
return <div className="automation-editor">
|
return <div className="automation-editor">
|
||||||
|
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
|
||||||
<AutoInfoBox
|
<AutoInfoBox
|
||||||
className={closeInfo ? "hide" : "show"}
|
className={closeInfo ? "hide" : "show"}
|
||||||
metadata={state.data.metadata}
|
metadata={state.data.metadata}
|
||||||
tags={state.data.tags}
|
tags={state.data.tags}
|
||||||
onUpdate={updateMetadata}
|
onUpdate={updateMetadata}
|
||||||
|
tagDB={tagDB}
|
||||||
>
|
>
|
||||||
<ButtonIcon
|
<ButtonIcon
|
||||||
className="automation-editor--info-box--icon"
|
className="automation-editor--info-box--icon"
|
||||||
onClick={() => setCloseInfo(!closeInfo)}
|
onClick={() => setCloseInfo(!closeInfo)}
|
||||||
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
||||||
>{ArrowIcon}</ButtonIcon>
|
Icon={ArrowIcon}
|
||||||
|
/>
|
||||||
</AutoInfoBox>
|
</AutoInfoBox>
|
||||||
|
|
||||||
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
||||||
@@ -133,11 +143,11 @@ export const ValidationBox: FC<{
|
|||||||
</>)}
|
</>)}
|
||||||
</ul>
|
</ul>
|
||||||
<span>Please correct the automation file manually and then continue!</span>
|
<span>Please correct the automation file manually and then continue!</span>
|
||||||
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} resizable />
|
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} />
|
||||||
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} resizable />
|
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} />
|
||||||
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} resizable />
|
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} />
|
||||||
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} resizable />
|
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} />
|
||||||
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} resizable />
|
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} />
|
||||||
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
|
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,7 @@ import { MiniFailure } from '../../types/validators/helper';
|
|||||||
|
|
||||||
export type EditorData = ReturnType<typeof genEditorData>;
|
export type EditorData = ReturnType<typeof genEditorData>;
|
||||||
export type EditorState = {
|
export type EditorState = {
|
||||||
status: 'unchanged' | 'changed',
|
status: 'unchanged' | 'changed' | 'saving',
|
||||||
data: EditorData
|
data: EditorData
|
||||||
} | {
|
} | {
|
||||||
status: 'loading'
|
status: 'loading'
|
||||||
@@ -43,7 +43,8 @@ export const useAutomatioEditorState = (
|
|||||||
}), {})
|
}), {})
|
||||||
};
|
};
|
||||||
update({
|
update({
|
||||||
status: "loading",
|
status: "saving",
|
||||||
|
data,
|
||||||
})
|
})
|
||||||
onSave(cleanData);
|
onSave(cleanData);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,9 @@ import "styles/root.css";
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutomationList } from ".";
|
import { AutomationList } from ".";
|
||||||
import { createMockAuto } from "utils/mocks";
|
import { bigMockAutoList } from "utils/mocks";
|
||||||
import * as dgconst from 'components/DAGSvgs/constants';
|
import * as dgconst from 'components/DAGFlow/constants';
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList',
|
title: 'App/AutomationList',
|
||||||
@@ -17,7 +18,7 @@ export default {
|
|||||||
|
|
||||||
const Template: ComponentStory<typeof AutomationList> = args => {
|
const Template: ComponentStory<typeof AutomationList> = args => {
|
||||||
const [autos, setAutos] = useState(args.automations)
|
const [autos, setAutos] = useState(args.automations)
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<AutomationList {...args} automations={autos}
|
<AutomationList {...args} automations={autos}
|
||||||
onAdd={a => {
|
onAdd={a => {
|
||||||
args.onAdd(a);
|
args.onAdd(a);
|
||||||
@@ -39,7 +40,7 @@ const Template: ComponentStory<typeof AutomationList> = args => {
|
|||||||
]);
|
]);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const EmptyStart = Template.bind({})
|
export const EmptyStart = Template.bind({})
|
||||||
@@ -51,210 +52,7 @@ EmptyStart.args = {
|
|||||||
export const FewAutos = Template.bind({})
|
export const FewAutos = Template.bind({})
|
||||||
FewAutos.args = {
|
FewAutos.args = {
|
||||||
...FewAutos.args,
|
...FewAutos.args,
|
||||||
automations: [
|
automations: bigMockAutoList,
|
||||||
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(),
|
|
||||||
{
|
|
||||||
"metadata": {
|
|
||||||
"id": "1649947692702",
|
|
||||||
"alias": "Bed Remote",
|
|
||||||
"description": "",
|
|
||||||
"trigger_variables": null,
|
|
||||||
"mode": "single"
|
|
||||||
},
|
|
||||||
"trigger": [
|
|
||||||
{
|
|
||||||
"device_id": "asdasdasdas",
|
|
||||||
"domain": "zha",
|
|
||||||
"platform": "device",
|
|
||||||
"type": "remote_button_short_press",
|
|
||||||
"subtype": "turn_on",
|
|
||||||
"id": "turn_on"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"device_id": "asdasdasdas",
|
|
||||||
"domain": "zha",
|
|
||||||
"platform": "device",
|
|
||||||
"type": "remote_button_short_press",
|
|
||||||
"subtype": "turn_off",
|
|
||||||
"id": "turn_off"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"device_id": "asdasdasdas",
|
|
||||||
"domain": "zha",
|
|
||||||
"platform": "device",
|
|
||||||
"type": "remote_button_short_press",
|
|
||||||
"subtype": "dim_up",
|
|
||||||
"id": "dim_up"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"device_id": "asdasdasdas",
|
|
||||||
"domain": "zha",
|
|
||||||
"platform": "device",
|
|
||||||
"type": "remote_button_short_press",
|
|
||||||
"subtype": "dim_down",
|
|
||||||
"id": "dim_down"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"device_id": "asdasdasdas",
|
|
||||||
"domain": "zha",
|
|
||||||
"platform": "device",
|
|
||||||
"type": "remote_button_double_press",
|
|
||||||
"subtype": "turn_on",
|
|
||||||
"id": "up_dbclk"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"condition": [],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"choose": [
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "trigger",
|
|
||||||
"id": "turn_off"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"type": "turn_off",
|
|
||||||
"device_id": "asdasdasdasdas",
|
|
||||||
"entity_id": "light.bulb_ari_lamp",
|
|
||||||
"domain": "light"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "trigger",
|
|
||||||
"id": "turn_on"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"service": "light.turn_on",
|
|
||||||
"data": {
|
|
||||||
"color_temp": 153,
|
|
||||||
"brightness_pct": 100
|
|
||||||
},
|
|
||||||
"target": {
|
|
||||||
"device_id": "asdasdasdasdas"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "trigger",
|
|
||||||
"id": "dim_up"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"device_id": "asdasdasdasdas",
|
|
||||||
"domain": "light",
|
|
||||||
"entity_id": "light.bulb_ari_lamp",
|
|
||||||
"type": "brightness_increase"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "trigger",
|
|
||||||
"id": "dim_down"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"device_id": "asdasdasdasdas",
|
|
||||||
"domain": "light",
|
|
||||||
"entity_id": "light.bulb_ari_lamp",
|
|
||||||
"type": "brightness_decrease"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "trigger",
|
|
||||||
"id": "up_dbclk"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"service": "light.turn_on",
|
|
||||||
"data": {
|
|
||||||
"color_temp": 500,
|
|
||||||
"brightness_pct": 100
|
|
||||||
},
|
|
||||||
"target": {
|
|
||||||
"device_id": "asdasdasdasdas"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"default": []
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"tags": {
|
|
||||||
"Type": "Remote",
|
|
||||||
"Room": "Bedroom"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"metadata": {
|
|
||||||
"id": "1641617168123",
|
|
||||||
"alias": "Ensure On",
|
|
||||||
"description": "",
|
|
||||||
"trigger_variables": null,
|
|
||||||
"mode": "single"
|
|
||||||
},
|
|
||||||
"trigger": [
|
|
||||||
{
|
|
||||||
"platform": "device",
|
|
||||||
"type": "turned_off",
|
|
||||||
"device_id": "tasdasdasdasdasdasda",
|
|
||||||
"entity_id": "switch.power_washer",
|
|
||||||
"domain": "switch"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"platform": "device",
|
|
||||||
"type": "turned_off",
|
|
||||||
"device_id": "dasdasdasdasdas",
|
|
||||||
"entity_id": "switch.plug_living_room_tv",
|
|
||||||
"domain": "switch"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"condition": [],
|
|
||||||
"sequence": [
|
|
||||||
{
|
|
||||||
"type": "turn_on",
|
|
||||||
"device_id": "tasdasdasdasdasdasda",
|
|
||||||
"entity_id": "switch.power_washer",
|
|
||||||
"domain": "switch"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "turn_on",
|
|
||||||
"device_id": "dasdasdasdasdas",
|
|
||||||
"entity_id": "switch.plug_living_room_tv",
|
|
||||||
"domain": "switch"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"tags": {}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -263,6 +61,38 @@ export const BadAutmations = Template.bind({})
|
|||||||
BadAutmations.args = {
|
BadAutmations.args = {
|
||||||
...BadAutmations.args,
|
...BadAutmations.args,
|
||||||
automations: [
|
automations: [
|
||||||
|
{
|
||||||
|
"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
|
||||||
|
},
|
||||||
|
"service": "climate.set_temperature",
|
||||||
|
"target": {
|
||||||
|
"entity_id": "climate.thermostat"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"tags": {},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
condition: [],
|
condition: [],
|
||||||
tags: {},
|
tags: {},
|
||||||
@@ -310,3 +140,41 @@ BadAutmations.args = {
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = args => {
|
||||||
|
const [autos, setAutos] = useState(args.automations)
|
||||||
|
return <Page>
|
||||||
|
<AutomationList {...args} automations={autos}
|
||||||
|
onAdd={a => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
args.onAdd(a);
|
||||||
|
setAutos([...autos, a]);
|
||||||
|
}, 10000)
|
||||||
|
}}
|
||||||
|
onRemove={i => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
args.onRemove(i);
|
||||||
|
setAutos([
|
||||||
|
...autos.slice(0, i),
|
||||||
|
...autos.slice(i + 1),
|
||||||
|
]);
|
||||||
|
}, 10000)
|
||||||
|
}}
|
||||||
|
onUpdate={(i, a) => {
|
||||||
|
window.setTimeout(() => {
|
||||||
|
args.onUpdate(i, a);
|
||||||
|
setAutos([
|
||||||
|
...autos.slice(0, i),
|
||||||
|
a,
|
||||||
|
...autos.slice(i + 1),
|
||||||
|
]);
|
||||||
|
}, 10000)
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
}
|
||||||
|
FewAutosWithSlowLoader.args = {
|
||||||
|
...FewAutosWithSlowLoader.args,
|
||||||
|
automations: bigMockAutoList,
|
||||||
|
}
|
||||||
@@ -5,7 +5,8 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body {
|
.automation-list-box--body {
|
||||||
overflow: auto;
|
overflow-y: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
@@ -24,7 +25,15 @@
|
|||||||
padding-bottom: 0.5em;
|
padding-bottom: 0.5em;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
border-bottom-style: solid;
|
border-bottom-style: solid;
|
||||||
border-color: white;
|
border-color: var(--primary-accent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--group.other {
|
||||||
|
border-color: var(--green);
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list-box--body--group.other>b {
|
||||||
|
color: var(--change);
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group>.automation-list-box--body--group {
|
.automation-list-box--body--group>.automation-list-box--body--group {
|
||||||
@@ -40,7 +49,8 @@
|
|||||||
padding: 0.1em;
|
padding: 0.1em;
|
||||||
}
|
}
|
||||||
|
|
||||||
.automation-list-box--body--group>b:hover {
|
.automation-list-box--body--group>b:hover,
|
||||||
|
.automation-list-box--body--group.selected>b {
|
||||||
background-color: var(--secondary-accent);
|
background-color: var(--secondary-accent);
|
||||||
color: var(--secondary);
|
color: var(--secondary);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutomationListBox } from "./AutomationListBox";
|
import { AutomationListBox } from "./AutomationListBox";
|
||||||
import { createMockAuto } from "utils/mocks";
|
import { createMockAuto } from "utils/mocks";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList/Box',
|
title: 'App/AutomationList/Box',
|
||||||
@@ -14,12 +15,12 @@ export default {
|
|||||||
|
|
||||||
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
||||||
const [selected, setSelected] = useState(args.selected)
|
const [selected, setSelected] = useState(args.selected)
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
|
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
|
||||||
setSelected(i)
|
setSelected(i)
|
||||||
args.onSelectAutomation(i)
|
args.onSelectAutomation(i)
|
||||||
}} />
|
}} />
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const EmptyStart = Template.bind({})
|
export const EmptyStart = Template.bind({})
|
||||||
|
|||||||
@@ -1,88 +1,18 @@
|
|||||||
import { groupAutomations, getTagList } from './AutomationListBox';
|
import { getTagList } from './AutomationListBox';
|
||||||
import { AutomationData } from 'types/automations/index';
|
|
||||||
import { createMockAuto } from 'utils/mocks';
|
import { createMockAuto } from 'utils/mocks';
|
||||||
|
|
||||||
test('group automations', () => {
|
// const makeDummy = (id: string, tags: Record<string, string>) => ({
|
||||||
const automations: AutomationData[] = [
|
// condition: [],
|
||||||
{
|
// metadata: {
|
||||||
condition: [],
|
// id,
|
||||||
metadata: {
|
// alias: '',
|
||||||
id: '1',
|
// description: '',
|
||||||
alias: '',
|
// mode: 'single',
|
||||||
description: '',
|
// },
|
||||||
mode: 'single',
|
// tags,
|
||||||
},
|
// sequence: [],
|
||||||
tags: {
|
// trigger: [],
|
||||||
"Room": 'Living Room',
|
// })
|
||||||
"Type": 'Lights'
|
|
||||||
},
|
|
||||||
sequence: [],
|
|
||||||
trigger: [],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
condition: [],
|
|
||||||
metadata: {
|
|
||||||
id: '2',
|
|
||||||
alias: '',
|
|
||||||
description: '',
|
|
||||||
mode: 'single',
|
|
||||||
},
|
|
||||||
tags: {
|
|
||||||
"Room": 'Living Room',
|
|
||||||
"Type": 'Climate'
|
|
||||||
},
|
|
||||||
sequence: [],
|
|
||||||
trigger: [],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
condition: [],
|
|
||||||
metadata: {
|
|
||||||
id: '3',
|
|
||||||
alias: '',
|
|
||||||
description: '',
|
|
||||||
mode: 'single',
|
|
||||||
},
|
|
||||||
tags: {
|
|
||||||
"Room": 'Kitchen',
|
|
||||||
"Type": 'Climate'
|
|
||||||
},
|
|
||||||
sequence: [],
|
|
||||||
trigger: [],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
expect(groupAutomations(automations, [0, 1], ['Room', "Type"])).toStrictEqual({
|
|
||||||
"Living Room": {
|
|
||||||
"Lights": [0],
|
|
||||||
"Climate": [1],
|
|
||||||
},
|
|
||||||
"Kitchen": {
|
|
||||||
"Climate": [2],
|
|
||||||
}
|
|
||||||
})
|
|
||||||
expect(groupAutomations(automations, [1, 0], ['Room', "Type"])).toStrictEqual({
|
|
||||||
"Lights": {
|
|
||||||
"Living Room": [0],
|
|
||||||
},
|
|
||||||
"Climate": {
|
|
||||||
"Living Room": [1],
|
|
||||||
"Kitchen": [2]
|
|
||||||
}
|
|
||||||
})
|
|
||||||
expect(groupAutomations(automations, [1], ['Room', "Type"])).toStrictEqual({
|
|
||||||
"Lights": [0],
|
|
||||||
"Climate": [1, 2]
|
|
||||||
})
|
|
||||||
expect(groupAutomations(automations, [0], ['Room', "Type"])).toStrictEqual({
|
|
||||||
"Living Room": [0, 1],
|
|
||||||
"Kitchen": [2]
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
expect(groupAutomations(automations, [], ['Room', "Type"])).toStrictEqual([
|
|
||||||
0, 1, 2
|
|
||||||
])
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
test('getTagList', () => {
|
test('getTagList', () => {
|
||||||
expect(getTagList([
|
expect(getTagList([
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
import "./AutomationListBox.css";
|
import "./AutomationListBox.css";
|
||||||
import { FC, useState } from 'react';
|
import { FC, useState } from 'react';
|
||||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import { Button } from "components/Inputs/Button";
|
import { Button } from "components/Inputs/Button";
|
||||||
import { TrashIcon } from "components/Icons";
|
import { makeGrouping } from "./automationGrouper";
|
||||||
|
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
|
||||||
|
|
||||||
|
|
||||||
export type Props = {
|
export type Props = {
|
||||||
@@ -27,7 +28,11 @@ export const AutomationListBox: FC<Props> = ({
|
|||||||
const [searchText, setSearchText] = useState('');
|
const [searchText, setSearchText] = useState('');
|
||||||
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
||||||
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
|
const filteredAutomations = filterAutomations(automations, searchText, selectedTagIdx, tags);
|
||||||
const groups = groupAutomations(filteredAutomations.map(([a, _]) => a), selectedTagIdx, tags);
|
const grouping = makeGrouping(
|
||||||
|
filteredAutomations.map(([a, _]) => a),
|
||||||
|
selectedTagIdx.map(i => tags[i]),
|
||||||
|
selected,
|
||||||
|
)
|
||||||
|
|
||||||
return <div className="automation-list-box">
|
return <div className="automation-list-box">
|
||||||
<div className="automation-list-box--nav">
|
<div className="automation-list-box--nav">
|
||||||
@@ -45,7 +50,15 @@ export const AutomationListBox: FC<Props> = ({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list-box--body">
|
<div className="automation-list-box--body">
|
||||||
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
|
<AutomationListBoxGroup
|
||||||
|
events={{
|
||||||
|
onSelectAutomation,
|
||||||
|
onRemove
|
||||||
|
}}
|
||||||
|
autos={filteredAutomations}
|
||||||
|
grouping={grouping}
|
||||||
|
selectedAutomationIdx={selected}
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list-box--bottom">
|
<div className="automation-list-box--bottom">
|
||||||
<Button onClick={onAdd}>Add</Button>
|
<Button onClick={onAdd}>Add</Button>
|
||||||
@@ -71,141 +84,12 @@ const filterAutomations = (autos: AutomationData[], searchText: string, selected
|
|||||||
if (searchText.length > 0) {
|
if (searchText.length > 0) {
|
||||||
if (
|
if (
|
||||||
!(
|
!(
|
||||||
a.metadata.description.toLocaleLowerCase().includes(searchText) ||
|
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
|
||||||
a.metadata.alias.toLocaleLowerCase().includes(searchText)
|
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
|
||||||
)
|
)
|
||||||
) {
|
) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (selected.length > 0) {
|
|
||||||
for (const i of selected) {
|
|
||||||
if (!a.tags[tags[i]]) {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
export const groupAutomations = (
|
|
||||||
autos: AutomationData[],
|
|
||||||
selected: number[],
|
|
||||||
tags: string[],
|
|
||||||
) => {
|
|
||||||
if (selected.length === 0) {
|
|
||||||
return autos.map((_, i) => i);
|
|
||||||
}
|
|
||||||
const out: any = {};
|
|
||||||
for (let ai = 0; ai < autos.length; ai++) {
|
|
||||||
const a = autos[ai];
|
|
||||||
let where = out;
|
|
||||||
let tag: string = '';
|
|
||||||
let lastKey: string | null = null;
|
|
||||||
for (const i of selected) {
|
|
||||||
tag = tags[i];
|
|
||||||
if (lastKey !== null) {
|
|
||||||
where = where[lastKey]
|
|
||||||
}
|
|
||||||
if (!where[a.tags[tag]]) {
|
|
||||||
where[a.tags[tag]] = {}
|
|
||||||
}
|
|
||||||
lastKey = a.tags[tag]
|
|
||||||
}
|
|
||||||
if (lastKey !== null) {
|
|
||||||
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
|
|
||||||
where[lastKey] = []
|
|
||||||
}
|
|
||||||
where[lastKey].push(ai)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
const convertGroupsToItems = (
|
|
||||||
groups: any,
|
|
||||||
autos: Array<[AutomationData, number]>,
|
|
||||||
onSelectAutomation: (i: number) => void,
|
|
||||||
onRemove: (i: number) => void,
|
|
||||||
selected: number,
|
|
||||||
) => {
|
|
||||||
if (Array.isArray(groups)) {
|
|
||||||
return groups.map(i => {
|
|
||||||
const [auto, autoIndex] = autos[i];
|
|
||||||
let title = "BadAuto<<Missing Metadata>>"
|
|
||||||
if (auto.metadata) {
|
|
||||||
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
|
|
||||||
}
|
|
||||||
return <div
|
|
||||||
key={i}
|
|
||||||
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
|
|
||||||
title={title}
|
|
||||||
onClick={() => onSelectAutomation(autoIndex)}
|
|
||||||
>
|
|
||||||
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
|
|
||||||
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
|
||||||
</div>
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
return Object.keys(groups).map(groupName => {
|
|
||||||
return <AutomationListBoxGroup
|
|
||||||
key={groupName}
|
|
||||||
groupName={groupName}
|
|
||||||
groups={groups[groupName]}
|
|
||||||
autos={autos}
|
|
||||||
onSelectAutomation={onSelectAutomation}
|
|
||||||
onRemove={onRemove}
|
|
||||||
selected={selected}
|
|
||||||
/>
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export const MetadataBox: FC<{
|
|
||||||
metadata: AutomationMetadata,
|
|
||||||
tags: Record<string, string>,
|
|
||||||
}> = (auto) => {
|
|
||||||
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
|
|
||||||
if (auto.metadata) {
|
|
||||||
title = <>
|
|
||||||
<b>{String(auto.metadata.alias).slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
|
|
||||||
<span>{String(auto.metadata.description).slice(0, 25)}</span>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
return <div
|
|
||||||
className="automation-list-box--body--item--title"
|
|
||||||
>
|
|
||||||
{title}
|
|
||||||
<div
|
|
||||||
className="automation-list-box--body--item--tags"
|
|
||||||
>
|
|
||||||
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
|
||||||
<b>{tagName}:</b> {auto.tags[tagName]}
|
|
||||||
</span>)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const AutomationListBoxGroup: FC<{
|
|
||||||
groupName: string,
|
|
||||||
groups: any,
|
|
||||||
autos: Array<[AutomationData, number]>,
|
|
||||||
onSelectAutomation: (i: number) => void,
|
|
||||||
onRemove: (i: number) => void;
|
|
||||||
selected: number,
|
|
||||||
}> = ({
|
|
||||||
groupName,
|
|
||||||
groups,
|
|
||||||
autos,
|
|
||||||
onSelectAutomation,
|
|
||||||
onRemove,
|
|
||||||
selected,
|
|
||||||
}) => {
|
|
||||||
const [open, setOpen] = useState(false);
|
|
||||||
return <div className="automation-list-box--body--group">
|
|
||||||
<b onClick={() => setOpen(!open)}>{groupName} {!open ? "⊕" : "⊖"}</b>
|
|
||||||
{open && convertGroupsToItems(groups, autos, onSelectAutomation, onRemove, selected)}
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
|
||||||
|
import { TrashIcon } from "components/Icons";
|
||||||
|
import { Button } from "components/Inputs/Button";
|
||||||
|
import { MetadataBox } from "./AutomationMetadataBox";
|
||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
import { AutomationGrouping } from "./automationGrouper";
|
||||||
|
import { FC, useState } from "react";
|
||||||
|
|
||||||
|
export type AutomationListBoxEvents = {
|
||||||
|
onSelectAutomation: (i: number) => void,
|
||||||
|
onRemove: (i: number) => void,
|
||||||
|
}
|
||||||
|
export type AutomationListBoxGroups = {
|
||||||
|
grouping: AutomationGrouping,
|
||||||
|
currentNode: number,
|
||||||
|
}
|
||||||
|
export type AutomationListBoxProps = {
|
||||||
|
events: AutomationListBoxEvents,
|
||||||
|
groups: AutomationListBoxGroups,
|
||||||
|
autos: Array<[AutomationData, number]>,
|
||||||
|
selectedAutomationIdx: number,
|
||||||
|
};
|
||||||
|
export type AutomationListBoxGroupProps = {
|
||||||
|
events: AutomationListBoxEvents,
|
||||||
|
grouping: AutomationGrouping,
|
||||||
|
autos: Array<[AutomationData, number]>,
|
||||||
|
selectedAutomationIdx: number,
|
||||||
|
}
|
||||||
|
export const AutomationListBoxGroup: FC<AutomationListBoxGroupProps> = ({
|
||||||
|
events, grouping, autos, selectedAutomationIdx,
|
||||||
|
}) => {
|
||||||
|
if (grouping.top.length === 1) {
|
||||||
|
return <>
|
||||||
|
{convertGroupsToItems(autos, {
|
||||||
|
grouping, currentNode: grouping.top[0],
|
||||||
|
}, events, selectedAutomationIdx)}
|
||||||
|
</>
|
||||||
|
} else {
|
||||||
|
return <>
|
||||||
|
{grouping.top.map(groupIdx => <AutomationListBoxGroupItem
|
||||||
|
key={groupIdx}
|
||||||
|
autos={autos}
|
||||||
|
groups={{
|
||||||
|
grouping,
|
||||||
|
currentNode: groupIdx
|
||||||
|
}}
|
||||||
|
events={events}
|
||||||
|
selectedAutomationIdx={selectedAutomationIdx}
|
||||||
|
/>)}
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const convertGroupsToItems = (
|
||||||
|
autos: Array<[AutomationData, number]>,
|
||||||
|
{ grouping, currentNode }: AutomationListBoxGroups,
|
||||||
|
events: AutomationListBoxEvents,
|
||||||
|
selectedAutomationIdx: number,
|
||||||
|
) => {
|
||||||
|
const automations = grouping.getAutomations(currentNode);
|
||||||
|
if (automations.length > 0) {
|
||||||
|
return automations.map(autoIndex =>
|
||||||
|
<AutomationListBoxItem
|
||||||
|
key={`${autoIndex}-${autos[autoIndex][1]}`}
|
||||||
|
events={events}
|
||||||
|
auto={autos[autoIndex]}
|
||||||
|
isSelected={selectedAutomationIdx === autos[autoIndex][1]}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
const subgroups = grouping.getSubGroups(currentNode);
|
||||||
|
if (subgroups.length > 0) {
|
||||||
|
return subgroups.map(groupIdx => <AutomationListBoxGroupItem
|
||||||
|
key={groupIdx}
|
||||||
|
autos={autos}
|
||||||
|
groups={{
|
||||||
|
grouping,
|
||||||
|
currentNode: groupIdx
|
||||||
|
}}
|
||||||
|
events={events}
|
||||||
|
selectedAutomationIdx={selectedAutomationIdx}
|
||||||
|
/>)
|
||||||
|
}
|
||||||
|
return <></>
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AutomationListBoxGroupItem: FC<{
|
||||||
|
events: AutomationListBoxEvents,
|
||||||
|
groups: AutomationListBoxGroups,
|
||||||
|
autos: Array<[AutomationData, number]>,
|
||||||
|
selectedAutomationIdx: number,
|
||||||
|
}> = ({
|
||||||
|
autos, groups, events, selectedAutomationIdx,
|
||||||
|
}) => {
|
||||||
|
const groupData = groups.grouping.getData(groups.currentNode);
|
||||||
|
const automations = groups.grouping.getAutomations(groups.currentNode);
|
||||||
|
const [open, setOpen] = useState(false);
|
||||||
|
const isOther = groupData.isOther;
|
||||||
|
const openIcon = !open ? "⊕" : "⊖";
|
||||||
|
const total = isOther ? <small>
|
||||||
|
{automations.length} automation{automations.length !== 1 ? 's' : ''} {groupData.isOther ? "" : "(untagged)"}
|
||||||
|
</small> : <></>
|
||||||
|
return <div className={[
|
||||||
|
"automation-list-box--body--group",
|
||||||
|
isOther ? 'other' : '',
|
||||||
|
groupData.selected ? 'selected' : '',
|
||||||
|
].join(' ')}>
|
||||||
|
<b onClick={() => setOpen(!open)}>{groupData.name} {openIcon} {total}</b>
|
||||||
|
{open && convertGroupsToItems(autos, groups, events, selectedAutomationIdx)}
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const AutomationListBoxItem: FC<{
|
||||||
|
auto: [AutomationData, number],
|
||||||
|
isSelected: boolean,
|
||||||
|
events: AutomationListBoxEvents,
|
||||||
|
}> = ({
|
||||||
|
events: {
|
||||||
|
onRemove,
|
||||||
|
onSelectAutomation,
|
||||||
|
},
|
||||||
|
auto: [
|
||||||
|
auto, autoIndex
|
||||||
|
],
|
||||||
|
isSelected,
|
||||||
|
}) => {
|
||||||
|
let title = "BadAuto<<Missing Metadata>>"
|
||||||
|
if (auto.metadata) {
|
||||||
|
title = `Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`
|
||||||
|
}
|
||||||
|
return <div
|
||||||
|
key={autoIndex}
|
||||||
|
className={["automation-list-box--body--item", isSelected ? 'selected' : ''].join(' ')}
|
||||||
|
title={title}
|
||||||
|
onClick={() => onSelectAutomation(autoIndex)}
|
||||||
|
>
|
||||||
|
<MetadataBox metadata={auto.metadata} tags={auto.tags} />
|
||||||
|
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
import { FC } from "react"
|
||||||
|
import { AutomationMetadata } from "types/automations"
|
||||||
|
|
||||||
|
export const MetadataBox: FC<{
|
||||||
|
metadata: AutomationMetadata,
|
||||||
|
tags: Record<string, string>,
|
||||||
|
}> = (auto) => {
|
||||||
|
let title = <span>{"BadAuto<<Missing Metadata>>"}</span>
|
||||||
|
if (auto.metadata) {
|
||||||
|
title = <>
|
||||||
|
<b>{String(auto.metadata.alias ?? "").slice(0, 15)} <span>({String(auto.metadata.id).slice(0, 5)})</span></b>
|
||||||
|
<span>{String(auto.metadata.description ?? "").slice(0, 25)}</span>
|
||||||
|
</>
|
||||||
|
}
|
||||||
|
return <div
|
||||||
|
className="automation-list-box--body--item--title"
|
||||||
|
>
|
||||||
|
{title}
|
||||||
|
<div
|
||||||
|
className="automation-list-box--body--item--tags"
|
||||||
|
>
|
||||||
|
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
||||||
|
<b>{tagName}:</b> {auto.tags[tagName]}
|
||||||
|
</span>)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
@@ -2,7 +2,8 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|||||||
import { ConnectedAutomationList } from ".";
|
import { ConnectedAutomationList } from ".";
|
||||||
import { createMockAuto } from "utils/mocks";
|
import { createMockAuto } from "utils/mocks";
|
||||||
import { useMockApiService } from "apiService";
|
import { useMockApiService } from "apiService";
|
||||||
import { DEFAULT_DIMS } from 'components/DAGSvgs/constants';
|
import { DEFAULT_DIMS } from 'components/DAGFlow/constants';
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'App/AutomationList/Connected',
|
title: 'App/AutomationList/Connected',
|
||||||
@@ -17,12 +18,12 @@ export default {
|
|||||||
|
|
||||||
const Template: ComponentStory<any> = args => {
|
const Template: ComponentStory<any> = args => {
|
||||||
const api = useMockApiService(args.initialAutomations);
|
const api = useMockApiService(args.initialAutomations);
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<ConnectedAutomationList
|
<ConnectedAutomationList
|
||||||
{...args}
|
{...args}
|
||||||
api={api}
|
api={api}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const EmptyStart = Template.bind({})
|
export const EmptyStart = Template.bind({})
|
||||||
@@ -44,3 +45,20 @@ FewAutos.args = {
|
|||||||
createMockAuto(),
|
createMockAuto(),
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const Loading: ComponentStory<any> = args => {
|
||||||
|
const api = useMockApiService(args.initialAutomations);
|
||||||
|
return <Page>
|
||||||
|
<ConnectedAutomationList
|
||||||
|
{...args}
|
||||||
|
api={{
|
||||||
|
...api,
|
||||||
|
state: {
|
||||||
|
"automations": {
|
||||||
|
"ready": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Page>
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
|
||||||
|
export type TagDB = ReturnType<typeof makeTagDB>;
|
||||||
|
export const makeTagDB = (automations: AutomationData[]) => {
|
||||||
|
const allTags: Record<string, Set<string>> = {};
|
||||||
|
automations.forEach(({ tags }) =>
|
||||||
|
Object.keys(tags).forEach(tagName => {
|
||||||
|
const tagValue = tags[tagName];
|
||||||
|
if (!allTags[tagName]) {
|
||||||
|
allTags[tagName] = new Set()
|
||||||
|
}
|
||||||
|
allTags[tagName].add(tagValue);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
const allTagNames = Object.keys(allTags);
|
||||||
|
return {
|
||||||
|
getTagNames(myTags: string[]): string[] {
|
||||||
|
return allTagNames.filter(n => !myTags.includes(n)).sort()
|
||||||
|
},
|
||||||
|
getTagValues(tagName: string): string[] {
|
||||||
|
return allTags[tagName] ? Array.from(allTags[tagName].values()).sort() : [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { makeGrouping } from "./automationGrouper";
|
||||||
|
import { AutomationData } from 'types/automations/index';
|
||||||
|
import { bigMockAutoList, createMockAuto } from 'utils/mocks';
|
||||||
|
|
||||||
|
const automations: AutomationData[] = [
|
||||||
|
createMockAuto({
|
||||||
|
"Room": 'Living Room',
|
||||||
|
"Type": 'Lights'
|
||||||
|
}),
|
||||||
|
createMockAuto({
|
||||||
|
"Room": 'Living Room',
|
||||||
|
"Type": 'Climate'
|
||||||
|
}),
|
||||||
|
createMockAuto({
|
||||||
|
"Room": 'Kitchen',
|
||||||
|
"Type": 'Climate'
|
||||||
|
}),
|
||||||
|
createMockAuto({
|
||||||
|
"Type": 'Climate'
|
||||||
|
}),
|
||||||
|
createMockAuto({
|
||||||
|
"Room": 'Living Room'
|
||||||
|
}),
|
||||||
|
createMockAuto({}),
|
||||||
|
];
|
||||||
|
|
||||||
|
test('no grouping', () => {
|
||||||
|
const grouped = makeGrouping(automations, [], 0);
|
||||||
|
expect(grouped.top).toStrictEqual([0])
|
||||||
|
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 2, 3, 4, 5])
|
||||||
|
});
|
||||||
|
test('1 grouping', () => {
|
||||||
|
const grouped = makeGrouping(automations, ["Room"], 0);
|
||||||
|
expect(grouped.top).toHaveLength(3);
|
||||||
|
expect(grouped.getAutomations(0)).toStrictEqual([0, 1, 4])
|
||||||
|
expect(grouped.getAutomations(1)).toStrictEqual([2])
|
||||||
|
expect(grouped.getAutomations(2)).toStrictEqual([3, 5])
|
||||||
|
});
|
||||||
|
test('2 groupings', () => {
|
||||||
|
const grouped = makeGrouping(automations, ["Room", "Type"], 0);
|
||||||
|
expect(grouped.top).toHaveLength(3);
|
||||||
|
expect(grouped.getAutomations(grouped.top[0])).toHaveLength(0)
|
||||||
|
expect(grouped.getSubGroups(grouped.top[0])).toHaveLength(3)
|
||||||
|
expect(grouped.getAutomations(grouped.top[1])).toHaveLength(0)
|
||||||
|
expect(grouped.getSubGroups(grouped.top[1])).toHaveLength(1)
|
||||||
|
expect(grouped.getAutomations(grouped.top[2])).toHaveLength(2)
|
||||||
|
expect(grouped.getSubGroups(grouped.top[2])).toHaveLength(0)
|
||||||
|
});
|
||||||
|
test('bigAutoList groupings has not duplicate ids', () => {
|
||||||
|
const grouped = makeGrouping(bigMockAutoList, ['Room', "Remote"], 0);
|
||||||
|
const flattenAndCount = (gid: number): Record<number, number[]> => {
|
||||||
|
const subgroups = grouped.getSubGroups(gid);
|
||||||
|
if (subgroups.length > 0) {
|
||||||
|
return flattenAndConsolidate(subgroups)
|
||||||
|
} else {
|
||||||
|
return grouped.getAutomations(gid).reduce((sum: Record<number, number[]>, b) => {
|
||||||
|
sum[b] = (sum[b] ?? []).concat(gid)
|
||||||
|
return sum
|
||||||
|
}, {})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const flattenAndConsolidate = (gids: number[]): Record<number, number[]> => gids.map(flattenAndCount).reduce((a, b) => {
|
||||||
|
for (const k of Object.keys(b).map(Number)) {
|
||||||
|
a[k] = (a[k] ?? []).concat(b[k])
|
||||||
|
}
|
||||||
|
return a
|
||||||
|
}, {})
|
||||||
|
const countedAutos = flattenAndConsolidate(grouped.top)
|
||||||
|
for (const key of Object.keys(countedAutos).map(Number)) {
|
||||||
|
expect(countedAutos[key]).toHaveLength(1)
|
||||||
|
}
|
||||||
|
})
|
||||||
@@ -0,0 +1,130 @@
|
|||||||
|
import { AutomationData } from "types/automations";
|
||||||
|
|
||||||
|
const makeGrouper = () => {
|
||||||
|
const groupIdNames: string[] = []
|
||||||
|
const groupSubGroups: Array<Set<number>> = []
|
||||||
|
const groupAutomations: number[][] = []
|
||||||
|
const groupData: Array<{
|
||||||
|
name: string;
|
||||||
|
selected: boolean;
|
||||||
|
isOther: boolean;
|
||||||
|
isTop: boolean;
|
||||||
|
}> = [];
|
||||||
|
const topGroups: number[] = [];
|
||||||
|
|
||||||
|
return {
|
||||||
|
groupIdNames,
|
||||||
|
groupSubGroups,
|
||||||
|
groupAutomations,
|
||||||
|
groupData,
|
||||||
|
topGroups,
|
||||||
|
addNew(groupId: string, groupName: string, theChosenOne: boolean, isTopLevel: boolean, isOther: boolean = false): number {
|
||||||
|
groupIdNames.push(groupId);
|
||||||
|
groupSubGroups.push(new Set());
|
||||||
|
groupAutomations.push([]);
|
||||||
|
groupData.push({
|
||||||
|
name: groupName,
|
||||||
|
selected: theChosenOne,
|
||||||
|
isTop: isTopLevel,
|
||||||
|
isOther
|
||||||
|
})
|
||||||
|
const groupIdx = groupIdNames.length - 1;
|
||||||
|
if (isTopLevel) {
|
||||||
|
topGroups.push(groupIdx);
|
||||||
|
}
|
||||||
|
return groupIdx;
|
||||||
|
},
|
||||||
|
updateGroup(
|
||||||
|
groupIdx: number,
|
||||||
|
update: {
|
||||||
|
isChosen: boolean,
|
||||||
|
lastGroupIdx: number | null,
|
||||||
|
autoIdx: number | null,
|
||||||
|
}
|
||||||
|
) {
|
||||||
|
if (update.isChosen) {
|
||||||
|
groupData[groupIdx].selected = true;
|
||||||
|
}
|
||||||
|
if (update.lastGroupIdx !== null) {
|
||||||
|
groupSubGroups[update.lastGroupIdx].add(groupIdx);
|
||||||
|
}
|
||||||
|
if (update.autoIdx !== null) {
|
||||||
|
groupAutomations[groupIdx].push(update.autoIdx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export type AutomationGrouping = ReturnType<typeof makeGrouping>;
|
||||||
|
export const makeGrouping = (
|
||||||
|
autos: AutomationData[],
|
||||||
|
selectedTags: string[],
|
||||||
|
selectedAutomationIdx: number,
|
||||||
|
) => {
|
||||||
|
const grouper = makeGrouper();
|
||||||
|
|
||||||
|
if (selectedTags.length === 0) {
|
||||||
|
grouper.addNew("$", "", selectedAutomationIdx >= 0, true, true)
|
||||||
|
grouper.groupAutomations = [autos.map((_, i) => i)];
|
||||||
|
} else {
|
||||||
|
autos.forEach((auto, autoIdx) => {
|
||||||
|
const theChosenOne = selectedAutomationIdx === autoIdx;
|
||||||
|
let lastGroupIdx: number | null = null;
|
||||||
|
let lastGroupId: string = "$";
|
||||||
|
for (let ti = 0; ti < selectedTags.length; ti++) {
|
||||||
|
const isTopLevel = ti === 0;
|
||||||
|
const selTag = selectedTags[ti];
|
||||||
|
if (selTag in auto.tags) {
|
||||||
|
const groupName = auto.tags[selTag];
|
||||||
|
const groupId = `${lastGroupId}>${selTag}:${groupName}`;
|
||||||
|
let groupIdx = grouper.groupIdNames.indexOf(groupId);
|
||||||
|
if (groupIdx < 0) {
|
||||||
|
groupIdx = grouper.addNew(groupId, groupName, theChosenOne, isTopLevel);
|
||||||
|
}
|
||||||
|
grouper.updateGroup(groupIdx, {
|
||||||
|
isChosen: theChosenOne,
|
||||||
|
lastGroupIdx,
|
||||||
|
autoIdx: ti === selectedTags.length - 1 ? autoIdx : null,
|
||||||
|
})
|
||||||
|
lastGroupIdx = groupIdx;
|
||||||
|
lastGroupId = groupId;
|
||||||
|
} else {
|
||||||
|
const groupId = `${lastGroupId}>${selTag}:$`;
|
||||||
|
let groupIdx = grouper.groupIdNames.indexOf(groupId);
|
||||||
|
if (groupIdx < 0) {
|
||||||
|
groupIdx = grouper.addNew(groupId, "", theChosenOne, isTopLevel, true);
|
||||||
|
}
|
||||||
|
grouper.updateGroup(groupIdx, {
|
||||||
|
isChosen: theChosenOne,
|
||||||
|
lastGroupIdx,
|
||||||
|
autoIdx,
|
||||||
|
})
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
const sortGroupIds = (groupIds: number[]) => groupIds.sort((a, b) => {
|
||||||
|
const adata = grouper.groupData[a];
|
||||||
|
const bdata = grouper.groupData[b];
|
||||||
|
if (adata.isOther) {
|
||||||
|
return 1
|
||||||
|
} else {
|
||||||
|
return adata.name > bdata.name ? -1 : 1
|
||||||
|
}
|
||||||
|
})
|
||||||
|
return {
|
||||||
|
top: sortGroupIds(grouper.topGroups),
|
||||||
|
getSubGroups(groupIdx: number) {
|
||||||
|
return sortGroupIds(Array.from(grouper.groupSubGroups[groupIdx].values()))
|
||||||
|
},
|
||||||
|
getAutomations(groupIdx: number) {
|
||||||
|
return grouper.groupAutomations[groupIdx]
|
||||||
|
},
|
||||||
|
getData(groupIdx: number) {
|
||||||
|
return grouper.groupData[groupIdx]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -18,6 +18,25 @@
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Loading state */
|
||||||
|
.automation-list--root.loading {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.loading>* {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.automation-list--root.loading .automation-list--circle-loader {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
display: flex;
|
||||||
|
}
|
||||||
|
|
||||||
/* list children: on hide */
|
/* list children: on hide */
|
||||||
.automation-list--list.hide>.automation-list-box {
|
.automation-list--list.hide>.automation-list-box {
|
||||||
width: 0;
|
width: 0;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import "./index.mobile.css";
|
import "./index.mobile.css";
|
||||||
import { AutomationEditor } from "components/AutomationEditor";
|
import { AutomationEditor } from "components/AutomationEditor";
|
||||||
import { FC, useState } from "react";
|
import { FC, ReactNode, useState } from "react";
|
||||||
import { AutomationData } from "types/automations";
|
import { AutomationData } from "types/automations";
|
||||||
import { defaultAutomation } from 'utils/defaults';
|
import { defaultAutomation } from 'utils/defaults';
|
||||||
import { ArrowIcon } from "components/Icons";
|
import { ArrowIcon } from "components/Icons";
|
||||||
@@ -10,6 +10,9 @@ import { ApiService } from "apiService/core";
|
|||||||
import { AutomationListBox } from "./AutomationListBox";
|
import { AutomationListBox } from "./AutomationListBox";
|
||||||
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
||||||
import useWindowSize from "utils/useWindowSize";
|
import useWindowSize from "utils/useWindowSize";
|
||||||
|
import { makeTagDB } from "./TagDB";
|
||||||
|
import LinearProgress from "@mui/material/LinearProgress";
|
||||||
|
import CircularProgress from "@mui/material/CircularProgress";
|
||||||
|
|
||||||
|
|
||||||
interface AutomationListParams {
|
interface AutomationListParams {
|
||||||
@@ -18,6 +21,7 @@ interface AutomationListParams {
|
|||||||
onAdd: (auto: AutomationData) => void;
|
onAdd: (auto: AutomationData) => void;
|
||||||
onRemove: (i: number) => void;
|
onRemove: (i: number) => void;
|
||||||
dims: DAGAutomationFlowDims;
|
dims: DAGAutomationFlowDims;
|
||||||
|
children?: ReactNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const AutomationList: FC<AutomationListParams> = ({
|
export const AutomationList: FC<AutomationListParams> = ({
|
||||||
@@ -34,13 +38,14 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
const { isMobile } = useWindowSize();
|
const { isMobile } = useWindowSize();
|
||||||
// alias
|
// alias
|
||||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
const currentAuto = automations.length > 0 ? automations[current] : null;
|
||||||
|
const tagDB = makeTagDB(automations);
|
||||||
// render
|
// render
|
||||||
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
|
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
|
||||||
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
|
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
|
||||||
<AutomationListBox
|
<AutomationListBox
|
||||||
automations={automations}
|
automations={automations}
|
||||||
onAdd={() => {
|
onAdd={() => {
|
||||||
onAdd(defaultAutomation(`shortu-${automations.length}`));
|
onAdd(defaultAutomation(String(Date.now())));
|
||||||
setCurrent(automations.length)
|
setCurrent(automations.length)
|
||||||
}}
|
}}
|
||||||
onSelectAutomation={i => {
|
onSelectAutomation={i => {
|
||||||
@@ -55,15 +60,15 @@ export const AutomationList: FC<AutomationListParams> = ({
|
|||||||
<ButtonIcon
|
<ButtonIcon
|
||||||
onClick={() => setHideList(!hideList)}
|
onClick={() => setHideList(!hideList)}
|
||||||
className="automation-list--list-hide"
|
className="automation-list--list-hide"
|
||||||
>
|
Icon={ArrowIcon}
|
||||||
{ArrowIcon}
|
/>
|
||||||
</ButtonIcon>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="automation-list--viewer">
|
<div className="automation-list--viewer">
|
||||||
{currentAuto ? <AutomationEditor
|
{currentAuto ? <AutomationEditor
|
||||||
automation={currentAuto}
|
automation={currentAuto}
|
||||||
onUpdate={a => onUpdate(current, a)}
|
onUpdate={a => onUpdate(current, a)}
|
||||||
dims={dims}
|
dims={dims}
|
||||||
|
tagDB={tagDB}
|
||||||
/> : <></>}
|
/> : <></>}
|
||||||
</div>
|
</div>
|
||||||
{children}
|
{children}
|
||||||
@@ -85,7 +90,12 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
|||||||
dims
|
dims
|
||||||
}) => {
|
}) => {
|
||||||
if (!automations.ready) {
|
if (!automations.ready) {
|
||||||
return <span>Loading...</span>
|
return <div className="automation-list--root loading">
|
||||||
|
<LinearProgress />
|
||||||
|
<div className="automation-list--circle-loader">
|
||||||
|
<CircularProgress />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
if (!automations.ok) {
|
if (!automations.ok) {
|
||||||
return <span>Error {automations.error}</span>
|
return <span>Error {automations.error}</span>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { ConditionEditor } from ".";
|
import { ConditionEditor } from ".";
|
||||||
import { AutomationCondition } from 'types/automations/conditions';
|
import { AutomationCondition } from 'types/automations/conditions';
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'ConditionEditor',
|
title: 'ConditionEditor',
|
||||||
@@ -40,12 +41,12 @@ export const Basic: ComponentStory<typeof ConditionEditor> = args => {
|
|||||||
]
|
]
|
||||||
})
|
})
|
||||||
return (
|
return (
|
||||||
<div className="page">
|
<Page>
|
||||||
<ConditionEditor
|
<ConditionEditor
|
||||||
onUpdate={setState}
|
onUpdate={setState}
|
||||||
onDelete={() => { }}
|
onDelete={() => { }}
|
||||||
condition={state}
|
condition={state}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Page>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -8,6 +8,7 @@ import InputYaml from "components/Inputs/InputYaml";
|
|||||||
import { getEditor } from "./editorRender";
|
import { getEditor } from "./editorRender";
|
||||||
import { useStyles } from "./style";
|
import { useStyles } from "./style";
|
||||||
import { getViewer } from "./viewRender";
|
import { getViewer } from "./viewRender";
|
||||||
|
import useWindowSize from "utils/useWindowSize";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -31,6 +32,7 @@ export const ConditionNode: FC<{
|
|||||||
// state
|
// state
|
||||||
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
||||||
const [yamlMode, setYamlMode] = useState(false);
|
const [yamlMode, setYamlMode] = useState(false);
|
||||||
|
const { isMobile } = useWindowSize();
|
||||||
// alias
|
// alias
|
||||||
const effectiveDM = internalDisplayMode || yamlMode;
|
const effectiveDM = internalDisplayMode || yamlMode;
|
||||||
// effect
|
// effect
|
||||||
@@ -76,53 +78,56 @@ export const ConditionNode: FC<{
|
|||||||
} else if (condition.condition === 'or') {
|
} else if (condition.condition === 'or') {
|
||||||
hasChildren = true
|
hasChildren = true
|
||||||
}
|
}
|
||||||
const { classes } = useStyles({ hasChildren });
|
const { classes } = useStyles({ hasChildren, isMobile });
|
||||||
|
|
||||||
// components
|
// components
|
||||||
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
|
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
|
||||||
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
||||||
|
|
||||||
return <div className={classes.root}>
|
return <div className={classes.root}>
|
||||||
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
<>
|
||||||
<div className={classes.title}>
|
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
||||||
<InputList
|
<div className={classes.title}>
|
||||||
label=""
|
<InputList
|
||||||
className={classes.titleText}
|
label=""
|
||||||
current={condition.condition}
|
className={classes.titleText}
|
||||||
options={[
|
current={condition.condition}
|
||||||
'or', 'not', 'and',
|
options={[
|
||||||
'template',
|
'or', 'not', 'and',
|
||||||
'numeric_state',
|
'template',
|
||||||
'state',
|
'numeric_state',
|
||||||
'time',
|
'state',
|
||||||
'trigger',
|
'time',
|
||||||
'zone',
|
'trigger',
|
||||||
]}
|
'zone',
|
||||||
onChange={(n: any) => onUpdate({
|
]}
|
||||||
...getConditionDefaultValues(n),
|
onChange={(n: any) => onUpdate({
|
||||||
...condition,
|
...getConditionDefaultValues(n),
|
||||||
condition: n,
|
...condition,
|
||||||
} as any)}
|
condition: n,
|
||||||
/>
|
} as any)}
|
||||||
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
/>
|
||||||
{yamlMode ? 'visual' : 'yaml'}
|
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
||||||
</button>}
|
{yamlMode ? 'visual' : 'yaml'}
|
||||||
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
</button>}
|
||||||
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
||||||
</button>}
|
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
||||||
</div>
|
</button>}
|
||||||
<div className={classes.children}>
|
</div>
|
||||||
{yamlMode && <InputYaml
|
<div className={classes.children}>
|
||||||
label=""
|
{yamlMode && <InputYaml
|
||||||
value={condition}
|
label=""
|
||||||
onChange={update => onUpdate(update as any)}
|
value={condition}
|
||||||
resizable
|
onChange={update => onUpdate(update as any)}
|
||||||
/>}
|
/>}
|
||||||
{!yamlMode && childrenConditions}
|
<div className={classes.conditionWrap}>
|
||||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
{!yamlMode && childrenConditions}
|
||||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
</div>
|
||||||
</div>}
|
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
||||||
</div>
|
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
||||||
{children({ classes })}
|
</div>}
|
||||||
|
</div>
|
||||||
|
{children({ classes })}
|
||||||
|
</>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
@@ -1,13 +1,12 @@
|
|||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
|
import { AutomationCondition, LogicCondition, NumericCondition, StateCondition, TemplateCondition, TimeCondition, TriggerCondition, ZoneCondition } from 'types/automations/conditions';
|
||||||
import { getDescriptionFromAutomationNode } from "utils/formatting";
|
|
||||||
import InputNumber from "components/Inputs/InputNumber";
|
import InputNumber from "components/Inputs/InputNumber";
|
||||||
import InputText from "components/Inputs/InputText";
|
import InputText from "components/Inputs/InputText";
|
||||||
import InputTextArea from "components/Inputs/InputTextArea";
|
import { InputEntity } from "components/Inputs/InputEntities";
|
||||||
import { InputEntity } from "components/Inputs/InputTextBubble";
|
|
||||||
import { ConditionNode } from "./ConditionNode";
|
import { ConditionNode } from "./ConditionNode";
|
||||||
import { genUpdateMethods } from "./nestedUpdater";
|
import { genUpdateMethods } from "./nestedUpdater";
|
||||||
import InputTime from "components/Inputs/InputTime";
|
import InputTime from "components/Inputs/InputTime";
|
||||||
|
import InputYaml from "components/Inputs/InputYaml";
|
||||||
|
|
||||||
|
|
||||||
interface Editor<C extends AutomationCondition> extends FC<{
|
interface Editor<C extends AutomationCondition> extends FC<{
|
||||||
@@ -45,16 +44,12 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
|
|||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
<InputYaml label="Template" value={condition.value_template} onChange={value_template => onChange({
|
||||||
...condition,
|
|
||||||
alias
|
|
||||||
})} />
|
|
||||||
<InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({
|
|
||||||
...condition,
|
...condition,
|
||||||
value_template
|
value_template
|
||||||
})} resizable />
|
})} />
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -62,13 +57,10 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
|||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
|
||||||
...condition,
|
|
||||||
alias
|
|
||||||
})} />
|
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.entity_id}
|
value={condition.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
entity_id
|
entity_id
|
||||||
@@ -94,11 +86,11 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
|||||||
below: below ? String(below) : undefined,
|
below: below ? String(below) : undefined,
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<InputTextArea label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
|
<InputYaml label="Template" value={condition.value_template ?? ""} onChange={value_template => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
value_template
|
value_template
|
||||||
})} resizable />
|
})} />
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -126,13 +118,10 @@ export const StateEditor: Editor<StateCondition> = ({
|
|||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
|
||||||
...condition,
|
|
||||||
alias
|
|
||||||
})} />
|
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.entity_id}
|
value={condition.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
entity_id
|
entity_id
|
||||||
@@ -158,18 +147,14 @@ export const StateEditor: Editor<StateCondition> = ({
|
|||||||
for: _for,
|
for: _for,
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const TimeEditor: Editor<TimeCondition> = ({
|
export const TimeEditor: Editor<TimeCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
|
||||||
...condition,
|
|
||||||
alias
|
|
||||||
})} />
|
|
||||||
<InputTime
|
<InputTime
|
||||||
label="After"
|
label="After"
|
||||||
value={condition.after}
|
value={condition.after}
|
||||||
@@ -187,40 +172,33 @@ export const TimeEditor: Editor<TimeCondition> = ({
|
|||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
<b>Weekday not support for no, use yaml for now</b> {condition.weekday}
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const TriggerEditor: Editor<TriggerCondition> = ({
|
export const TriggerEditor: Editor<TriggerCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
|
||||||
...condition,
|
|
||||||
alias
|
|
||||||
})} />
|
|
||||||
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
|
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
id
|
id
|
||||||
})} />
|
})} />
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const ZoneEditor: Editor<ZoneCondition> = ({
|
export const ZoneEditor: Editor<ZoneCondition> = ({
|
||||||
onChange,
|
onChange,
|
||||||
condition,
|
condition,
|
||||||
}) => {
|
}) => {
|
||||||
return <div>
|
return <>
|
||||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
|
||||||
...condition,
|
|
||||||
alias
|
|
||||||
})} />
|
|
||||||
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
|
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
zone
|
zone
|
||||||
})} />
|
})} />
|
||||||
<InputEntity
|
<InputEntity
|
||||||
value={condition.entity_id}
|
value={condition.entity_id}
|
||||||
|
multiple
|
||||||
onChange={entity_id => onChange({
|
onChange={entity_id => onChange({
|
||||||
...condition,
|
...condition,
|
||||||
entity_id
|
entity_id
|
||||||
@@ -234,5 +212,5 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
|
|||||||
state,
|
state,
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
</div>
|
</>
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { AutomationCondition } from "types/automations/conditions";
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
|
|
||||||
@@ -14,14 +15,14 @@ export default {
|
|||||||
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
|
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
|
||||||
|
|
||||||
const [data, setData] = useState(condition);
|
const [data, setData] = useState(condition);
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<ConditionEditor {...args}
|
<ConditionEditor {...args}
|
||||||
condition={data}
|
condition={data}
|
||||||
onUpdate={data => {
|
onUpdate={data => {
|
||||||
setData(data)
|
setData(data)
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const TemplateViewer = Template.bind({})
|
export const TemplateViewer = Template.bind({})
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ import { Styles } from "jss";
|
|||||||
import { createAppUseStyles } from "styles/theme";
|
import { createAppUseStyles } from "styles/theme";
|
||||||
|
|
||||||
export const useStyles = createAppUseStyles<{
|
export const useStyles = createAppUseStyles<{
|
||||||
hasChildren: boolean
|
hasChildren: boolean,
|
||||||
|
isMobile: boolean,
|
||||||
}>(theme => {
|
}>(theme => {
|
||||||
const deleteBtn: Styles = {
|
const deleteBtn: Styles = {
|
||||||
borderRadius: '10px',
|
borderRadius: '10px',
|
||||||
@@ -20,12 +21,12 @@ export const useStyles = createAppUseStyles<{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
root: ({ hasChildren }) => ({
|
root: ({ hasChildren, isMobile }) => ({
|
||||||
background: theme.primary,
|
background: theme.primary,
|
||||||
padding: 0,
|
padding: 0,
|
||||||
position: 'relative',
|
position: 'relative',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: hasChildren ? 'column' : 'row',
|
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
|
||||||
}),
|
}),
|
||||||
title: ({ hasChildren }) => ({
|
title: ({ hasChildren }) => ({
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
@@ -42,8 +43,8 @@ export const useStyles = createAppUseStyles<{
|
|||||||
borderTopRightRadius: 0,
|
borderTopRightRadius: 0,
|
||||||
borderBottomRightRadius: 0,
|
borderBottomRightRadius: 0,
|
||||||
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
||||||
padding: 10,
|
minWidth: '10em',
|
||||||
minWidth: 30,
|
maxWidth: '30em',
|
||||||
textOverflow: 'ellipsis',
|
textOverflow: 'ellipsis',
|
||||||
textAlign: 'center',
|
textAlign: 'center',
|
||||||
cursor: 'pointer',
|
cursor: 'pointer',
|
||||||
@@ -86,6 +87,9 @@ export const useStyles = createAppUseStyles<{
|
|||||||
}),
|
}),
|
||||||
icon: {},
|
icon: {},
|
||||||
deleteBtn,
|
deleteBtn,
|
||||||
|
conditionWrap: {
|
||||||
|
overflow: 'auto',
|
||||||
|
},
|
||||||
children: ({ hasChildren }) => ({
|
children: ({ hasChildren }) => ({
|
||||||
flex: 1,
|
flex: 1,
|
||||||
paddingLeft: hasChildren ? 50 : 10,
|
paddingLeft: hasChildren ? 50 : 10,
|
||||||
@@ -96,7 +100,8 @@ export const useStyles = createAppUseStyles<{
|
|||||||
border: `1px solid ${theme.secondaryAccent}`,
|
border: `1px solid ${theme.secondaryAccent}`,
|
||||||
borderBottomRightRadius: hasChildren ? 10 : 0,
|
borderBottomRightRadius: hasChildren ? 10 : 0,
|
||||||
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
||||||
minHeight: hasChildren ? undefined : '100%'
|
minHeight: hasChildren ? undefined : '100%',
|
||||||
|
overflow: 'scroll'
|
||||||
}),
|
}),
|
||||||
addBtnContainer: {
|
addBtnContainer: {
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
.dagnode-error {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: flex-end;
|
||||||
|
font-size: 0.85em;
|
||||||
|
z-index: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dagnode-error.open .dagnode-error--inner {
|
||||||
|
align-items: flex-start;
|
||||||
|
padding-top: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dagnode-error--inner {
|
||||||
|
position: relative;
|
||||||
|
flex: 1;
|
||||||
|
|
||||||
|
/* internal positioning */
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5em;
|
||||||
|
|
||||||
|
/* shape */
|
||||||
|
background-color: var(--error-dark);
|
||||||
|
border-radius: 1em;
|
||||||
|
height: 100%;
|
||||||
|
max-height: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
margin-top: 2.5px;
|
||||||
|
margin-bottom: 2.5px;
|
||||||
|
border-top-width: 1px;
|
||||||
|
border-top-style: solid;
|
||||||
|
border-top-left-radius: 10px;
|
||||||
|
border-top-right-radius: 10px;
|
||||||
|
border-top-color: var(--error);
|
||||||
|
}
|
||||||
|
|
||||||
|
.dagnode-error--inner:hover {
|
||||||
|
background-color: var(--error-accent);
|
||||||
|
cursor: default;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dagnode-error--inner--edit-icon:hover {
|
||||||
|
transform: rotate(180deg);
|
||||||
|
cursor: pointer;
|
||||||
|
background-color: var(--error);
|
||||||
|
padding: 0.5em;
|
||||||
|
border-radius: 10px;
|
||||||
|
height: 0.25em;
|
||||||
|
width: 0.25em;
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
|
import { DAGAutomationFlow } from '.';
|
||||||
|
import * as dgconst from "components/DAGFlow/constants";
|
||||||
|
import ReactFlow, { Controls } from 'react-flow-renderer';
|
||||||
|
import { DAGErrorNode } from "./DAGErrorNode";
|
||||||
|
import { convertToFlowNode } from "./helpers";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'DAGAutomationFlow/Viewer/DAGErrorNode',
|
||||||
|
component: DAGAutomationFlow,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {
|
||||||
|
"height": dgconst.NODE_HEIGHT,
|
||||||
|
"width": dgconst.NODE_WIDTH,
|
||||||
|
}
|
||||||
|
} as ComponentMeta<typeof DAGErrorNode>
|
||||||
|
|
||||||
|
export const Examples: ComponentStory<typeof DAGErrorNode> = args => {
|
||||||
|
const nodes = ["1", "2", "3", "4"].map((id, i) => ({
|
||||||
|
"data": args,
|
||||||
|
"id": id,
|
||||||
|
"type": "mynode",
|
||||||
|
"position": {
|
||||||
|
"x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i,
|
||||||
|
"y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
return <Page>
|
||||||
|
<ReactFlow
|
||||||
|
defaultNodes={nodes}
|
||||||
|
nodeTypes={{
|
||||||
|
"mynode": convertToFlowNode(DAGErrorNode)
|
||||||
|
}}
|
||||||
|
snapToGrid
|
||||||
|
onlyRenderVisibleElements
|
||||||
|
nodesConnectable={false}
|
||||||
|
nodesDraggable={false}
|
||||||
|
>
|
||||||
|
<Controls />
|
||||||
|
</ReactFlow>
|
||||||
|
</Page>
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import "./DAGErrorNode.css";
|
||||||
|
import { Handle, Position } from 'react-flow-renderer';
|
||||||
|
import { FC } from 'react';
|
||||||
|
import { InfoIcon, PencilIcon } from 'components/Icons';
|
||||||
|
|
||||||
|
|
||||||
|
export interface DAGErrorNodeProps {
|
||||||
|
height: number;
|
||||||
|
width: number;
|
||||||
|
hasInput?: boolean;
|
||||||
|
error?: any,
|
||||||
|
onEdit: () => void;
|
||||||
|
}
|
||||||
|
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
|
||||||
|
height, width, hasInput, error, onEdit
|
||||||
|
}) => {
|
||||||
|
// render
|
||||||
|
return <>
|
||||||
|
{hasInput && <Handle type="target" position={Position.Left} />}
|
||||||
|
<Handle type="source" position={Position.Right} />
|
||||||
|
<div className={["dagnode-error"].join(' ')} style={{
|
||||||
|
height,
|
||||||
|
width,
|
||||||
|
maxHeight: height,
|
||||||
|
maxWidth: width,
|
||||||
|
}}>
|
||||||
|
<div className={"dagnode-error--inner"} title={String(error)}>
|
||||||
|
<InfoIcon color="var(--error-light)" size={1.25} />
|
||||||
|
Invalid Node
|
||||||
|
<PencilIcon className="dagnode-error--inner--edit-icon" size={1.25} onClick={onEdit} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
}
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
|
||||||
|
|
||||||
|
import React from "react";
|
||||||
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
|
import { DAGAutomationFlow } from '.';
|
||||||
|
import { useState } from 'react';
|
||||||
|
import * as dgconst from "components/DAGFlow/constants";
|
||||||
|
import ReactFlow, { Controls } from 'react-flow-renderer';
|
||||||
|
import { DAGNode } from "./DAGNode";
|
||||||
|
import { convertToFlowNode } from "./helpers";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'DAGAutomationFlow/Viewer/DAGNode',
|
||||||
|
component: DAGAutomationFlow,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
args: {
|
||||||
|
"color": "lblue",
|
||||||
|
"height": dgconst.NODE_HEIGHT,
|
||||||
|
"width": dgconst.NODE_WIDTH,
|
||||||
|
"label": "test",
|
||||||
|
"hasInput": true,
|
||||||
|
}
|
||||||
|
} as ComponentMeta<typeof DAGNode>
|
||||||
|
|
||||||
|
export const Colors: ComponentStory<typeof DAGNode> = args => {
|
||||||
|
const nodes = ["blue", "red", "green", "lblue"].map((color, i) => ({
|
||||||
|
"data": { ...args, color },
|
||||||
|
"id": color,
|
||||||
|
"type": "mynode",
|
||||||
|
"position": { "x": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i, "y": 50 + dgconst.NODE_HEIGHT * dgconst.DISTANCE_FACTOR * i }
|
||||||
|
}));
|
||||||
|
return <Page>
|
||||||
|
<ReactFlow
|
||||||
|
defaultNodes={nodes}
|
||||||
|
nodeTypes={{
|
||||||
|
"mynode": convertToFlowNode(DAGNode)
|
||||||
|
}}
|
||||||
|
snapToGrid
|
||||||
|
onlyRenderVisibleElements
|
||||||
|
nodesConnectable={false}
|
||||||
|
nodesDraggable={false}
|
||||||
|
>
|
||||||
|
<Controls />
|
||||||
|
</ReactFlow>
|
||||||
|
</Page>
|
||||||
|
}
|
||||||
@@ -15,17 +15,15 @@ export interface DAGNodeProps {
|
|||||||
hasInput?: boolean;
|
hasInput?: boolean;
|
||||||
accentBackground?: boolean;
|
accentBackground?: boolean;
|
||||||
}
|
}
|
||||||
export const DAGNode: FC<{ data: DAGNodeProps }> = ({
|
export const DAGNode: FC<DAGNodeProps> = ({
|
||||||
data: {
|
label,
|
||||||
label,
|
height,
|
||||||
height,
|
width,
|
||||||
width,
|
onXClick,
|
||||||
onXClick,
|
onEditClick = () => { },
|
||||||
onEditClick = () => { },
|
color,
|
||||||
color,
|
hasInput = false,
|
||||||
hasInput = false,
|
accentBackground = false,
|
||||||
accentBackground = false,
|
|
||||||
},
|
|
||||||
}) => {
|
}) => {
|
||||||
const { classes, theme } = useNodeStyles({
|
const { classes, theme } = useNodeStyles({
|
||||||
color,
|
color,
|
||||||
|
|||||||
File renamed without changes.
@@ -0,0 +1,9 @@
|
|||||||
|
import { FC } from 'react';
|
||||||
|
|
||||||
|
|
||||||
|
export const convertToFlowNode = <D extends {}>(
|
||||||
|
Component: FC<D>
|
||||||
|
): FC<{ data: D }> =>
|
||||||
|
({ data }) => {
|
||||||
|
return <Component {...data} />
|
||||||
|
}
|
||||||
@@ -4,7 +4,8 @@ import React from "react";
|
|||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
import { DAGAutomationFlow } from '.';
|
import { DAGAutomationFlow } from '.';
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
import * as dgconst from "components/DAGSvgs/constants";
|
import * as dgconst from "components/DAGFlow/constants";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -22,7 +23,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
|
|||||||
sequence: args.sequence,
|
sequence: args.sequence,
|
||||||
condition: args.condition,
|
condition: args.condition,
|
||||||
})
|
})
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<DAGAutomationFlow
|
<DAGAutomationFlow
|
||||||
{...args}
|
{...args}
|
||||||
{...state}
|
{...state}
|
||||||
@@ -32,7 +33,7 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
|
|||||||
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
||||||
onConditionUpdate={condition => setState({ ...state, condition })}
|
onConditionUpdate={condition => setState({ ...state, condition })}
|
||||||
/>
|
/>
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Simple = Template.bind({})
|
export const Simple = Template.bind({})
|
||||||
@@ -210,3 +211,24 @@ EmptyStart.args = {
|
|||||||
trigger: [],
|
trigger: [],
|
||||||
sequence: []
|
sequence: []
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const Errors = Template.bind({})
|
||||||
|
Errors.args = {
|
||||||
|
...Errors.args,
|
||||||
|
condition: [
|
||||||
|
{
|
||||||
|
"condition": "numeric_state",
|
||||||
|
} as any
|
||||||
|
],
|
||||||
|
trigger: [
|
||||||
|
{
|
||||||
|
"platform": "event",
|
||||||
|
} as any
|
||||||
|
],
|
||||||
|
sequence: [
|
||||||
|
{
|
||||||
|
"choose": {}
|
||||||
|
} as any
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -14,9 +14,12 @@ import { MultiNodeEditor } from "components/MultiNodeEditors";
|
|||||||
import { Modal } from "components/Modal";
|
import { Modal } from "components/Modal";
|
||||||
import { AutomationCondition } from "types/automations/conditions";
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
import { makeConditionPoint } from "./flowDataMods";
|
import { makeConditionPoint } from "./flowDataMods";
|
||||||
|
import { convertToFlowNode } from "./helpers";
|
||||||
|
import { DAGErrorNode } from "./DAGErrorNode";
|
||||||
|
|
||||||
const nodeTypes = {
|
const nodeTypes = {
|
||||||
'dagnode': DAGNode,
|
'dagnode': convertToFlowNode(DAGNode),
|
||||||
|
'errornode': convertToFlowNode(DAGErrorNode),
|
||||||
'dagcircle': DAGCircle,
|
'dagcircle': DAGCircle,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,6 +64,7 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
|||||||
if (modalState.single) {
|
if (modalState.single) {
|
||||||
modalBody = <NodeEditor
|
modalBody = <NodeEditor
|
||||||
node={modalState.node}
|
node={modalState.node}
|
||||||
|
isErrored={modalState.isError}
|
||||||
onClose={() => setModalState(null)}
|
onClose={() => setModalState(null)}
|
||||||
onSave={n => { modalState.update(n as any); setModalState(null); }}
|
onSave={n => { modalState.update(n as any); setModalState(null); }}
|
||||||
allowedTypes={modalState.allowedTypes}
|
allowedTypes={modalState.allowedTypes}
|
||||||
@@ -123,7 +127,6 @@ export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
|||||||
},
|
},
|
||||||
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
|
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
|
||||||
);
|
);
|
||||||
|
|
||||||
// render
|
// render
|
||||||
return <>
|
return <>
|
||||||
<Modal open={!!modalState}>
|
<Modal open={!!modalState}>
|
||||||
|
|||||||
@@ -70,11 +70,11 @@ export class SafeDAGAutomationFlow extends Component<DAGAutomationFlowProps, Sta
|
|||||||
<span key={i}>{s}</span><br key={`br-${i}`} />
|
<span key={i}>{s}</span><br key={`br-${i}`} />
|
||||||
</>)}
|
</>)}
|
||||||
<h2>Automation YAML</h2>
|
<h2>Automation YAML</h2>
|
||||||
<InputYaml resizable label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
|
<InputYaml label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
|
||||||
<Button onClick={makeSave('trigger')}>Save Triggers</Button>
|
<Button onClick={makeSave('trigger')}>Save Triggers</Button>
|
||||||
<InputYaml resizable label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
|
<InputYaml label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
|
||||||
<Button onClick={makeSave('condition')}>Save Conditions</Button>
|
<Button onClick={makeSave('condition')}>Save Conditions</Button>
|
||||||
<InputYaml resizable label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
|
<InputYaml label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
|
||||||
<Button onClick={makeSave('sequence')}>Save Actions</Button>
|
<Button onClick={makeSave('sequence')}>Save Actions</Button>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,14 @@ export const sequenceToFlow = (
|
|||||||
// draw node
|
// draw node
|
||||||
if (getNodeType(node) === 'action') {
|
if (getNodeType(node) === 'action') {
|
||||||
if ('choose' in node) {
|
if ('choose' in node) {
|
||||||
position = addChooseNode(flowData, node, position, nodeId, dims, updater, i)
|
try {
|
||||||
|
const out = addChooseNode(node, position, nodeId, dims, updater, i);
|
||||||
|
position = out.lastPos
|
||||||
|
flowData = mergeFlowDatas(flowData, out.flowData);
|
||||||
|
} catch (err) {
|
||||||
|
console.error(err)
|
||||||
|
addErrorNode(flowData, nodeId, position, dims, err, updater.makeOnEditForBadNode(i));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
@@ -56,6 +63,7 @@ export const sequenceToFlow = (
|
|||||||
lastPointId = nodeId;
|
lastPointId = nodeId;
|
||||||
lasPos = position;
|
lasPos = position;
|
||||||
}
|
}
|
||||||
|
|
||||||
// add button
|
// add button
|
||||||
const addCircle = makeAddButton(
|
const addCircle = makeAddButton(
|
||||||
`${prefix}-+`,
|
`${prefix}-+`,
|
||||||
@@ -117,10 +125,33 @@ const addSingleNode = (
|
|||||||
position,
|
position,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const addErrorNode = (
|
||||||
|
flowData: FlowData,
|
||||||
|
nodeId: string,
|
||||||
|
position: XYPosition,
|
||||||
|
{
|
||||||
|
nodeHeight,
|
||||||
|
nodeWidth,
|
||||||
|
}: DAGAutomationFlowDims,
|
||||||
|
error: any,
|
||||||
|
onEdit: () => void,
|
||||||
|
hasInput: boolean = true,
|
||||||
|
) => flowData.nodes.push({
|
||||||
|
id: nodeId,
|
||||||
|
type: 'errornode',
|
||||||
|
position,
|
||||||
|
data: {
|
||||||
|
height: nodeHeight,
|
||||||
|
width: nodeWidth,
|
||||||
|
hasInput,
|
||||||
|
onEdit,
|
||||||
|
error,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const addChooseNode = (
|
const addChooseNode = (
|
||||||
flowData: FlowData,
|
|
||||||
node: ChooseAction,
|
node: ChooseAction,
|
||||||
position: XYPosition,
|
position: XYPosition,
|
||||||
nodeId: string,
|
nodeId: string,
|
||||||
@@ -128,6 +159,10 @@ const addChooseNode = (
|
|||||||
updater: SequenceUpdater,
|
updater: SequenceUpdater,
|
||||||
i: number,
|
i: number,
|
||||||
) => {
|
) => {
|
||||||
|
const flowData: FlowData = {
|
||||||
|
nodes: [],
|
||||||
|
edges: [],
|
||||||
|
};
|
||||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||||
onXClick: () => updater.removeNode(i),
|
onXClick: () => updater.removeNode(i),
|
||||||
@@ -209,7 +244,7 @@ const addChooseNode = (
|
|||||||
}, { size: dims.circleSize })
|
}, { size: dims.circleSize })
|
||||||
flowData.nodes.push(elseCircle)
|
flowData.nodes.push(elseCircle)
|
||||||
addEdge(flowData, nodeId, elseCircle.id, true)
|
addEdge(flowData, nodeId, elseCircle.id, true)
|
||||||
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
|
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
|
||||||
...dims,
|
...dims,
|
||||||
padding: {
|
padding: {
|
||||||
x: position.x - dims.nodeWidth,
|
x: position.x - dims.nodeWidth,
|
||||||
@@ -221,5 +256,11 @@ const addChooseNode = (
|
|||||||
} else {
|
} else {
|
||||||
lastPos = xyApply(lastPos, elseCircle.position, Math.max)
|
lastPos = xyApply(lastPos, elseCircle.position, Math.max)
|
||||||
}
|
}
|
||||||
return lastPos
|
return { lastPos, flowData }
|
||||||
|
}
|
||||||
|
|
||||||
|
export const mergeFlowDatas = (fd1: FlowData, fd2: FlowData): FlowData => {
|
||||||
|
fd1.edges = fd1.edges.concat(fd2.edges);
|
||||||
|
fd1.nodes = fd1.nodes.concat(fd2.nodes);
|
||||||
|
return fd1
|
||||||
}
|
}
|
||||||
@@ -78,6 +78,7 @@ export const useNodeStyles = createAppUseStyles<{
|
|||||||
textOverflow: 'ellipsis',
|
textOverflow: 'ellipsis',
|
||||||
overflow: "hidden",
|
overflow: "hidden",
|
||||||
whiteSpace: "break-spaces",
|
whiteSpace: "break-spaces",
|
||||||
|
lineBreak: "anywhere",
|
||||||
cursor: 'default',
|
cursor: 'default',
|
||||||
},
|
},
|
||||||
buttonDelete: {
|
buttonDelete: {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { AutomationTrigger } from 'types/automations/triggers';
|
import { AutomationTrigger } from 'types/automations/triggers';
|
||||||
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
|
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
|
||||||
import { makeAddButton } from './flowDataMods';
|
import { makeAddButton } from './flowDataMods';
|
||||||
|
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
||||||
|
|
||||||
export const triggerToFlow = (
|
export const triggerToFlow = (
|
||||||
flowData: FlowData,
|
flowData: FlowData,
|
||||||
@@ -23,7 +24,7 @@ export const triggerToFlow = (
|
|||||||
id: flowId,
|
id: flowId,
|
||||||
type: 'dagnode',
|
type: 'dagnode',
|
||||||
data: {
|
data: {
|
||||||
label: t.alias ?? t.platform,
|
label: getDescriptionFromAutomationNode(t),
|
||||||
height: nodeHeight,
|
height: nodeHeight,
|
||||||
width: nodeWidth,
|
width: nodeWidth,
|
||||||
color: 'red',
|
color: 'red',
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { DAGCircleProps } from './DAGCircle';
|
|||||||
import { DAGNodeProps } from './DAGNode';
|
import { DAGNodeProps } from './DAGNode';
|
||||||
import { AutomationTrigger } from 'types/automations/triggers';
|
import { AutomationTrigger } from 'types/automations/triggers';
|
||||||
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
|
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
|
||||||
|
import { DAGErrorNodeProps } from './DAGErrorNode';
|
||||||
|
|
||||||
|
|
||||||
export type DAGAutomationFlowDims = {
|
export type DAGAutomationFlowDims = {
|
||||||
@@ -16,7 +17,7 @@ export type DAGAutomationFlowDims = {
|
|||||||
distanceFactor: number;
|
distanceFactor: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | any>;
|
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
|
||||||
export type FlowData = {
|
export type FlowData = {
|
||||||
nodes: DAGAutomationFlowNode[],
|
nodes: DAGAutomationFlowNode[],
|
||||||
edges: Edge[],
|
edges: Edge[],
|
||||||
@@ -34,6 +35,7 @@ export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigge
|
|||||||
|
|
||||||
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
|
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
|
||||||
single: true,
|
single: true,
|
||||||
|
isError?: boolean,
|
||||||
node: T
|
node: T
|
||||||
update: (n: T) => void;
|
update: (n: T) => void;
|
||||||
saveBtnCreateText?: boolean;
|
saveBtnCreateText?: boolean;
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ test("sequence updater updates nodes", () => {
|
|||||||
mock.updater.updateNode(0, {
|
mock.updater.updateNode(0, {
|
||||||
...mock.state[0],
|
...mock.state[0],
|
||||||
alias: "Hello"
|
alias: "Hello"
|
||||||
})
|
} as any)
|
||||||
expect(mock.state[0].alias).toBe("Hello")
|
expect((mock.state[0] as any).alias).toBe("Hello")
|
||||||
})
|
})
|
||||||
test('update conditions for node', () => {
|
test('update conditions for node', () => {
|
||||||
const mock = mockSequenceUpdater([
|
const mock = mockSequenceUpdater([
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { AutomationSequenceNode } from "types/automations";
|
|||||||
import { ChooseAction } from "types/automations/actions";
|
import { ChooseAction } from "types/automations/actions";
|
||||||
import { AutomationCondition } from "types/automations/conditions";
|
import { AutomationCondition } from "types/automations/conditions";
|
||||||
import { UpdateModalState } from "./types";
|
import { UpdateModalState } from "./types";
|
||||||
|
import { getNodeType } from '../../utils/automations';
|
||||||
|
|
||||||
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
|
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
|
||||||
|
|
||||||
@@ -68,7 +69,7 @@ export const makeSequenceUpdater = (
|
|||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
return makeSequenceUpdater(
|
return makeSequenceUpdater(
|
||||||
node.default,
|
node.default ?? [],
|
||||||
seq => this.updateNode(i, {
|
seq => this.updateNode(i, {
|
||||||
...node,
|
...node,
|
||||||
default: seq
|
default: seq
|
||||||
@@ -114,6 +115,16 @@ export const makeSequenceUpdater = (
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
makeOnEditForBadNode(i: number) {
|
||||||
|
const node = sequence[i];
|
||||||
|
return () => openModal({
|
||||||
|
single: true,
|
||||||
|
isError: true,
|
||||||
|
node,
|
||||||
|
allowedTypes: [getNodeType(node)],
|
||||||
|
update: n => this.updateNode(i, n),
|
||||||
|
})
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import React, { FC } from "react";
|
import React, { FC } from "react";
|
||||||
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
import { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||||
import { ErrorBoundary } from ".";
|
import { ErrorBoundary } from ".";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -15,20 +16,20 @@ export const ErrorThrown: ComponentStory<typeof ErrorBoundary> = args => {
|
|||||||
const BadComponent: FC = () => {
|
const BadComponent: FC = () => {
|
||||||
throw new Error("!!!")
|
throw new Error("!!!")
|
||||||
}
|
}
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
<BadComponent />
|
<BadComponent />
|
||||||
</ErrorBoundary>
|
</ErrorBoundary>
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const NoError: ComponentStory<typeof ErrorBoundary> = args => {
|
export const NoError: ComponentStory<typeof ErrorBoundary> = args => {
|
||||||
const GoodComponent: FC = () => {
|
const GoodComponent: FC = () => {
|
||||||
return <span>All Good.</span>
|
return <span>All Good.</span>
|
||||||
}
|
}
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<ErrorBoundary>
|
<ErrorBoundary>
|
||||||
<GoodComponent />
|
<GoodComponent />
|
||||||
</ErrorBoundary>
|
</ErrorBoundary>
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import "./index.css";
|
import "./index.css";
|
||||||
import { Component, ErrorInfo } from "react";
|
import { Component, ErrorInfo, ReactNode } from "react";
|
||||||
|
|
||||||
type State = {
|
type State = {
|
||||||
hasError: false;
|
hasError: false;
|
||||||
@@ -8,7 +8,9 @@ type State = {
|
|||||||
error: any,
|
error: any,
|
||||||
errorInfo?: ErrorInfo,
|
errorInfo?: ErrorInfo,
|
||||||
}
|
}
|
||||||
export class ErrorBoundary extends Component<{}, State> {
|
export class ErrorBoundary extends Component<{
|
||||||
|
children: ReactNode
|
||||||
|
}, State> {
|
||||||
|
|
||||||
state: State = {
|
state: State = {
|
||||||
hasError: false
|
hasError: false
|
||||||
@@ -39,6 +41,8 @@ export class ErrorBoundary extends Component<{}, State> {
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.props.children;
|
return <>
|
||||||
|
{this.props.children}
|
||||||
|
</>;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,7 @@ import { createAppUseStyles } from 'styles/theme';
|
|||||||
export interface ButtonIconStyleProps {
|
export interface ButtonIconStyleProps {
|
||||||
}
|
}
|
||||||
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
|
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
|
||||||
children: FC<IconBaseProps>;
|
Icon: FC<IconBaseProps>;
|
||||||
}
|
}
|
||||||
const useButtonIconStyles = createAppUseStyles(theme => ({
|
const useButtonIconStyles = createAppUseStyles(theme => ({
|
||||||
buttonIcon: {
|
buttonIcon: {
|
||||||
@@ -22,9 +22,9 @@ const useButtonIconStyles = createAppUseStyles(theme => ({
|
|||||||
|
|
||||||
|
|
||||||
export const ButtonIcon: FC<ButtonIconProps> = ({
|
export const ButtonIcon: FC<ButtonIconProps> = ({
|
||||||
children: Child,
|
Icon,
|
||||||
className,
|
className,
|
||||||
...props
|
...props
|
||||||
}) => <Child
|
}) => <Icon
|
||||||
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
|
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
|
||||||
/>
|
/>
|
||||||
@@ -3,6 +3,7 @@ import { ComponentStory } from "@storybook/react";
|
|||||||
import { IconBase } from "./base";
|
import { IconBase } from "./base";
|
||||||
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from ".";
|
import { PencilIcon, CheckMarkIcon, TrashIcon, InfoIcon, ArrowIcon, AddIcon, ZoomIcon, GearIcon } from ".";
|
||||||
import { ButtonIcon } from "./ButtonIcons";
|
import { ButtonIcon } from "./ButtonIcons";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
title: 'Icons',
|
title: 'Icons',
|
||||||
@@ -12,7 +13,7 @@ export default {
|
|||||||
|
|
||||||
export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
||||||
|
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<PencilIcon {...args} />
|
<PencilIcon {...args} />
|
||||||
<CheckMarkIcon {...args} />
|
<CheckMarkIcon {...args} />
|
||||||
<AddIcon {...args} />
|
<AddIcon {...args} />
|
||||||
@@ -20,7 +21,7 @@ export const IconList: ComponentStory<typeof IconBase> = (args) => {
|
|||||||
<InfoIcon {...args} />
|
<InfoIcon {...args} />
|
||||||
<ZoomIcon {...args} />
|
<ZoomIcon {...args} />
|
||||||
<GearIcon {...args} />
|
<GearIcon {...args} />
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
IconList.args = {
|
IconList.args = {
|
||||||
size: 2,
|
size: 2,
|
||||||
@@ -30,9 +31,9 @@ IconList.args = {
|
|||||||
|
|
||||||
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
|
export const ButtonIconExample: ComponentStory<typeof IconBase> = (args) => {
|
||||||
|
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<ButtonIcon {...args}>{ArrowIcon}</ButtonIcon>
|
<ButtonIcon {...args} Icon={ArrowIcon} />
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
ButtonIconExample.args = {
|
ButtonIconExample.args = {
|
||||||
size: 2,
|
size: 2,
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
import TextField from "@mui/material/TextField";
|
||||||
|
import Autocomplete from "@mui/material/Autocomplete";
|
||||||
|
|
||||||
|
export interface InputAutoTextProps {
|
||||||
|
label: string;
|
||||||
|
value: string;
|
||||||
|
options?: string[];
|
||||||
|
error?: string;
|
||||||
|
onChange: (v: string) => void;
|
||||||
|
}
|
||||||
|
export default function InputAutoText({
|
||||||
|
value = "",
|
||||||
|
label,
|
||||||
|
options = [],
|
||||||
|
onChange,
|
||||||
|
error,
|
||||||
|
}: InputAutoTextProps) {
|
||||||
|
|
||||||
|
return <Autocomplete
|
||||||
|
freeSolo
|
||||||
|
value={value}
|
||||||
|
options={options}
|
||||||
|
onChange={(_e, v) => onChange(
|
||||||
|
v === null ? "" : v
|
||||||
|
)}
|
||||||
|
renderInput={params => <TextField
|
||||||
|
{...params}
|
||||||
|
variant="filled"
|
||||||
|
label={label}
|
||||||
|
error={error !== undefined}
|
||||||
|
helperText={error}
|
||||||
|
onChange={e => {
|
||||||
|
e.preventDefault();
|
||||||
|
onChange(
|
||||||
|
e.target.value
|
||||||
|
)
|
||||||
|
}}
|
||||||
|
/>}
|
||||||
|
/>
|
||||||
|
}
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
.input-boolean {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: row;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
max-width: fit-content;
|
|
||||||
border: 1px solid var(--secondary-accent);
|
|
||||||
border-radius: 5px;
|
|
||||||
padding: 0.5em;
|
|
||||||
background-color: var(--secondary);
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-boolean:hover, .input-boolean:hover * {
|
|
||||||
cursor: pointer;
|
|
||||||
background-color: var(--secondary-opaque);
|
|
||||||
}
|
|
||||||
|
|
||||||
.input-boolean * {
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
|
|
||||||
import InputBoolean from "./InputBoolean";
|
import InputBoolean from "./InputBoolean";
|
||||||
@@ -12,12 +13,12 @@ export default {
|
|||||||
|
|
||||||
const Template: ComponentStory<typeof InputBoolean> = args => {
|
const Template: ComponentStory<typeof InputBoolean> = args => {
|
||||||
const [state, onChange] = useState(args.value)
|
const [state, onChange] = useState(args.value)
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<InputBoolean {...args} value={state} onChange={v => {
|
<InputBoolean {...args} value={state} onChange={v => {
|
||||||
args.onChange(v)
|
args.onChange(v)
|
||||||
onChange(v)
|
onChange(v)
|
||||||
}} />
|
}} />
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SimpleText = Template.bind({})
|
export const SimpleText = Template.bind({})
|
||||||
|
|||||||
@@ -1,17 +1,20 @@
|
|||||||
import "./InputBoolean.css";
|
import Checkbox from "@mui/material/Checkbox";
|
||||||
|
import FormGroup from '@mui/material/FormGroup';
|
||||||
|
import FormControlLabel from '@mui/material/FormControlLabel';
|
||||||
|
|
||||||
export interface Props {
|
export interface Props {
|
||||||
label: string;
|
label: string;
|
||||||
value: boolean;
|
value: boolean;
|
||||||
onChange: (v: boolean) => void;
|
onChange: (v: boolean) => void;
|
||||||
|
disabled?: boolean;
|
||||||
}
|
}
|
||||||
export default function InputBoolean({
|
export default function InputBoolean({
|
||||||
label,
|
label,
|
||||||
value = false,
|
value = false,
|
||||||
onChange,
|
onChange,
|
||||||
|
disabled = false,
|
||||||
}: Props) {
|
}: Props) {
|
||||||
return <div className="input-boolean" onClick={() => onChange(!value)}>
|
return <FormGroup>
|
||||||
<input type="checkbox" checked={value} onChange={() => { }} />
|
<FormControlLabel disabled={disabled} control={<Checkbox checked={value} onChange={() => onChange(!value)} />} label={label} />
|
||||||
<label>{label}</label>
|
</FormGroup>
|
||||||
</div>
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { InputDevice } from "./InputDevice";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Inputs/InputDevice',
|
||||||
|
component: InputDevice,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
argTypes: {}
|
||||||
|
} as ComponentMeta<typeof InputDevice>;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof InputDevice> = args => {
|
||||||
|
const [value, setValue] = useState(args.value)
|
||||||
|
return <Page>
|
||||||
|
<div style={{
|
||||||
|
maxWidth: 200
|
||||||
|
}}>
|
||||||
|
<InputDevice {...args} value={value as any} onChange={(v: any) => {
|
||||||
|
setValue(v)
|
||||||
|
args.onChange(v as any)
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
|
</Page>
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Single = Template.bind({})
|
||||||
|
Single.args = {
|
||||||
|
...Single.args,
|
||||||
|
multiple: false,
|
||||||
|
value: 'sensor.bathroom'
|
||||||
|
} as any
|
||||||
@@ -0,0 +1,117 @@
|
|||||||
|
import "./InputEntities.css";
|
||||||
|
import { FC } from "react";
|
||||||
|
import { useHADeviceRegistry } from 'haService';
|
||||||
|
import Autocomplete from '@mui/material/Autocomplete';
|
||||||
|
import TextField from '@mui/material/TextField';
|
||||||
|
import Chip from '@mui/material/Chip';
|
||||||
|
import { EntityId } from 'types/automations/common';
|
||||||
|
import { Badge } from "@mui/material";
|
||||||
|
import { SearchItem } from "./extras";
|
||||||
|
import { prettyName } from 'utils/formatting';
|
||||||
|
|
||||||
|
export type InputEntityProps = {
|
||||||
|
label?: string,
|
||||||
|
} & ({
|
||||||
|
value: string | null;
|
||||||
|
multiple?: false;
|
||||||
|
onChange: (v: string | null) => void;
|
||||||
|
} | {
|
||||||
|
value: EntityId;
|
||||||
|
multiple: true;
|
||||||
|
onChange: (v: string[]) => void;
|
||||||
|
})
|
||||||
|
|
||||||
|
export const InputDevice: FC<InputEntityProps> = props => {
|
||||||
|
// state
|
||||||
|
const dr = useHADeviceRegistry();
|
||||||
|
|
||||||
|
// processing of inputs
|
||||||
|
const options = dr.getOptions();
|
||||||
|
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : [];
|
||||||
|
|
||||||
|
// events
|
||||||
|
const onChange = (_e: any, v: any) => {
|
||||||
|
const cleanValue: string[] = v === null ? [] :
|
||||||
|
Array.isArray(v) ? v.map(opt => {
|
||||||
|
if (typeof opt === 'string') {
|
||||||
|
return opt
|
||||||
|
}
|
||||||
|
return opt.id
|
||||||
|
}) : [v];
|
||||||
|
if (props.multiple) {
|
||||||
|
props.onChange(cleanValue);
|
||||||
|
} else {
|
||||||
|
props.onChange(cleanValue[cleanValue.length - 1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return <Autocomplete
|
||||||
|
className="input-entities"
|
||||||
|
multiple={true}
|
||||||
|
freeSolo
|
||||||
|
value={value}
|
||||||
|
options={options}
|
||||||
|
onChange={onChange}
|
||||||
|
getOptionLabel={dr.getLabel}
|
||||||
|
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.manufacturer) : ''}
|
||||||
|
filterOptions={(opts, s) => {
|
||||||
|
const searchTerm = s.inputValue.toLocaleLowerCase();
|
||||||
|
return opts.map(opt => {
|
||||||
|
let similarityScore = 0;
|
||||||
|
const eid = dr.getID(opt);
|
||||||
|
if (eid.toLocaleLowerCase().includes(searchTerm)) {
|
||||||
|
similarityScore = Math.abs(eid.length - searchTerm.length)
|
||||||
|
}
|
||||||
|
const name = dr.getLabel(opt);
|
||||||
|
if (name.toLocaleLowerCase().includes(searchTerm)) {
|
||||||
|
similarityScore = Math.abs(eid.length - searchTerm.length)
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
label: name,
|
||||||
|
id: eid,
|
||||||
|
similarityScore,
|
||||||
|
manufacturer: (typeof opt === 'string') ? '' : opt.manufacturer ?? ""
|
||||||
|
}
|
||||||
|
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
|
||||||
|
return (a.similarityScore > b.similarityScore) ? 1 : -1
|
||||||
|
})
|
||||||
|
}}
|
||||||
|
renderOption={(prop, option, { inputValue }) => {
|
||||||
|
const label = dr.getLabel(option);
|
||||||
|
const id = dr.getID(option);
|
||||||
|
|
||||||
|
return <SearchItem
|
||||||
|
listProps={prop}
|
||||||
|
id={id}
|
||||||
|
label={label}
|
||||||
|
searchTerm={inputValue}
|
||||||
|
/>
|
||||||
|
}}
|
||||||
|
renderInput={params => <TextField
|
||||||
|
{...params}
|
||||||
|
variant="filled"
|
||||||
|
label={props.label ?? "Device"}
|
||||||
|
/>}
|
||||||
|
renderTags={(tagValue, getTagProps) => <Badge badgeContent={tagValue.length} color="info">
|
||||||
|
<div className="input-entities--tags">
|
||||||
|
{tagValue.map((option, index) => {
|
||||||
|
const label = dr.getLabel(option);
|
||||||
|
const id = dr.getID(option);
|
||||||
|
const props = getTagProps({ index });
|
||||||
|
props.className += ' input-entities--chip'
|
||||||
|
return (
|
||||||
|
<Chip
|
||||||
|
size="medium"
|
||||||
|
label={<>
|
||||||
|
{(id === label) ? <span>{label}</span> : <b>{label}</b>}
|
||||||
|
{(id !== label) && <small>{id}</small>}
|
||||||
|
</>}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</Badge>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
.input-entities .BaseBadge-root {
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-entities--chip>span {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
gap: 0.15em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-entities--chip>span>small::before {
|
||||||
|
content: "/ ";
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-entities--chip>span>small {
|
||||||
|
size: 0.15em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-entities--errors {
|
||||||
|
margin-top: 0.75em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-entities--errors ul {
|
||||||
|
padding: 0 0 0 1em;
|
||||||
|
margin: 0;
|
||||||
|
max-height: 2.5em;
|
||||||
|
overflow-y: auto;
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.input-entities--tags {
|
||||||
|
max-height: 5em;
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: auto;
|
||||||
|
}
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
import "./InputEntities.css";
|
||||||
|
import { FC } from "react";
|
||||||
|
import { useHAEntities } from 'haService';
|
||||||
|
import Autocomplete from '@mui/material/Autocomplete';
|
||||||
|
import TextField from '@mui/material/TextField';
|
||||||
|
import Chip from '@mui/material/Chip';
|
||||||
|
import { prettyName } from "utils/formatting";
|
||||||
|
import { EntityId } from 'types/automations/common';
|
||||||
|
import { Badge } from "@mui/material";
|
||||||
|
import { SearchItem } from "./extras";
|
||||||
|
|
||||||
|
export type InputEntityProps = {
|
||||||
|
restrictToDomain?: string[],
|
||||||
|
label?: string,
|
||||||
|
} & ({
|
||||||
|
value: string | null;
|
||||||
|
multiple?: false;
|
||||||
|
onChange: (v: string | null) => void;
|
||||||
|
} | {
|
||||||
|
value: EntityId;
|
||||||
|
multiple: true;
|
||||||
|
onChange: (v: string[]) => void;
|
||||||
|
})
|
||||||
|
|
||||||
|
export const InputEntity: FC<InputEntityProps> = props => {
|
||||||
|
// state
|
||||||
|
const entities = useHAEntities();
|
||||||
|
|
||||||
|
// processing of inputs
|
||||||
|
const options = entities.getOptions(props.restrictToDomain);
|
||||||
|
const value = Array.isArray(props.value) ? props.value : !!props.value ? [props.value] : [];
|
||||||
|
const errors = entities.validateOptions(value, props.restrictToDomain);
|
||||||
|
|
||||||
|
// processing of errors
|
||||||
|
let helperText = <></>;
|
||||||
|
let error: boolean = false;
|
||||||
|
if (errors !== null) {
|
||||||
|
error = true
|
||||||
|
if (errors.length > 0) {
|
||||||
|
helperText = <Badge
|
||||||
|
className="input-entities--errors"
|
||||||
|
badgeContent={errors.length} color="error"
|
||||||
|
>
|
||||||
|
<ul title={errors.join(', and')}>{errors.map((msg, i) => <li key={i}>
|
||||||
|
{msg}
|
||||||
|
</li>)}</ul>
|
||||||
|
</Badge>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// events
|
||||||
|
const onChange = (_e: any, v: any) => {
|
||||||
|
const cleanValue: string[] = v === null ? [] :
|
||||||
|
Array.isArray(v) ? v.map(opt => {
|
||||||
|
if (typeof opt === 'string') {
|
||||||
|
return opt
|
||||||
|
}
|
||||||
|
return opt.id
|
||||||
|
}) : [v];
|
||||||
|
if (props.multiple) {
|
||||||
|
props.onChange(cleanValue);
|
||||||
|
} else {
|
||||||
|
props.onChange(cleanValue[cleanValue.length - 1])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return <Autocomplete
|
||||||
|
className="input-entities"
|
||||||
|
multiple={true}
|
||||||
|
freeSolo
|
||||||
|
value={value}
|
||||||
|
options={options}
|
||||||
|
onChange={onChange}
|
||||||
|
getOptionLabel={entities.getLabel}
|
||||||
|
filterOptions={(opts, s) => {
|
||||||
|
const searchTerm = s.inputValue.toLocaleLowerCase();
|
||||||
|
return opts.map(opt => {
|
||||||
|
let similarityScore = 0;
|
||||||
|
const eid = entities.getID(opt);
|
||||||
|
if (eid.toLocaleLowerCase().includes(searchTerm)) {
|
||||||
|
similarityScore = Math.abs(eid.length - searchTerm.length)
|
||||||
|
}
|
||||||
|
const name = entities.getLabel(opt);
|
||||||
|
if (name.toLocaleLowerCase().includes(searchTerm)) {
|
||||||
|
similarityScore = Math.abs(eid.length - searchTerm.length)
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
label: name,
|
||||||
|
id: eid,
|
||||||
|
domain: (typeof opt === 'string') ? '' : opt.domain,
|
||||||
|
similarityScore
|
||||||
|
}
|
||||||
|
}).filter(opt => opt.similarityScore > 0).sort((a, b) => {
|
||||||
|
return (a.similarityScore > b.similarityScore) ? 1 : -1
|
||||||
|
})
|
||||||
|
}}
|
||||||
|
groupBy={opt => (typeof opt !== 'string') ? prettyName(opt.domain) : ''}
|
||||||
|
renderOption={(prop, option, { inputValue }) => {
|
||||||
|
const label = entities.getLabel(option);
|
||||||
|
const id = entities.getID(option);
|
||||||
|
|
||||||
|
return <SearchItem
|
||||||
|
listProps={prop}
|
||||||
|
id={id}
|
||||||
|
label={label}
|
||||||
|
searchTerm={inputValue}
|
||||||
|
/>
|
||||||
|
}}
|
||||||
|
renderInput={params => <TextField
|
||||||
|
{...params}
|
||||||
|
variant="filled"
|
||||||
|
label={props.label ?? "Entity ID"}
|
||||||
|
helperText={helperText}
|
||||||
|
error={error}
|
||||||
|
/>}
|
||||||
|
renderTags={(tagValue, getTagProps) => <Badge badgeContent={tagValue.length} color="info">
|
||||||
|
<div className="input-entities--tags">
|
||||||
|
{tagValue.map((option, index) => {
|
||||||
|
const label = entities.getLabel(option);
|
||||||
|
const id = entities.getID(option);
|
||||||
|
const props = getTagProps({ index });
|
||||||
|
props.className += ' input-entities--chip'
|
||||||
|
return (
|
||||||
|
<Chip
|
||||||
|
size="medium"
|
||||||
|
label={<>
|
||||||
|
{(id === label) ? <span>{label}</span> : <b>{label}</b>}
|
||||||
|
{(id !== label) && <small>{id}</small>}
|
||||||
|
</>}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
})}
|
||||||
|
</div>
|
||||||
|
</Badge>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
|
import { useState } from "react";
|
||||||
|
|
||||||
|
import { InputEntity } from "./InputEntities";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
title: 'Inputs/InputEntity',
|
||||||
|
component: InputEntity,
|
||||||
|
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||||
|
argTypes: {}
|
||||||
|
} as ComponentMeta<typeof InputEntity>;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const Template: ComponentStory<typeof InputEntity> = args => {
|
||||||
|
const [value, setValue] = useState(args.value)
|
||||||
|
return <Page>
|
||||||
|
<div style={{
|
||||||
|
maxWidth: 200
|
||||||
|
}}>
|
||||||
|
<InputEntity {...args} value={value as any} onChange={(v: any) => {
|
||||||
|
setValue(v)
|
||||||
|
args.onChange(v as any)
|
||||||
|
}} />
|
||||||
|
</div>
|
||||||
|
</Page>
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Single = Template.bind({})
|
||||||
|
Single.args = {
|
||||||
|
...Single.args,
|
||||||
|
multiple: false,
|
||||||
|
value: 'sensor.bathroom'
|
||||||
|
} as any
|
||||||
|
|
||||||
|
export const Many = Template.bind({})
|
||||||
|
Many.args = {
|
||||||
|
...Many.args,
|
||||||
|
multiple: true,
|
||||||
|
value: ['sensor.bathroom', 'person.ari']
|
||||||
|
} as any
|
||||||
|
|
||||||
|
export const ManyEmpty = Template.bind({})
|
||||||
|
ManyEmpty.args = {
|
||||||
|
...ManyEmpty.args,
|
||||||
|
multiple: true,
|
||||||
|
value: []
|
||||||
|
} as any
|
||||||
|
|
||||||
|
|
||||||
|
export const ManyButGotSingle = Template.bind({})
|
||||||
|
ManyButGotSingle.args = {
|
||||||
|
...ManyButGotSingle.args,
|
||||||
|
multiple: true,
|
||||||
|
value: 'sensor.bathroom'
|
||||||
|
} as any
|
||||||
|
|
||||||
|
|
||||||
|
export const InvalidDomain = Template.bind({})
|
||||||
|
InvalidDomain.args = {
|
||||||
|
...InvalidDomain.args,
|
||||||
|
multiple: true,
|
||||||
|
value: 'sensor.bathroom',
|
||||||
|
restrictToDomain: ['zone'],
|
||||||
|
} as any
|
||||||
|
|
||||||
|
|
||||||
|
export const InvalidManyDomain = Template.bind({})
|
||||||
|
InvalidManyDomain.args = {
|
||||||
|
...InvalidManyDomain.args,
|
||||||
|
multiple: true,
|
||||||
|
value: 'sensor.bathroom',
|
||||||
|
restrictToDomain: ['zone', 'switch'],
|
||||||
|
} as any
|
||||||
|
|
||||||
|
export const InvalidLots = Template.bind({})
|
||||||
|
InvalidLots.args = {
|
||||||
|
...InvalidLots.args,
|
||||||
|
multiple: true,
|
||||||
|
value: ['person.ari', 'sensor.bathroom', 'binary_sensor.ping_tv', 'device_tracker.phone'],
|
||||||
|
restrictToDomain: ['zone', 'switch'],
|
||||||
|
} as any
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
import { useState, useEffect } from 'react';
|
import { useState, useEffect } from 'react';
|
||||||
|
|
||||||
import { InputList } from "./InputList";
|
import { InputList } from "./InputList";
|
||||||
@@ -18,9 +19,9 @@ const Template: ComponentStory<typeof InputList> = args => {
|
|||||||
setValue(args.current)
|
setValue(args.current)
|
||||||
}
|
}
|
||||||
}, [args.current])
|
}, [args.current])
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<InputList {...args} current={value} onChange={setValue} />
|
<InputList {...args} current={value} onChange={setValue} />
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SimpleText = Template.bind({})
|
export const SimpleText = Template.bind({})
|
||||||
|
|||||||
@@ -1,44 +1,52 @@
|
|||||||
import { FC } from "react";
|
import { FC } from "react";
|
||||||
import InputWrapper from "./InputWrapper";
|
import FormHelperText from '@mui/material/FormHelperText';
|
||||||
import { useInputListStyles } from "./styles";
|
import InputLabel from '@mui/material/InputLabel';
|
||||||
|
import MenuItem from '@mui/material/MenuItem';
|
||||||
|
import FormControl from '@mui/material/FormControl';
|
||||||
|
import Select from '@mui/material/Select';
|
||||||
|
|
||||||
export interface Props<T extends string> {
|
export interface Props<T extends string> {
|
||||||
current: T;
|
current: T;
|
||||||
options: readonly T[];
|
options: readonly T[];
|
||||||
onChange: (n: T) => void;
|
onChange: (n: T) => void;
|
||||||
|
label: string;
|
||||||
id?: string;
|
id?: string;
|
||||||
className?: string;
|
className?: string;
|
||||||
label: string;
|
|
||||||
}
|
}
|
||||||
export const InputList: FC<Props<any>> = ({
|
export const InputList: FC<Props<any>> = ({
|
||||||
current, options, onChange, label,
|
current,
|
||||||
...selattr
|
options,
|
||||||
|
onChange,
|
||||||
|
label,
|
||||||
|
id,
|
||||||
|
className,
|
||||||
}) => {
|
}) => {
|
||||||
const invalidCurrent = !options.includes(current);
|
const invalidCurrent = current && !options.includes(current);
|
||||||
const { classes } = useInputListStyles({
|
return <FormControl variant="filled" sx={{ marginRight: "0.25em", minWidth: `${label.length * 0.75}em` }}>
|
||||||
invalidCurrent
|
<InputLabel id="demo-simple-select-filled-label">{label}</InputLabel>
|
||||||
});
|
<Select
|
||||||
return <InputWrapper label={label} labelSize={'small'} noMargin error={invalidCurrent ? "Invalid Selection" : undefined}>
|
className={className}
|
||||||
<select
|
autoWidth
|
||||||
title={invalidCurrent ? "Invalid Selection" : ""}
|
id={id}
|
||||||
className={classes.input}
|
value={current}
|
||||||
{...selattr} value={current}
|
onChange={(e) => {
|
||||||
onChange={e => {
|
onChange(e.target.value)
|
||||||
e.preventDefault();
|
|
||||||
if (e.currentTarget.id === 'invalid') {
|
|
||||||
onChange(options[0])
|
|
||||||
} else {
|
|
||||||
onChange(e.currentTarget.value as any);
|
|
||||||
}
|
|
||||||
}}
|
}}
|
||||||
|
label={label}
|
||||||
|
variant="filled"
|
||||||
|
placeholder={label}
|
||||||
|
error={invalidCurrent}
|
||||||
|
|
||||||
>
|
>
|
||||||
{options.map((t, i) => <option id={String(i)} key={i} value={t}>{t}</option>)}
|
{options.map((t, i) => (
|
||||||
{invalidCurrent ? <option
|
<MenuItem
|
||||||
id={'invalid'}
|
key={i}
|
||||||
value={current}
|
value={t}
|
||||||
style={{ display: 'none' }}
|
>
|
||||||
>!{current}!</option> : <></>}
|
{t}
|
||||||
</select>
|
</MenuItem>
|
||||||
</InputWrapper>
|
))}
|
||||||
|
</Select>
|
||||||
|
<FormHelperText>{invalidCurrent ? `'${current}' is not a valid selection` : ''}</FormHelperText>
|
||||||
|
</FormControl>
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||||
|
import { Page } from "components/Page";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
|
|
||||||
import InputMultiSelect from "./InputMultiSelect";
|
import InputMultiSelect from "./InputMultiSelect";
|
||||||
@@ -18,12 +19,12 @@ const Template: ComponentStory<typeof InputMultiSelect> = args => {
|
|||||||
setValue(args.selected);
|
setValue(args.selected);
|
||||||
}, [args.selected])
|
}, [args.selected])
|
||||||
|
|
||||||
return <div className="page">
|
return <Page>
|
||||||
<InputMultiSelect {...args} onChange={a => {
|
<InputMultiSelect {...args} onChange={a => {
|
||||||
setValue(a);
|
setValue(a);
|
||||||
args.onChange(a);
|
args.onChange(a);
|
||||||
}} options={args.options} selected={value} />
|
}} options={args.options} selected={value} />
|
||||||
</div>
|
</Page>
|
||||||
}
|
}
|
||||||
|
|
||||||
export const Simple = Template.bind({})
|
export const Simple = Template.bind({})
|
||||||
|
|||||||
Loaded 100 of 186 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user