Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
359958aada | ||
|
|
7a73af4434 | ||
|
|
55bb941399 | ||
|
|
afb765024d | ||
|
|
911f867518 | ||
|
|
25bb19dbe5 | ||
|
|
9960ce2909 | ||
|
|
c2fde70954 | ||
|
|
5ca9c4a361 | ||
|
|
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 | ||
|
|
d3adfaaacb | ||
|
|
c249a94b3d | ||
|
|
dce028d0bc | ||
|
|
7333f9e159 | ||
|
|
809095f8e0 | ||
|
|
8942693a32 | ||
|
|
db49ed02ed | ||
|
|
cce2e03053 | ||
|
|
4509a224a9 | ||
|
|
7f8b75fa02 | ||
|
|
d2c5310b93 | ||
|
|
a19db93c37 | ||
|
|
6c57408f27 | ||
|
|
b9a77746c0 | ||
|
|
f1ffab13be | ||
|
|
52fcfd9271 | ||
|
|
f435bb70aa | ||
|
|
2598c23fd2 | ||
|
|
070dc7c871 | ||
|
|
3d70f04e60 | ||
|
|
cf29d9d61c | ||
|
|
2245fd556b | ||
|
|
f50f22190e |
No files matched your search
@@ -2,3 +2,12 @@ webapp/node_modules
|
||||
webapp/build
|
||||
webapp/.storybook
|
||||
webapp/.vscode
|
||||
webapp/.env.local
|
||||
webapp/tmux.sh
|
||||
api/.env
|
||||
api/.coverage
|
||||
api/venv
|
||||
api/build
|
||||
api/.mypy_cache
|
||||
api/.vscode
|
||||
api/.coverage
|
||||
@@ -0,0 +1,33 @@
|
||||
name: "Manual Build"
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
type: string
|
||||
description: "Version Number"
|
||||
required: true
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
name: "${{ github.event.inputs.version }} / ${{ matrix.arch }}"
|
||||
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
|
||||
uses: home-assistant/builder@2022.03.1
|
||||
with:
|
||||
args: |
|
||||
--${{ matrix.arch }} \
|
||||
--version ${{ github.event.inputs.version }} \
|
||||
--target .
|
||||
@@ -1,19 +1,15 @@
|
||||
name: Deploy
|
||||
env:
|
||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||
on:
|
||||
# release:
|
||||
# types: [published]
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branch: [main]
|
||||
paths:
|
||||
- 'config.yaml'
|
||||
- "config.yaml"
|
||||
jobs:
|
||||
|
||||
metadata:
|
||||
runs-on: ubuntu-latest
|
||||
name: Metadata
|
||||
outputs:
|
||||
outputs:
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
changlelog: ${{ steps.changlelog.outputs.CHANGELOG }}
|
||||
steps:
|
||||
@@ -30,42 +26,15 @@ jobs:
|
||||
run: |
|
||||
echo ::set-output name=CHANGELOG::$(cat CHANGELOG.md)
|
||||
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
name: Build & Publish ${{ matrix.arch }}
|
||||
needs:
|
||||
- metadata
|
||||
strategy:
|
||||
matrix:
|
||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||
|
||||
steps:
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.0.0
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Build & Push to Dockerhub - ${{ matrix.arch }} / ${{ needs.metadata.outputs.version }}
|
||||
uses: home-assistant/builder@2022.03.1
|
||||
with:
|
||||
args: |
|
||||
--${{ matrix.arch }} \
|
||||
--target .
|
||||
|
||||
publish:
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- metadata
|
||||
- build
|
||||
name: Publish Github Release
|
||||
steps:
|
||||
- name: Publish Release ${{ needs.metadata.outputs.version }}
|
||||
uses: actions/github-script@v6
|
||||
env:
|
||||
env:
|
||||
VERSION: ${{ needs.metadata.outputs.version }}
|
||||
CHANGELOG: ${{ needs.metadata.outputs.changlelog }}
|
||||
with:
|
||||
@@ -74,5 +43,4 @@ jobs:
|
||||
owner: context.repo.owner,
|
||||
repo: context.repo.repo,
|
||||
tag_name: process.env.VERSION,
|
||||
body: process.env.CHANGELOG,
|
||||
});
|
||||
});
|
||||
+61
-33
@@ -1,50 +1,44 @@
|
||||
name: Test
|
||||
env:
|
||||
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
|
||||
on:
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branch: [main]
|
||||
pull_request:
|
||||
branches: [main]
|
||||
jobs:
|
||||
build:
|
||||
metadata:
|
||||
runs-on: ubuntu-latest
|
||||
name: Build Test for ${{ matrix.arch }}
|
||||
strategy:
|
||||
matrix:
|
||||
arch: ["aarch64", "amd64", "armhf", "armv7", "i386"]
|
||||
|
||||
name: Metadata
|
||||
outputs:
|
||||
version: ${{ steps.version.outputs.VERSION }}
|
||||
steps:
|
||||
- name: Cancel Previous Runs
|
||||
uses: styfle/cancel-workflow-action@0.9.1
|
||||
with:
|
||||
all_but_latest: true
|
||||
access_token: ${{ github.token }}
|
||||
|
||||
- name: Check out repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.0.0
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
fetch-depth: 0
|
||||
- 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:
|
||||
name: "Python Tests"
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- metadata
|
||||
strategy:
|
||||
matrix:
|
||||
action: [lint, coverage, security-checks]
|
||||
action:
|
||||
- lint
|
||||
- coverage
|
||||
- security-checks
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up Python
|
||||
@@ -55,23 +49,57 @@ jobs:
|
||||
run: cd api && make setup
|
||||
- name: Echo dependencies
|
||||
run: cd api && ./venv/bin/pip freeze
|
||||
- name: Running ${{ matrix.action }}
|
||||
- name: ${{ needs.metadata.outputs.version }} / ${{ matrix.action }}
|
||||
run: cd api && make ${{ matrix.action }}
|
||||
|
||||
nodejs:
|
||||
name: "NodeJs Tests"
|
||||
runs-on: ubuntu-latest
|
||||
needs:
|
||||
- metadata
|
||||
strategy:
|
||||
matrix:
|
||||
action:
|
||||
- "test:ci"
|
||||
- "tsc:ci"
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16
|
||||
cache: 'yarn'
|
||||
cache: "yarn"
|
||||
cache-dependency-path: webapp/yarn.lock
|
||||
- name: Install Dependencies
|
||||
run: cd webapp && yarn install
|
||||
- name: Run Tests
|
||||
run: cd webapp && yarn test:ci
|
||||
|
||||
- name: ${{ needs.metadata.outputs.version }} / ${{ 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"
|
||||
],
|
||||
"python.testing.pytestEnabled": false,
|
||||
"python.testing.unittestEnabled": true
|
||||
"python.testing.unittestEnabled": true,
|
||||
"yaml.schemas": {
|
||||
"https://json.schemastore.org/github-action.json": ".github/workflows/*.yml"
|
||||
}
|
||||
}
|
||||
+92
-2
@@ -1,4 +1,94 @@
|
||||
# Changelog -- v0.1.5
|
||||
# Changelog 
|
||||
|
||||
## [0.1.19] - Vertical mobile mode
|
||||
|
||||
- in mobile mode we draw the graphs vertically now
|
||||
|
||||
## [0.1.17] - Websockets
|
||||
|
||||
- Connected to HA main websocket -- now we retrieve real-time information about
|
||||
|
||||
* Device names
|
||||
* Entity names/ids
|
||||
|
||||
- Autocomplete for devices and entities
|
||||
|
||||
## [0.1.14] - Material UI + Autocomplete
|
||||
|
||||
- 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
|
||||
|
||||
- Some triggers had invalid types and were causing a false-positive validation
|
||||
|
||||
## [0.1.8] - Support for Malformed Automations
|
||||
|
||||
- API will no longer error out on missing values or invalid lists
|
||||
- Frontend has support for displaying bad automations
|
||||
|
||||
## [0.1.6] - Mobile Mode
|
||||
|
||||
- Improved mobile mode
|
||||
- Fixed up arrow styles due to typos
|
||||
- Added selection color
|
||||
- Added selection color
|
||||
|
||||
## [0.1.2] - Docker Hub Images
|
||||
|
||||
- Publishing images to docker hub is now stable
|
||||
|
||||
## [0.0.15] - Publish to dockerhub
|
||||
|
||||
- Publishing images to docker hub
|
||||
|
||||
## [0.0.14] - Using vanila ha yaml
|
||||
|
||||
- Supporing vanilla out of the box HA yaml as oppose to parsing them (no more $smType)
|
||||
- Conditions have now a more a explicit node
|
||||
|
||||
## [0.0.13] - Better Styling with react-flow
|
||||
|
||||
- Fixed up styling (using react-flow)
|
||||
- cleaned up some button styles
|
||||
|
||||
## [0.0.12] - Tags
|
||||
|
||||
- Added tag management system for automations
|
||||
|
||||
## [0.0.11] - Zoom
|
||||
|
||||
- Added lazy saving
|
||||
|
||||
## [0.0.10] - Zoom
|
||||
|
||||
- Introducing Zoom!
|
||||
|
||||
## [0.0.9] - First Working Version
|
||||
|
||||
- Instalable verion via github
|
||||
- Initial POC done
|
||||
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||
+20
-16
@@ -1,11 +1,16 @@
|
||||
# <--- Build Args -->
|
||||
# <--- Pre-Build Args -->
|
||||
ARG BUILD_ARCH
|
||||
ARG BUILD_VERSION
|
||||
|
||||
# <--- Image Setup -->
|
||||
FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14
|
||||
WORKDIR /app
|
||||
|
||||
# <--- Post-Build Args -->
|
||||
ARG BUILD_VERSION
|
||||
|
||||
# <--- Environment Variables -->
|
||||
ENV BUILD_VERSION $BUILD_VERSION
|
||||
|
||||
# <--- System Wide Dependencies -->
|
||||
ENV LANG C.UTF-8
|
||||
RUN apk add --no-cache \
|
||||
@@ -13,29 +18,26 @@ RUN apk add --no-cache \
|
||||
npm \
|
||||
build-base \
|
||||
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 -->
|
||||
COPY api/setup.py /app/setup.py
|
||||
RUN pip install . /app
|
||||
|
||||
# <--- Webapp Build -->
|
||||
COPY webapp/ /app/web-builder
|
||||
RUN cd /app/web-builder && \
|
||||
yarn && \
|
||||
yarn build && \
|
||||
cp -r /app/web-builder/build /app/web && \
|
||||
rm -rf /app/web-builder
|
||||
echo "REACT_APP_BUILD_VERSION=${BUILD_VERSION}" > /app/web-builder/.env.production
|
||||
|
||||
# <--- BUILD -->
|
||||
RUN /app/bin/build.sh /app /app/web-builder
|
||||
|
||||
# <--- Api Code -->
|
||||
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 -->
|
||||
EXPOSE 8000
|
||||
@@ -45,5 +47,7 @@ LABEL \
|
||||
io.hass.type="addon" \
|
||||
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:
|
||||
$(DC) build
|
||||
|
||||
build-no-cache:
|
||||
$(DC) build --no-cache
|
||||
|
||||
push:
|
||||
$(DC) push
|
||||
|
||||
local_run:
|
||||
$(MAKE) build
|
||||
start:
|
||||
$(DC) up -d
|
||||
sleep 1
|
||||
$(DC) ps
|
||||
|
||||
local_logs:
|
||||
logs:
|
||||
$(DC) logs -f
|
||||
|
||||
local_ps:
|
||||
ps:
|
||||
$(DC) ps
|
||||
|
||||
|
||||
local_stop:
|
||||
stop:
|
||||
$(DC) stop
|
||||
|
||||
bash:
|
||||
$(DC) exec addon bash
|
||||
|
||||
config:
|
||||
$(DC) config
|
||||
@@ -1,13 +1,19 @@
|
||||
# Shortumation
|
||||
# Shortumation 
|
||||
|
||||
[](https://github.com/asosnovsky/Shortumation/actions/workflows/test.yml)
|
||||

|
||||
| | Stable | Edge
|
||||
| --- | --- | ---
|
||||
| Version |  | 
|
||||
|
||||
A better way to write automations in home-assistant without having to install and run a seperate automation engine!
|
||||
|
||||

|
||||

|
||||
|
||||

|
||||

|
||||
|
||||
|
||||
A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI for managing your automations & scripts. We provide a way to visualize and develop your automation using a visual-programming language that draws inspirations from [Node-Red](https://nodered.org/).
|
||||
A [home-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/).
|
||||
|
||||
## Features
|
||||
|
||||
@@ -15,20 +21,36 @@ A [home-assistent addon](https://www.home-assistant.io/addons/) for a better UI
|
||||
- [X] See all automations in one common view
|
||||
- [X] Automation Manager
|
||||
- [X] Tags for automation organization
|
||||
- [X] Autocomplete fields for entities/devices
|
||||
- [ ] Script Manager
|
||||
- [ ] Use secrets and global parameters
|
||||
- [ ] Autocomplete fields for entities/devices
|
||||
- [ ] Autocomplete fields for template editor
|
||||
- [ ] Autocomplete fields for referencing scripts
|
||||
|
||||
See roadmap in [Version 1 Github Project](https://github.com/asosnovsky/Shortumation/projects/1).
|
||||
|
||||
## Installation
|
||||
|
||||
### Addon
|
||||
|
||||
Add the repository URL under **Supervisor → Add-on store → ⋮ → Manage add-on repositories**:
|
||||
|
||||
https://github.com/asosnovsky/Shortumation
|
||||
|
||||
It should now appear in your `Add-on Store` and you should be able to install it!
|
||||
|
||||
### Containerized
|
||||
|
||||
Please note that this way of using Shortumation is **not future proof**, currently we use the `/config/automation.yaml` file as our source of truth for the automations. Which means that we do not need access to the HA API or Websockets. In future release you may need to configure some additional compomenents to enable this.
|
||||
|
||||
If this warning does not scare you or you still want to try things out, then take a look at the example [docker-compose.yaml](example/containerized/docker-compose.yaml).
|
||||
|
||||
|
||||
## FAQ
|
||||
|
||||
**How is this different from Node-Red?**
|
||||
|
||||
> Node-Red is both an execution engine and an automation editor, which means that in order for you automations to run you have to have an additional component running and executing the automations. Shortumations simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
||||
> Node-Red is both an execution engine and an automation editor, which means that in order for you automations to run you have to have an additional component running and executing the automations. Shortumation simply provides a different editor and manager for writing Homeassistant automations, while relying on Homeassistant to execute the automations (this uses the `automations.yaml` file as the backend database)
|
||||
|
||||
**Which HA Installation does this support?**
|
||||
|
||||
|
||||
+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)
|
||||
upsert_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:27)
|
||||
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:31)
|
||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/details.py:12)
|
||||
read_ping # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/ping.py:9)
|
||||
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:16)
|
||||
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:17)
|
||||
id # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:6)
|
||||
alias # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:7)
|
||||
description # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:8)
|
||||
trigger_variables # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:9)
|
||||
mode # unused variable (/home/ari/Projects/Shortumation/api/src/automations/types.py:10)
|
||||
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:28)
|
||||
delete_auto # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/automations.py:32)
|
||||
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:10)
|
||||
websocket_endpoint # unused function (/home/ari/Projects/Shortumation/api/src/api/routes/socket.py:9)
|
||||
params # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:18)
|
||||
total_items # unused variable (/home/ari/Projects/Shortumation/api/src/api/types.py:19)
|
||||
id # 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)
|
||||
description # 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)
|
||||
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:
|
||||
$(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:
|
||||
rm -rf dist *.sqlite *.egg-info build .mypy_cache .coverage
|
||||
|
||||
+2
-1
@@ -4,7 +4,7 @@ import setuptools # type: ignore
|
||||
setuptools.setup(
|
||||
python_requires=">=3.9",
|
||||
install_requires=[
|
||||
"ruamel.yaml==0.17.17",
|
||||
"PyYAML==6.0",
|
||||
"fastapi==0.70.0",
|
||||
"pydantic==1.8.2",
|
||||
"uvicorn[standard]==0.15.0",
|
||||
@@ -21,6 +21,7 @@ setuptools.setup(
|
||||
"pre-commit==2.13.0",
|
||||
"vulture==2.3",
|
||||
"types-requests==2.25.6",
|
||||
"types-PyYAML==6.0.7",
|
||||
"requests==2.27.0",
|
||||
],
|
||||
},
|
||||
|
||||
+10
-5
@@ -3,16 +3,16 @@ from fastapi.middleware.cors import CORSMiddleware
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
|
||||
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:
|
||||
app = FastAPI()
|
||||
if (ROOT_FOLDER / "web").exists():
|
||||
app.mount(
|
||||
"/web",
|
||||
f"{API_PREFIX}/web",
|
||||
StaticFiles(
|
||||
directory=ROOT_FOLDER / "web",
|
||||
html=True,
|
||||
@@ -29,6 +29,11 @@ def make_app(automation_mgr: AutomationManager) -> FastAPI:
|
||||
allow_headers=["*"],
|
||||
)
|
||||
app.include_router(ping.router, prefix="/ping")
|
||||
app.include_router(automations.make_automation_router(automation_mgr), prefix="/automations")
|
||||
app.include_router(details.make_details_router(automation_mgr.hass_config), prefix="/details")
|
||||
app.include_router(
|
||||
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
|
||||
@@ -1,8 +1,6 @@
|
||||
from datetime import datetime
|
||||
|
||||
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
|
||||
|
||||
|
||||
@@ -10,9 +8,11 @@ def make_details_router(hass_config: HassConfig) -> APIRouter:
|
||||
router = APIRouter()
|
||||
|
||||
@router.get("/")
|
||||
def read_ping():
|
||||
def read_details():
|
||||
return {
|
||||
"version": BUILD_VERSION,
|
||||
"hassio_token": HASSIO_TOKEN,
|
||||
"hassio_url": HASSIO_WS,
|
||||
"config": hass_config.get_configuration_path(),
|
||||
"tags": hass_config.get_automation_tags_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 Iterator, Union
|
||||
from typing import Any, Iterator, Union
|
||||
|
||||
from pydantic.error_wrappers import ValidationError
|
||||
|
||||
@@ -26,18 +26,27 @@ def load_automation(
|
||||
try:
|
||||
yield ExtenededAutomationData(
|
||||
metadata=AutomationMetdata.parse_obj(auto_raw),
|
||||
condition=load_conditions(auto_raw.get("condition", [])),
|
||||
sequence=load_conditions(auto_raw.get("action", [])),
|
||||
trigger=normalize_obj(auto_raw.get("trigger", [])),
|
||||
condition=ifempty_or_null_then_list(load_conditions(auto_raw.get("condition", []))),
|
||||
sequence=ifempty_or_null_then_list(load_conditions(auto_raw.get("action", []))),
|
||||
trigger=ifempty_or_null_then_list(normalize_obj(auto_raw.get("trigger", []))),
|
||||
tags=tags,
|
||||
)
|
||||
except ValidationError as err:
|
||||
raise InvalidAutomationFile from err
|
||||
|
||||
|
||||
def ifempty_or_null_then_list(obj: Any):
|
||||
if not isinstance(obj, list):
|
||||
return []
|
||||
else:
|
||||
return obj
|
||||
|
||||
|
||||
def load_conditions(conditions: Union[dict, list, str]):
|
||||
if isinstance(conditions, list):
|
||||
return list(map(ensure_condition_dictionary, conditions))
|
||||
elif not conditions:
|
||||
return []
|
||||
else:
|
||||
return [ensure_condition_dictionary(conditions)]
|
||||
|
||||
|
||||
@@ -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.fields import Field
|
||||
@@ -9,7 +9,7 @@ class AutomationMetdata(BaseModel):
|
||||
alias: Optional[str] = None
|
||||
description: Optional[str] = None
|
||||
trigger_variables: Optional[Dict[str, Union[str, int, bool, float]]] = None
|
||||
mode: Literal["single", "restart", "queued", "parallel"] = "single"
|
||||
mode: str = "single"
|
||||
|
||||
|
||||
class AutomationData(BaseModel):
|
||||
|
||||
@@ -4,5 +4,8 @@ from decouple import Csv, config
|
||||
|
||||
ROOT_FOLDER = Path(__file__).parent.parent.absolute()
|
||||
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")
|
||||
API_PREFIX = config("API_PREFIX", "")
|
||||
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
|
||||
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:
|
||||
@@ -14,7 +17,14 @@ def dump_yaml(obj: Any) -> str:
|
||||
str
|
||||
"""
|
||||
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)
|
||||
return stream.read()
|
||||
|
||||
@@ -28,4 +38,4 @@ def load_yaml(yaml_stream: TextIO) -> Union[dict, list]:
|
||||
Returns:
|
||||
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 ruamel.yaml.nodes import Node
|
||||
from ruamel.yaml.representer import BaseRepresenter
|
||||
from yaml.nodes import Node
|
||||
from yaml.representer import BaseRepresenter
|
||||
|
||||
|
||||
class IncludedYaml(NamedTuple):
|
||||
|
||||
@@ -811,3 +811,31 @@
|
||||
device_id: das2qdasdasdasadaasd
|
||||
default: []
|
||||
mode: single
|
||||
- id: 'baddy-1'
|
||||
alias: 'bad triggers'
|
||||
description: ''
|
||||
trigger: ""
|
||||
condition: []
|
||||
action: []
|
||||
mode: single
|
||||
- id: 'baddy-2'
|
||||
alias: 'null things'
|
||||
description: ''
|
||||
trigger:
|
||||
condition:
|
||||
action:
|
||||
mode: single
|
||||
- id: 'baddy-3'
|
||||
alias: 'big null things'
|
||||
description:
|
||||
trigger:
|
||||
condition:
|
||||
action:
|
||||
mode: single
|
||||
- id: 'bad mode'
|
||||
alias: 'bade mode'
|
||||
description: ""
|
||||
trigger: []
|
||||
condition: []
|
||||
action: []
|
||||
mode: bad
|
||||
@@ -1,7 +1,7 @@
|
||||
from unittest import TestCase
|
||||
|
||||
import yaml
|
||||
from fastapi.testclient import TestClient
|
||||
from ruamel.yaml import YAML
|
||||
|
||||
from src.api.app import make_app
|
||||
from src.automations.types import (
|
||||
@@ -24,7 +24,7 @@ class BaseTestCase(TestCase):
|
||||
|
||||
class automation_list_tests(BaseTestCase):
|
||||
|
||||
test_params = {"total": 28, "subtest2_found_items": 3, "subtest1_found_items": 10}
|
||||
test_params = {"total": 32, "subtest2_found_items": 7, "subtest1_found_items": 10}
|
||||
|
||||
def test_get_list_of_everything(self):
|
||||
data = self.client.post(
|
||||
@@ -106,25 +106,25 @@ class automation2_lists_tests(automation_list_tests):
|
||||
class automation_update_tests(BaseTestCase):
|
||||
def test_insert_new(self):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
self.assertEqual(resp.json()["totalItems"], 28)
|
||||
self.assertEqual(resp.json()["totalItems"], 32)
|
||||
resp = self.client.post(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 29,
|
||||
"index": 33,
|
||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
||||
},
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 28})
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 32})
|
||||
data = resp.json()
|
||||
self.assertEqual(data["totalItems"], 29)
|
||||
self.assertEqual(data["totalItems"], 33)
|
||||
self.assertEqual(data["data"][0]["metadata"]["id"], "testme")
|
||||
|
||||
def test_update_some(self):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 20})
|
||||
original_auto = resp.json()["data"][0]
|
||||
resp = self.client.post(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 20,
|
||||
"data": AutomationData(metadata=AutomationMetdata(id="testme")).dict(),
|
||||
@@ -143,7 +143,7 @@ class automation_update_tests(BaseTestCase):
|
||||
original_auto = resp.json()["data"][0]
|
||||
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||
resp = self.client.post(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 15,
|
||||
"data": original_auto,
|
||||
@@ -151,7 +151,7 @@ class automation_update_tests(BaseTestCase):
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
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")))
|
||||
condition = disk_data.pop("condition")
|
||||
action = list(map(dict, disk_data.pop("action")))
|
||||
@@ -194,7 +194,7 @@ class automation_update_tests(BaseTestCase):
|
||||
original_auto = resp.json()["data"][0]
|
||||
original_auto["metadata"]["alias"] = "I CHANGED!"
|
||||
resp = self.client.post(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 27,
|
||||
"data": original_auto,
|
||||
@@ -202,7 +202,7 @@ class automation_update_tests(BaseTestCase):
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
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")))
|
||||
condition = disk_data.pop("condition")
|
||||
action = list(map(dict, disk_data.pop("action")))
|
||||
@@ -324,13 +324,13 @@ class automation_update_tests(BaseTestCase):
|
||||
class automation_delete_tests(BaseTestCase):
|
||||
def test_delete_some(self):
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
self.assertEqual(resp.json()["totalItems"], 28)
|
||||
self.assertEqual(resp.json()["totalItems"], 32)
|
||||
resp = self.client.delete(
|
||||
"/automations",
|
||||
"/automations/item",
|
||||
json={
|
||||
"index": 20,
|
||||
},
|
||||
)
|
||||
self.assertEqual(resp.status_code, 200)
|
||||
resp = self.client.post("/automations/list", json={"limit": 1, "offset": 0})
|
||||
self.assertEqual(resp.json()["totalItems"], 27)
|
||||
self.assertEqual(resp.json()["totalItems"], 31)
|
||||
@@ -24,11 +24,11 @@ class manager_tests(TestCase):
|
||||
_, _, loader = get_example_automation_loader()
|
||||
self.assertIsNone(loader.get(-1))
|
||||
self.assertIsNone(loader.get(1_000))
|
||||
self.assertIsNone(loader.get(31))
|
||||
self.assertIsNone(loader.get(33))
|
||||
|
||||
def test_length(self):
|
||||
_, _, loader = get_example_automation_loader()
|
||||
self.assertEqual(loader.get_total_items(), 28)
|
||||
self.assertEqual(loader.get_total_items(), 32)
|
||||
|
||||
def test_bad_automations_file(self):
|
||||
folder, _, manager = get_dummy_automation_loader(
|
||||
@@ -51,11 +51,11 @@ class manager_tests(TestCase):
|
||||
|
||||
def test_create_automation_with_example_folder(self):
|
||||
_, _, manager = get_example_automation_loader()
|
||||
self.assertEqual(manager.get_total_items(), 28)
|
||||
manager.update(32, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
auto = manager.get(28)
|
||||
self.assertEqual(manager.get_total_items(), 32)
|
||||
manager.update(40, ExtenededAutomationData(metadata=AutomationMetdata(id="test1")))
|
||||
auto = manager.get(32)
|
||||
self.assertIsNotNone(auto)
|
||||
self.assertEqual(manager.get_total_items(), 29)
|
||||
self.assertEqual(manager.get_total_items(), 33)
|
||||
self.assertEqual(auto.metadata.id, "test1") # type: ignore
|
||||
|
||||
def test_update_automation(self):
|
||||
|
||||
@@ -1,11 +1,6 @@
|
||||
import json
|
||||
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.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):
|
||||
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):
|
||||
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):
|
||||
yaml_obj = load_yaml(
|
||||
io.StringIO(
|
||||
"""
|
||||
name: cool
|
||||
date: "10:00"
|
||||
bools:
|
||||
- "yes"
|
||||
- "no"
|
||||
- true
|
||||
- false
|
||||
bobIsNull:
|
||||
bobIsNull2: null
|
||||
google_password: !secret gpass
|
||||
sensor: !include_dir_list sensors/*yaml
|
||||
automations: !include automations.yaml
|
||||
@@ -44,6 +52,10 @@ class dumping_yamls_tests(TestCase):
|
||||
dict(yaml_obj),
|
||||
{
|
||||
"name": "cool",
|
||||
"date": "10:00",
|
||||
"bools": ["yes", "no", True, False],
|
||||
"bobIsNull": None,
|
||||
"bobIsNull2": None,
|
||||
"google_password": SecretValue("gpass", "n/a"),
|
||||
"sensor": IncludedYamlDir("include_dir_list", "sensors/*yaml"),
|
||||
"automations": IncludedYaml("automations.yaml"),
|
||||
@@ -51,8 +63,17 @@ class dumping_yamls_tests(TestCase):
|
||||
)
|
||||
self.assertEqual(
|
||||
dump_yaml(yaml_obj),
|
||||
"name: cool\n"
|
||||
"google_password: !secret gpass\n"
|
||||
"sensor: !include_dir_list sensors/*yaml\n"
|
||||
f"automations: !include automations.yaml\n",
|
||||
"""name: cool
|
||||
date: '10:00'
|
||||
bools:
|
||||
- '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
|
||||
version: 0.1.5
|
||||
version: v0.1.19
|
||||
slug: shortumation
|
||||
image: asosnovsky/shortumation-{arch}
|
||||
url: "https://github.com/asosnovsky/Shortumation"
|
||||
@@ -16,16 +16,15 @@ init: false
|
||||
ingress: true
|
||||
ingress_port: 8000
|
||||
ingress_entry: "web/"
|
||||
panel_icon: mdi:home-automation
|
||||
hassio_role: manager
|
||||
privileged:
|
||||
- SYS_RAWIO
|
||||
host_network: true
|
||||
homeassistant_api: true
|
||||
auth_api: true
|
||||
panel_icon: mdi:home-automation
|
||||
hassio_role: homeassistant
|
||||
host_network: false
|
||||
map:
|
||||
- config:rw
|
||||
options: {}
|
||||
ports:
|
||||
8000/tcp: 8000
|
||||
8000/tcp:
|
||||
ports_description:
|
||||
8000/tcp: Main port for the API & Web.
|
||||
@@ -1,9 +1,10 @@
|
||||
version: '3'
|
||||
services:
|
||||
addon:
|
||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-latest}"
|
||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:${BUILD_TAG:-edge}"
|
||||
build:
|
||||
context: "./"
|
||||
dockerfile: "./Dockerfile"
|
||||
args:
|
||||
- BUILD_ARCH=${ARCH:-amd64}
|
||||
BUILD_ARCH: ${ARCH:-amd64}
|
||||
BUILD_VERSION: ${BUILD_TAG:-edge}
|
||||
@@ -3,5 +3,8 @@ services:
|
||||
addon:
|
||||
volumes:
|
||||
- "./sample_config:/config"
|
||||
- "./api/tests:/app/tests"
|
||||
ports:
|
||||
- "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
|
||||
@@ -0,0 +1,21 @@
|
||||
version: '3'
|
||||
services:
|
||||
homeassistant:
|
||||
container_name: homeassistant
|
||||
image: "ghcr.io/home-assistant/home-assistant:stable"
|
||||
volumes:
|
||||
- config:/config
|
||||
restart: unless-stopped
|
||||
privileged: true
|
||||
network_mode: host
|
||||
|
||||
shortumation:
|
||||
# make sure to replace the ARCH with whatever system you are running!
|
||||
image: "asosnovsky/shortumation-${ARCH:-amd64}:latest"
|
||||
volumes:
|
||||
- config:/config
|
||||
ports:
|
||||
- 8081:8000
|
||||
|
||||
volumes:
|
||||
config:
|
||||
Binary file not shown.
Binary file not shown.
@@ -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:
|
||||
Type: Generic
|
||||
Type: Generic2
|
||||
1:
|
||||
Type: Generic
|
||||
2:
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
SKIP_PREFLIGHT_CHECK=true
|
||||
SKIP_PREFLIGHT_CHECK=true
|
||||
@@ -1,4 +1,7 @@
|
||||
module.exports = {
|
||||
'core': {
|
||||
builder: 'webpack5'
|
||||
},
|
||||
"stories": [
|
||||
"../src/**/*.stories.mdx",
|
||||
"../src/**/*.stories.@(js|jsx|ts|tsx)"
|
||||
@@ -8,5 +11,8 @@ module.exports = {
|
||||
"@storybook/addon-essentials",
|
||||
"@storybook/preset-create-react-app",
|
||||
"@storybook/addon-queryparams",
|
||||
]
|
||||
],
|
||||
"features": {
|
||||
"emotionAlias": false,
|
||||
},
|
||||
}
|
||||
Vendored
+6
-13
@@ -2,24 +2,17 @@
|
||||
"version": "0.2.0",
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Debug CRA Tests",
|
||||
"name": "Debug Jest Tests",
|
||||
"type": "node",
|
||||
"request": "launch",
|
||||
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/react-scripts",
|
||||
"args": [
|
||||
"test",
|
||||
"--runInBand",
|
||||
"--no-cache",
|
||||
"--watchAll=false"
|
||||
"runtimeArgs": [
|
||||
"--inspect-brk",
|
||||
"${workspaceRoot}/node_modules/.bin/jest",
|
||||
"--runInBand"
|
||||
],
|
||||
"cwd": "${workspaceRoot}",
|
||||
"protocol": "inspector",
|
||||
"console": "integratedTerminal",
|
||||
"internalConsoleOptions": "neverOpen",
|
||||
"env": {
|
||||
"CI": "true"
|
||||
},
|
||||
"disableOptimisticBPs": true
|
||||
"port": 9229
|
||||
}
|
||||
]
|
||||
}
|
||||
+32
-14
@@ -4,25 +4,38 @@
|
||||
"private": true,
|
||||
"homepage": ".",
|
||||
"dependencies": {
|
||||
"@types/jest": "^26.0.15",
|
||||
"@types/node": "^12.0.0",
|
||||
"@types/react": "^17.0.0",
|
||||
"@types/react-dom": "^17.0.0",
|
||||
"@emotion/react": "^11.9.0",
|
||||
"@emotion/styled": "^11.8.1",
|
||||
"@mui/material": "^5.8.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",
|
||||
"react": "^17.0.2",
|
||||
"react-dom": "^17.0.2",
|
||||
"notistack": "^2.0.5",
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0",
|
||||
"react-flow-renderer": "^10.1.2",
|
||||
"react-jss": "^10.8.2",
|
||||
"react-router-dom": "6",
|
||||
"react-scripts": "4.0.3",
|
||||
"react-scripts": "5.0.1",
|
||||
"superstruct": "^0.15.4",
|
||||
"theming": "^3.3.0",
|
||||
"typescript": "^4.1.2",
|
||||
"web-vitals": "^1.0.1",
|
||||
"web-vitals": "^2.1.4",
|
||||
"ws": "^8.7.0",
|
||||
"yarn": "^1.22.17"
|
||||
},
|
||||
"scripts": {
|
||||
"start": "react-scripts start",
|
||||
"build": "react-scripts build",
|
||||
"tsc": "tsc -w",
|
||||
"tsc:ci": "tsc",
|
||||
"test:ci": "react-scripts test --ci=true --all --watchAll=false",
|
||||
"test": "react-scripts test",
|
||||
"test:debug": "react-scripts --inspect-brk test --runInBand --no-cache",
|
||||
@@ -63,19 +76,24 @@
|
||||
"@storybook/addon-essentials": "^6.4.22",
|
||||
"@storybook/addon-links": "^6.4.22",
|
||||
"@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/preset-create-react-app": "^3.2.0",
|
||||
"@storybook/preset-create-react-app": "^4.1.1",
|
||||
"@storybook/react": "^6.4.22",
|
||||
"@testing-library/jest-dom": "^5.11.4",
|
||||
"@testing-library/react": "^11.1.0",
|
||||
"@testing-library/user-event": "^12.1.10",
|
||||
"@testing-library/react": "^13.3.0",
|
||||
"@testing-library/user-event": "^14.2.0",
|
||||
"@types/autosuggest-highlight": "^3.2.0",
|
||||
"@types/chroma-js": "^2.1.3",
|
||||
"@types/js-yaml": "^4.0.5",
|
||||
"jest-environment-jsdom": "^27.5.1",
|
||||
"ts-node": "^10.4.0"
|
||||
"jest-environment-jsdom": "^28.1.0",
|
||||
"ts-node": "^10.8.0",
|
||||
"webpack": "^5.72.1",
|
||||
"webpack-dev-server": "^4.9.0"
|
||||
},
|
||||
"moduleDirectories": [
|
||||
"node_modules",
|
||||
"src"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import { ErrorBoundary } from 'components/ErrorBoundary';
|
||||
|
||||
function App() {
|
||||
const api = useConnectedApiService();
|
||||
|
||||
return (
|
||||
<div className="app">
|
||||
<ErrorBoundary>
|
||||
|
||||
@@ -10,13 +10,16 @@ export const makeRemoteAPI = (baseURL: string): API => ({
|
||||
data = {}
|
||||
}) {
|
||||
try {
|
||||
const reply = await fetch(baseURL + path, {
|
||||
const payload: RequestInit = {
|
||||
method,
|
||||
headers: {
|
||||
"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>;
|
||||
if (reply.status === 200) {
|
||||
response = {
|
||||
|
||||
@@ -4,15 +4,18 @@ import { makeRemoteAPI } from "./base";
|
||||
import { useAPIService } from './core';
|
||||
import { useMockAPI } from "./mock";
|
||||
|
||||
const locationPrefixWeb = window.location.pathname.match(/(.+)\/web/i);
|
||||
console.log(process.env)
|
||||
|
||||
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"
|
||||
export const remoteAutoAPI = makeRemoteAPI(
|
||||
baseURL + "automations"
|
||||
);
|
||||
export const useConnectedApiService = () => useAPIService(
|
||||
makeAutomationAPI(makeRemoteAPI(
|
||||
process.env.NODE_ENV === 'development' ?
|
||||
"http://localhost:8000/automations" :
|
||||
(!locationPrefixWeb ? '' : locationPrefixWeb[1]) + "/automations"
|
||||
))
|
||||
makeAutomationAPI(remoteAutoAPI)
|
||||
);
|
||||
export const useMockApiService = (initialAutos: AutomationData[]) => useAPIService(
|
||||
makeAutomationAPI(useMockAPI(initialAutos))
|
||||
|
||||
@@ -15,7 +15,7 @@ export const useMockAPI = (
|
||||
method = "POST",
|
||||
data = {}
|
||||
}) {
|
||||
console.debug("[[mockCall]]", method, path, data);
|
||||
// console.debug("[[mockCall]]", method, path, data);
|
||||
if (path === AUTOMTAION_LIST) {
|
||||
return {
|
||||
ok: true,
|
||||
|
||||
@@ -7,7 +7,7 @@ export interface ListParams {
|
||||
}
|
||||
export type APIRequest<D> = {
|
||||
path: string;
|
||||
method?: "POST" | "DELETE",
|
||||
method?: "POST" | "DELETE" | "GET",
|
||||
data?: D;
|
||||
};
|
||||
|
||||
|
||||
@@ -34,6 +34,13 @@
|
||||
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 {
|
||||
font-size: 1.5em;
|
||||
}
|
||||
@@ -49,6 +56,7 @@
|
||||
|
||||
.automation-editor--info-box--tag>div {
|
||||
margin: 0;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag>div>input {
|
||||
@@ -56,29 +64,11 @@
|
||||
padding: 1em 0.25em 0.2em 0.25em;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag>button {
|
||||
height: 1.25em;
|
||||
width: 1.25em;
|
||||
.automation-editor--info-box--tag--trash, .automation-editor--info-box--tag--add {
|
||||
height: 2em;
|
||||
width: 2em;
|
||||
font-size: 1em;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag--error {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag--error.hide {
|
||||
height: 0;
|
||||
opacity: 0;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.automation-editor--info-box--tag--error.show {
|
||||
height: fit-content;
|
||||
opacity: 1;
|
||||
}
|
||||
@@ -1,19 +1,29 @@
|
||||
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { makeTagDB } from "components/AutomationList/TagDB";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
import { AutoInfoBox } from "./AutoInfoBox";
|
||||
import { defaultAutomation } from 'utils/defaults';
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList/Editor/InfoBox',
|
||||
component: AutoInfoBox,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
tagDB: makeTagDB([
|
||||
defaultAutomation("test")
|
||||
])
|
||||
}
|
||||
} as ComponentMeta<typeof AutoInfoBox>;
|
||||
|
||||
|
||||
export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
||||
const [[metadata, tags], setState] = useState([args.metadata, args.tags])
|
||||
return (
|
||||
<div className="page">
|
||||
<Page>
|
||||
<AutoInfoBox
|
||||
{...args}
|
||||
className=""
|
||||
metadata={metadata}
|
||||
tags={tags}
|
||||
@@ -22,7 +32,7 @@ export const NoTags: ComponentStory<typeof AutoInfoBox> = args => {
|
||||
setState([m, t])
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
)
|
||||
}
|
||||
NoTags.args = {
|
||||
|
||||
@@ -2,16 +2,19 @@ import "./AutoInfoBox.css";
|
||||
import { AutomationMetadata } from "types/automations";
|
||||
import { InputList } from "components/Inputs/InputList";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import InputTextArea from "components/Inputs/InputTextArea";
|
||||
import { FC, useRef, useState } from 'react';
|
||||
import { FC, ReactNode, useRef, useState } from 'react';
|
||||
import { AddIcon, TrashIcon } from "components/Icons";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import InputAutoText from "components/Inputs/InputAutoText";
|
||||
import { TagDB } from "components/AutomationList/TagDB";
|
||||
|
||||
interface Props {
|
||||
className: string;
|
||||
metadata: AutomationMetadata;
|
||||
tags: Array<[string, string]>;
|
||||
onUpdate: (m: AutomationMetadata, tags: Array<[string, string]>) => void;
|
||||
tagDB: TagDB;
|
||||
children?: ReactNode;
|
||||
}
|
||||
export const AutoInfoBox: FC<Props> = ({
|
||||
metadata,
|
||||
@@ -19,6 +22,7 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
onUpdate,
|
||||
className,
|
||||
children,
|
||||
tagDB,
|
||||
}) => {
|
||||
// state
|
||||
const [newTag, setNewTag] = useState<[string, string]>(["", ""])
|
||||
@@ -26,6 +30,7 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
const errorTimeoutId = useRef(-1);
|
||||
|
||||
// aliases
|
||||
const foundNewTagNames = tagDB.getTagNames(tags.map(([n, _]) => n));
|
||||
const setError = (index: number | 'new', msg: string) => {
|
||||
_setError([index, msg])
|
||||
if (errorTimeoutId.current >= 0) {
|
||||
@@ -69,7 +74,9 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
if (error) {
|
||||
return setError('new', error)
|
||||
}
|
||||
onUpdate(metadata, tags.concat([newTag]));
|
||||
onUpdate(metadata, tags.concat([
|
||||
newTag.map(x => x.trim()) as [string, string]
|
||||
]));
|
||||
setNewTag(['', '']);
|
||||
}
|
||||
const onRemoveTag = (tagIndex: number) => onUpdate(metadata, [
|
||||
@@ -80,8 +87,8 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
return <div className={`automation-editor--info-box ${className}`}>
|
||||
<div className="automation-editor--info-box-inner">
|
||||
<InputText label="ID" value={metadata.id} onChange={onUpdateMetadata('id')} />
|
||||
<InputText label="Name" value={metadata.alias} onChange={onUpdateMetadata('alias')} />
|
||||
<InputTextArea label="Description" value={metadata.description} onChange={onUpdateMetadata('description')} />
|
||||
<InputText label="Name" value={metadata.alias ?? ""} onChange={onUpdateMetadata('alias')} />
|
||||
<InputText multiline label="Description" value={metadata.description ?? ""} onChange={onUpdateMetadata('description')} />
|
||||
<InputList
|
||||
label="Mode"
|
||||
current={metadata.mode}
|
||||
@@ -95,22 +102,42 @@ export const AutoInfoBox: FC<Props> = ({
|
||||
/>
|
||||
<div className="automation-editor--info-box--tags">
|
||||
<h1>Tags</h1>
|
||||
{tags.map(([tagName, tagValue], tagIndex) => <div className="automation-editor--info-box--tag">
|
||||
<Button onClick={() => onRemoveTag(tagIndex)} ><TrashIcon /></Button>
|
||||
<InputText value={tagName} label="Name" onChange={v => updateTagName(v, tagIndex)} />
|
||||
<InputText value={tagValue} label="Tag" onChange={v => onUpdateTags(v, tagIndex)} />
|
||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === tagIndex) ? "show" : "hide"].join(" ")}>
|
||||
{error}
|
||||
</span>
|
||||
</div>)}
|
||||
<div className="automation-editor--info-box--tag-list">
|
||||
{tags.map(([tagName, tagValue], tagIndex) => <div key={tagIndex} className="automation-editor--info-box--tag">
|
||||
<InputAutoText
|
||||
value={tagName}
|
||||
label="Name"
|
||||
onChange={v => updateTagName(v, tagIndex)}
|
||||
options={foundNewTagNames}
|
||||
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 />
|
||||
<div className="automation-editor--info-box--tag">
|
||||
<InputText value={newTag[0]} label="Name" onChange={v => setNewTag([v, newTag[1]])} onEnter={addNewTag} />
|
||||
<InputText value={newTag[1]} label="Tag" onChange={v => setNewTag([newTag[0], v])} onEnter={addNewTag} />
|
||||
<Button onClick={addNewTag} ><AddIcon /></Button>
|
||||
<span className={["automation-editor--info-box--tag--error", (errorIndex === 'new') ? "show" : "hide"].join(" ")}>
|
||||
{error}
|
||||
</span>
|
||||
<InputAutoText
|
||||
value={newTag[0]}
|
||||
label="Name"
|
||||
onChange={v => setNewTag([v, newTag[1]])}
|
||||
options={foundNewTagNames}
|
||||
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>
|
||||
|
||||
@@ -1,10 +1,19 @@
|
||||
.automation-editor {
|
||||
display: flex;
|
||||
position: relative;
|
||||
flex-direction: row;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.automation-editor-failures {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding: 1em;
|
||||
overflow: scroll;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.automation-editor--flow-wrapper {
|
||||
flex: 1;
|
||||
padding: 0 0.5em 0 0.5em;
|
||||
@@ -66,4 +75,26 @@
|
||||
.automation-editor--info-box.hide>.automation-editor--info-box--icon {
|
||||
transform: rotate(180deg);
|
||||
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 { AutomationEditor } from './index';
|
||||
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 {
|
||||
@@ -10,21 +12,22 @@ export default {
|
||||
component: AutomationEditor,
|
||||
parameters: { actions: { argTypesRegex: '^on.*' } },
|
||||
args: {
|
||||
dims: dgconst.DEFAULT_DIMS
|
||||
dims: dgconst.DEFAULT_DIMS,
|
||||
}
|
||||
} as ComponentMeta<typeof AutomationEditor>
|
||||
|
||||
const Template: ComponentStory<typeof AutomationEditor> = args => {
|
||||
const [state, setState] = useState(args.automation)
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<AutomationEditor
|
||||
{...args}
|
||||
tagDB={makeTagDB(state ? [state] : [])}
|
||||
automation={state}
|
||||
onUpdate={s => {
|
||||
window.setTimeout(() => setState(s), 3000)
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const Loading = Template.bind({});
|
||||
@@ -111,3 +114,63 @@ EmptyStart.args = {
|
||||
sequence: []
|
||||
}
|
||||
}
|
||||
|
||||
export const BadAutomationInvalidMetadata = Template.bind({})
|
||||
BadAutomationInvalidMetadata.args = {
|
||||
...BadAutomationInvalidMetadata.args,
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
} as any,
|
||||
trigger: [
|
||||
],
|
||||
sequence: []
|
||||
}
|
||||
}
|
||||
|
||||
export const BadAutomationInvalidTriggers = Template.bind({})
|
||||
BadAutomationInvalidTriggers.args = {
|
||||
...BadAutomationInvalidTriggers.args,
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Random",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
},
|
||||
trigger: [
|
||||
"haha I am a string"
|
||||
] as any,
|
||||
sequence: []
|
||||
}
|
||||
}
|
||||
|
||||
export const BadAutomationInvalidSequence = Template.bind({})
|
||||
BadAutomationInvalidSequence.args = {
|
||||
...BadAutomationInvalidSequence.args,
|
||||
automation: {
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Bad Choose Sequence",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
},
|
||||
trigger: [],
|
||||
sequence: [
|
||||
{
|
||||
choose: {}
|
||||
}
|
||||
] as any
|
||||
}
|
||||
}
|
||||
@@ -5,19 +5,26 @@ import { AutomationData } from "types/automations";
|
||||
import { AutoInfoBox } from "./AutoInfoBox";
|
||||
import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { useAutomatioEditorState } from "./state";
|
||||
import { DAGAutomationFlow } from "components/DAGFlow";
|
||||
import { useAutomatioEditorState, EditorData } from './state';
|
||||
import { SafeDAGAutomationFlow } from "components/DAGFlow/safe";
|
||||
import { DAGAutomationFlowDims } from "components/DAGFlow/types";
|
||||
import { MiniFailure } from 'types/validators/helper';
|
||||
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 {
|
||||
automation?: AutomationData;
|
||||
dims: DAGAutomationFlowDims;
|
||||
onUpdate: (auto: AutomationData) => void;
|
||||
tagDB: TagDB;
|
||||
}
|
||||
export const AutomationEditor: FC<Props> = ({
|
||||
dims,
|
||||
automation: propsAutos,
|
||||
onUpdate: propsOnUpdate,
|
||||
tagDB,
|
||||
}) => {
|
||||
// state
|
||||
const {
|
||||
@@ -26,7 +33,9 @@ export const AutomationEditor: FC<Props> = ({
|
||||
updateTrigger,
|
||||
updateMetadata,
|
||||
updateCondition,
|
||||
validate,
|
||||
save,
|
||||
saveAndUpdate,
|
||||
} = useAutomatioEditorState(propsAutos, propsOnUpdate);
|
||||
|
||||
const [closeInfo, setCloseInfo] = useState(false);
|
||||
@@ -34,21 +43,34 @@ export const AutomationEditor: FC<Props> = ({
|
||||
// render
|
||||
if (state.status === '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>
|
||||
}
|
||||
if (state.status === 'invalid') {
|
||||
return <ValidationBox
|
||||
failures={state.failures}
|
||||
data={state.data}
|
||||
validate={validate}
|
||||
onSave={saveAndUpdate}
|
||||
/>
|
||||
}
|
||||
return <div className="automation-editor">
|
||||
{state.status === 'saving' && <LinearProgress className="linear-loader" />}
|
||||
<AutoInfoBox
|
||||
className={closeInfo ? "hide" : "show"}
|
||||
metadata={state.data.metadata}
|
||||
tags={state.data.tags}
|
||||
onUpdate={updateMetadata}
|
||||
tagDB={tagDB}
|
||||
>
|
||||
<ButtonIcon
|
||||
className="automation-editor--info-box--icon"
|
||||
onClick={() => setCloseInfo(!closeInfo)}
|
||||
title={closeInfo ? "Show Metadata" : "Hide Metadata"}
|
||||
>{ArrowIcon}</ButtonIcon>
|
||||
Icon={ArrowIcon}
|
||||
/>
|
||||
</AutoInfoBox>
|
||||
|
||||
<div className={["automation-editor--flow-wrapper", state.status].join(" ")}>
|
||||
@@ -61,7 +83,7 @@ export const AutomationEditor: FC<Props> = ({
|
||||
Save <CheckMarkIcon color="#bf4" />
|
||||
</Button>
|
||||
</div>
|
||||
<DAGAutomationFlow
|
||||
<SafeDAGAutomationFlow
|
||||
className="automation-editor--flow-wrapper--flow"
|
||||
sequence={state.data.sequence}
|
||||
trigger={state.data.trigger}
|
||||
@@ -74,3 +96,58 @@ export const AutomationEditor: FC<Props> = ({
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
export const ValidationBox: FC<{
|
||||
failures: MiniFailure[]
|
||||
validate: (d: any) => MiniFailure[] | null,
|
||||
data: EditorData,
|
||||
onSave: (d: EditorData) => void,
|
||||
}> = props => {
|
||||
|
||||
const [{ failures, data }, setState] = useState({
|
||||
failures: props.failures,
|
||||
data: props.data,
|
||||
});
|
||||
|
||||
const makeSave = <K extends keyof EditorData>(k: K) => (d: EditorData[K]) => {
|
||||
const newData = {
|
||||
...data,
|
||||
[k]: d,
|
||||
}
|
||||
const newFails = props.validate(newData);
|
||||
if (newFails) {
|
||||
setState({
|
||||
failures: newFails,
|
||||
data: newData,
|
||||
})
|
||||
} else {
|
||||
setState({
|
||||
failures: [],
|
||||
data: newData,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
return <div className="automation-editor-failures">
|
||||
<ul>
|
||||
{failures.map((f, i) => <>
|
||||
<li key={i}>
|
||||
<b>{f.path}</b>:
|
||||
<ul>
|
||||
{f.message.map((m, j) => <li key={j}>
|
||||
{m}
|
||||
</li>)}
|
||||
</ul>
|
||||
</li>
|
||||
</>)}
|
||||
</ul>
|
||||
<span>Please correct the automation file manually and then continue!</span>
|
||||
<InputYaml label="Metadata" value={data.metadata} onChange={makeSave('metadata')} />
|
||||
<InputYaml label="Tags" value={data.tags} onChange={makeSave('tags')} />
|
||||
<InputYaml label="Trigger" value={data.trigger} onChange={makeSave('trigger')} />
|
||||
<InputYaml label="Condition" value={data.condition} onChange={makeSave('condition')} />
|
||||
<InputYaml label="Actions" value={data.sequence} onChange={makeSave('sequence')} />
|
||||
<Button disabled={failures.length > 0} onClick={() => props.onSave(data)}>Save</Button>
|
||||
</div>
|
||||
}
|
||||
@@ -1,13 +1,19 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import { AutomationData, AutomationMetadata } from "types/automations";
|
||||
|
||||
import * as v from "types/validators/autmation";
|
||||
import { getFailures } from "types/validators/helper";
|
||||
import { MiniFailure } from '../../types/validators/helper';
|
||||
|
||||
export type EditorData = ReturnType<typeof genEditorData>;
|
||||
export type EditorState = {
|
||||
status: 'unchanged' | 'changed',
|
||||
status: 'unchanged' | 'changed' | 'saving',
|
||||
data: EditorData
|
||||
} | {
|
||||
status: 'loading'
|
||||
} | {
|
||||
status: 'invalid',
|
||||
failures: MiniFailure[],
|
||||
data: EditorData,
|
||||
}
|
||||
export type EditorStatus = EditorState['status'];
|
||||
|
||||
@@ -20,7 +26,7 @@ export const useAutomatioEditorState = (
|
||||
});
|
||||
const makeUpdate = <K extends keyof EditorData, D extends EditorData[K]>(name: K) => (
|
||||
data: D
|
||||
) => state.status !== 'loading' && update({
|
||||
) => ((state.status === 'changed') || (state.status === 'unchanged')) && update({
|
||||
status: 'changed',
|
||||
data: {
|
||||
...state.data,
|
||||
@@ -28,21 +34,47 @@ export const useAutomatioEditorState = (
|
||||
}
|
||||
})
|
||||
|
||||
const saveAndUpdate = (data: EditorData) => {
|
||||
const cleanData = {
|
||||
...data,
|
||||
tags: data.tags.reduce((all, [tagName, tagValue]) => ({
|
||||
...all,
|
||||
[tagName.trim()]: tagValue.trim(),
|
||||
}), {})
|
||||
};
|
||||
update({
|
||||
status: "saving",
|
||||
data,
|
||||
})
|
||||
onSave(cleanData);
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (automation) {
|
||||
update({
|
||||
status: 'unchanged',
|
||||
data: genEditorData(automation),
|
||||
})
|
||||
const failures = getFailures(automation, v.AutomationData);
|
||||
if (failures) {
|
||||
update({
|
||||
status: 'invalid',
|
||||
failures,
|
||||
data: genEditorData(automation),
|
||||
})
|
||||
} else {
|
||||
update({
|
||||
status: 'unchanged',
|
||||
data: genEditorData(automation),
|
||||
})
|
||||
}
|
||||
}
|
||||
}, [automation]);
|
||||
|
||||
return {
|
||||
validate: (data: any) => getFailures(data, v.AutomationData),
|
||||
updateTrigger: makeUpdate('trigger'),
|
||||
updateSequence: makeUpdate('sequence'),
|
||||
updateCondition: makeUpdate('condition'),
|
||||
saveAndUpdate,
|
||||
updateMetadata: (metadata: AutomationMetadata, tags: Array<[string, string]>) => {
|
||||
if (state.status !== 'loading') {
|
||||
if ((state.status === 'changed') || (state.status === 'unchanged')) {
|
||||
update({
|
||||
status: 'changed',
|
||||
data: {
|
||||
@@ -55,17 +87,7 @@ export const useAutomatioEditorState = (
|
||||
},
|
||||
save: () => {
|
||||
if (state.status !== 'loading') {
|
||||
const data = {
|
||||
...state.data,
|
||||
tags: state.data.tags.reduce((all, [tagName, tagValue]) => ({
|
||||
...all,
|
||||
[tagName]: tagValue,
|
||||
}), {})
|
||||
};
|
||||
update({
|
||||
status: "loading",
|
||||
})
|
||||
onSave(data);
|
||||
saveAndUpdate(state.data)
|
||||
}
|
||||
},
|
||||
get state() {
|
||||
|
||||
@@ -2,8 +2,9 @@ import "styles/root.css";
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { AutomationList } from ".";
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
import * as dgconst from 'components/DAGSvgs/constants';
|
||||
import { bigMockAutoList } from "utils/mocks";
|
||||
import * as dgconst from 'components/DAGFlow/constants';
|
||||
import { Page } from "components/Page";
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList',
|
||||
@@ -17,7 +18,7 @@ export default {
|
||||
|
||||
const Template: ComponentStory<typeof AutomationList> = args => {
|
||||
const [autos, setAutos] = useState(args.automations)
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<AutomationList {...args} automations={autos}
|
||||
onAdd={a => {
|
||||
args.onAdd(a);
|
||||
@@ -39,7 +40,7 @@ const Template: ComponentStory<typeof AutomationList> = args => {
|
||||
]);
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const EmptyStart = Template.bind({})
|
||||
@@ -51,16 +52,129 @@ EmptyStart.args = {
|
||||
export const FewAutos = Template.bind({})
|
||||
FewAutos.args = {
|
||||
...FewAutos.args,
|
||||
automations: bigMockAutoList,
|
||||
}
|
||||
|
||||
|
||||
|
||||
export const BadAutmations = Template.bind({})
|
||||
BadAutmations.args = {
|
||||
...BadAutmations.args,
|
||||
automations: [
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Lights", "NewDevice": "Yes", "Remote": "No", "Floor": "1" }),
|
||||
createMockAuto({ "Room": "Bathroom", "Type": "Climate" }),
|
||||
createMockAuto({ "Room": "Living Room", "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Climate" }),
|
||||
createMockAuto({ "Type": "Lights", "Routine": "Myself" }),
|
||||
createMockAuto({ "Routine": "DNS", "Type": "SSL" }),
|
||||
createMockAuto({ "Room": "Bedroom", "Type": "Lights", "Routine": "Baby" }),
|
||||
createMockAuto({ "Room": "Office", "Type": "Lights" }),
|
||||
createMockAuto({ "Room": "Office" }),
|
||||
createMockAuto(),
|
||||
{
|
||||
"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: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "Bad Choose Sequence",
|
||||
alias: "Bad Choose",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
},
|
||||
trigger: [],
|
||||
sequence: [
|
||||
{
|
||||
choose: {}
|
||||
}
|
||||
] as any
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
id: "random",
|
||||
alias: "Bad Trigger",
|
||||
description: "Example Metadata",
|
||||
trigger_variables: {
|
||||
'wowo': '!'
|
||||
},
|
||||
mode: 'single',
|
||||
},
|
||||
trigger: [
|
||||
"haha I am a string"
|
||||
] as any,
|
||||
sequence: []
|
||||
},
|
||||
{
|
||||
condition: [],
|
||||
tags: {},
|
||||
metadata: {
|
||||
} as any,
|
||||
trigger: [
|
||||
],
|
||||
sequence: []
|
||||
}
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
export const FewAutosWithSlowLoader: ComponentStory<typeof AutomationList> = args => {
|
||||
const [autos, setAutos] = useState(args.automations)
|
||||
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 {
|
||||
overflow: auto;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
height: 100%;
|
||||
flex: 1;
|
||||
user-select: none;
|
||||
@@ -24,7 +25,15 @@
|
||||
padding-bottom: 0.5em;
|
||||
border-width: 1px;
|
||||
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 {
|
||||
@@ -40,7 +49,8 @@
|
||||
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);
|
||||
color: var(--secondary);
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { AutomationListBox } from "./AutomationListBox";
|
||||
import { createMockAuto } from "utils/mocks";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
export default {
|
||||
title: 'App/AutomationList/Box',
|
||||
@@ -14,12 +15,12 @@ export default {
|
||||
|
||||
const Template: ComponentStory<typeof AutomationListBox> = args => {
|
||||
const [selected, setSelected] = useState(args.selected)
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<AutomationListBox {...args} automations={args.automations} selected={selected} onSelectAutomation={(i) => {
|
||||
setSelected(i)
|
||||
args.onSelectAutomation(i)
|
||||
}} />
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const EmptyStart = Template.bind({})
|
||||
|
||||
@@ -1,88 +1,18 @@
|
||||
import { groupAutomations, getTagList } from './AutomationListBox';
|
||||
import { AutomationData } from 'types/automations/index';
|
||||
import { getTagList } from './AutomationListBox';
|
||||
import { createMockAuto } from 'utils/mocks';
|
||||
|
||||
test('group automations', () => {
|
||||
const automations: AutomationData[] = [
|
||||
{
|
||||
condition: [],
|
||||
metadata: {
|
||||
id: '1',
|
||||
alias: '',
|
||||
description: '',
|
||||
mode: 'single',
|
||||
},
|
||||
tags: {
|
||||
"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
|
||||
])
|
||||
});
|
||||
|
||||
// const makeDummy = (id: string, tags: Record<string, string>) => ({
|
||||
// condition: [],
|
||||
// metadata: {
|
||||
// id,
|
||||
// alias: '',
|
||||
// description: '',
|
||||
// mode: 'single',
|
||||
// },
|
||||
// tags,
|
||||
// sequence: [],
|
||||
// trigger: [],
|
||||
// })
|
||||
|
||||
test('getTagList', () => {
|
||||
expect(getTagList([
|
||||
|
||||
@@ -4,7 +4,8 @@ import { AutomationData } from "types/automations";
|
||||
import InputMultiSelect from "components/Inputs/InputMultiSelect";
|
||||
import InputText from "components/Inputs/InputText";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
import { TrashIcon } from "components/Icons";
|
||||
import { makeGrouping } from "./automationGrouper";
|
||||
import { AutomationListBoxGroup } from "./AutomationListBoxGroup";
|
||||
|
||||
|
||||
export type Props = {
|
||||
@@ -27,7 +28,11 @@ export const AutomationListBox: FC<Props> = ({
|
||||
const [searchText, setSearchText] = useState('');
|
||||
const [selectedTagIdx, setSelectedTagIdx] = useState<number[]>([]);
|
||||
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">
|
||||
<div className="automation-list-box--nav">
|
||||
@@ -45,7 +50,15 @@ export const AutomationListBox: FC<Props> = ({
|
||||
/>
|
||||
</div>
|
||||
<div className="automation-list-box--body">
|
||||
{convertGroupsToItems(groups, filteredAutomations, onSelectAutomation, onRemove, selected)}
|
||||
<AutomationListBoxGroup
|
||||
events={{
|
||||
onSelectAutomation,
|
||||
onRemove
|
||||
}}
|
||||
autos={filteredAutomations}
|
||||
grouping={grouping}
|
||||
selectedAutomationIdx={selected}
|
||||
/>
|
||||
</div>
|
||||
<div className="automation-list-box--bottom">
|
||||
<Button onClick={onAdd}>Add</Button>
|
||||
@@ -65,127 +78,18 @@ export const getTagList = (autos: AutomationData[]): string[] => Object.keys(aut
|
||||
}, {}))
|
||||
|
||||
const filterAutomations = (autos: AutomationData[], searchText: string, selected: number[], tags: string[]): Array<[AutomationData, number]> => autos.map<[AutomationData, number]>((a, i) => [a, i]).filter(([a, i]) => {
|
||||
if (!a.metadata) {
|
||||
return true
|
||||
}
|
||||
if (searchText.length > 0) {
|
||||
if (
|
||||
!(
|
||||
a.metadata.description.toLocaleLowerCase().includes(searchText) ||
|
||||
a.metadata.alias.toLocaleLowerCase().includes(searchText)
|
||||
(a.metadata.description ?? "").toLocaleLowerCase().includes(searchText) ||
|
||||
(a.metadata.alias ?? "").toLocaleLowerCase().includes(searchText)
|
||||
)
|
||||
) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
if (selected.length > 0) {
|
||||
for (const i of selected) {
|
||||
if (!a.tags[tags[i]]) {
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
return true
|
||||
})
|
||||
|
||||
|
||||
export const groupAutomations = (
|
||||
autos: AutomationData[],
|
||||
selected: number[],
|
||||
tags: string[],
|
||||
) => {
|
||||
if (selected.length === 0) {
|
||||
return autos.map((_, i) => i);
|
||||
}
|
||||
const out: any = {};
|
||||
for (let ai = 0; ai < autos.length; ai++) {
|
||||
const a = autos[ai];
|
||||
let where = out;
|
||||
let tag: string = '';
|
||||
let lastKey: string | null = null;
|
||||
for (const i of selected) {
|
||||
tag = tags[i];
|
||||
if (lastKey !== null) {
|
||||
where = where[lastKey]
|
||||
}
|
||||
if (!where[a.tags[tag]]) {
|
||||
where[a.tags[tag]] = {}
|
||||
}
|
||||
lastKey = a.tags[tag]
|
||||
}
|
||||
if (lastKey !== null) {
|
||||
if (!where[lastKey] || !Array.isArray(where[lastKey])) {
|
||||
where[lastKey] = []
|
||||
}
|
||||
where[lastKey].push(ai)
|
||||
}
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
const convertGroupsToItems = (
|
||||
groups: any,
|
||||
autos: Array<[AutomationData, number]>,
|
||||
onSelectAutomation: (i: number) => void,
|
||||
onRemove: (i: number) => void,
|
||||
selected: number,
|
||||
) => {
|
||||
if (Array.isArray(groups)) {
|
||||
return groups.map(i => {
|
||||
const [auto, autoIndex] = autos[i];
|
||||
return <div
|
||||
key={i}
|
||||
className={["automation-list-box--body--item", selected === autoIndex ? 'selected' : ''].join(' ')}
|
||||
title={`Name = ${auto.metadata.alias}\nID = ${auto.metadata.id}\nDescription = ${auto.metadata.description}`}
|
||||
onClick={() => onSelectAutomation(autoIndex)}
|
||||
>
|
||||
<div
|
||||
className="automation-list-box--body--item--title"
|
||||
>
|
||||
<b>{auto.metadata.alias.slice(0, 15)} <span>({auto.metadata.id.slice(0, 5)})</span></b>
|
||||
<span>{auto.metadata.description.slice(0, 25)}</span>
|
||||
<div
|
||||
className="automation-list-box--body--item--tags"
|
||||
>
|
||||
{Object.keys(auto.tags).map(tagName => <span key={tagName}>
|
||||
<b>{tagName}:</b> {auto.tags[tagName]}
|
||||
</span>)}
|
||||
</div>
|
||||
</div>
|
||||
<Button onClick={() => onRemove(autoIndex)}><TrashIcon /></Button>
|
||||
</div>
|
||||
})
|
||||
} else {
|
||||
return Object.keys(groups).map(groupName => {
|
||||
return <AutomationListBoxGroup
|
||||
key={groupName}
|
||||
groupName={groupName}
|
||||
groups={groups[groupName]}
|
||||
autos={autos}
|
||||
onSelectAutomation={onSelectAutomation}
|
||||
onRemove={onRemove}
|
||||
selected={selected}
|
||||
/>
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
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 { createMockAuto } from "utils/mocks";
|
||||
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 {
|
||||
title: 'App/AutomationList/Connected',
|
||||
@@ -17,12 +18,12 @@ export default {
|
||||
|
||||
const Template: ComponentStory<any> = args => {
|
||||
const api = useMockApiService(args.initialAutomations);
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ConnectedAutomationList
|
||||
{...args}
|
||||
api={api}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const EmptyStart = Template.bind({})
|
||||
@@ -44,3 +45,20 @@ FewAutos.args = {
|
||||
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;
|
||||
}
|
||||
|
||||
/* 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 */
|
||||
.automation-list--list.hide>.automation-list-box {
|
||||
width: 0;
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
/* none-hidden */
|
||||
.automation-list--root.mobile {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile>.automation-list--list {
|
||||
max-width: 100vw;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor {
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-list--list-hide {
|
||||
transform: rotate(90deg);
|
||||
left: 1.25em;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box {
|
||||
min-width: 100vw;
|
||||
min-height: calc(100vh - 5em);
|
||||
max-width: 100vw;
|
||||
max-height: calc(100vh - 5em);
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box-inner {
|
||||
margin-top: 2.5em;
|
||||
padding-left: 0.5em;
|
||||
padding-right: 0.5em;
|
||||
margin-bottom: 2em;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box--icon {
|
||||
left: 1.25em;
|
||||
bottom: 0em;
|
||||
background-color: var(--primary);
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
|
||||
|
||||
/* list hide */
|
||||
.automation-list--root.mobile .automation-list--list.hide {
|
||||
width: 100vw;
|
||||
min-height: 0;
|
||||
max-height: 0;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-list--list.hide .automation-list--list-hide {
|
||||
transform: rotate(270deg);
|
||||
position: fixed;
|
||||
top: 0.75em;
|
||||
z-index: 20;
|
||||
}
|
||||
|
||||
/* info box hide */
|
||||
.automation-list--root.mobile .automation-editor--info-box.hide {
|
||||
width: 100vw;
|
||||
min-height: 0;
|
||||
max-height: 0;
|
||||
}
|
||||
|
||||
.automation-list--root.mobile .automation-editor--info-box.hide .automation-editor--info-box--icon {
|
||||
transform: rotate(270deg);
|
||||
position: fixed;
|
||||
top: 0.75em;
|
||||
background-color: var(--green-opaque);
|
||||
z-index: 30;
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import "./index.css";
|
||||
import "./index.mobile.css";
|
||||
import { AutomationEditor } from "components/AutomationEditor";
|
||||
import { FC, useState } from "react";
|
||||
import { FC, ReactNode, useState } from "react";
|
||||
import { AutomationData } from "types/automations";
|
||||
import { defaultAutomation } from 'utils/defaults';
|
||||
import { ArrowIcon } from "components/Icons";
|
||||
@@ -8,6 +9,10 @@ import { ButtonIcon } from "components/Icons/ButtonIcons";
|
||||
import { ApiService } from "apiService/core";
|
||||
import { AutomationListBox } from "./AutomationListBox";
|
||||
import { DAGAutomationFlowDims } from 'components/DAGFlow/types';
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
import { makeTagDB } from "./TagDB";
|
||||
import LinearProgress from "@mui/material/LinearProgress";
|
||||
import CircularProgress from "@mui/material/CircularProgress";
|
||||
|
||||
|
||||
interface AutomationListParams {
|
||||
@@ -16,6 +21,7 @@ interface AutomationListParams {
|
||||
onAdd: (auto: AutomationData) => void;
|
||||
onRemove: (i: number) => void;
|
||||
dims: DAGAutomationFlowDims;
|
||||
children?: ReactNode;
|
||||
}
|
||||
|
||||
export const AutomationList: FC<AutomationListParams> = ({
|
||||
@@ -29,34 +35,43 @@ export const AutomationList: FC<AutomationListParams> = ({
|
||||
// state
|
||||
const [hideList, setHideList] = useState(false);
|
||||
const [current, setCurrent] = useState(0);
|
||||
const { isMobile } = useWindowSize();
|
||||
// alias
|
||||
const currentAuto = automations.length > 0 ? automations[current] : null;
|
||||
const automationListListCls = "automation-list--list" + (hideList ? " hide" : " show")
|
||||
const tagDB = makeTagDB(automations);
|
||||
// render
|
||||
return <div className="automation-list--root">
|
||||
<div className={automationListListCls}>
|
||||
return <div className={["automation-list--root", isMobile ? 'mobile' : ''].join(' ')}>
|
||||
<div className={["automation-list--list", hideList ? "hide" : "show"].join(' ')}>
|
||||
<AutomationListBox
|
||||
automations={automations}
|
||||
onAdd={() => {
|
||||
onAdd(defaultAutomation(`shortu-${automations.length}`));
|
||||
onAdd(defaultAutomation(String(Date.now())));
|
||||
setCurrent(automations.length)
|
||||
}}
|
||||
onSelectAutomation={setCurrent}
|
||||
onSelectAutomation={i => {
|
||||
setCurrent(i);
|
||||
if (isMobile) {
|
||||
setHideList(true)
|
||||
}
|
||||
}}
|
||||
selected={current}
|
||||
onRemove={onRemove}
|
||||
/>
|
||||
<ButtonIcon
|
||||
onClick={() => setHideList(!hideList)}
|
||||
className="automation-list--list-hide"
|
||||
>
|
||||
{ArrowIcon}
|
||||
</ButtonIcon>
|
||||
Icon={ArrowIcon}
|
||||
/>
|
||||
</div>
|
||||
<div className="automation-list--viewer">
|
||||
{currentAuto ? <AutomationEditor
|
||||
automation={currentAuto}
|
||||
onUpdate={a => onUpdate(current, a)}
|
||||
dims={dims}
|
||||
dims={{
|
||||
...dims,
|
||||
flipped: isMobile
|
||||
}}
|
||||
tagDB={tagDB}
|
||||
/> : <></>}
|
||||
</div>
|
||||
{children}
|
||||
@@ -78,7 +93,12 @@ export const ConnectedAutomationList: FC<ConnectedAutomationListParams> = ({
|
||||
dims
|
||||
}) => {
|
||||
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) {
|
||||
return <span>Error {automations.error}</span>
|
||||
|
||||
@@ -2,6 +2,7 @@ import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { useState } from "react";
|
||||
import { ConditionEditor } from ".";
|
||||
import { AutomationCondition } from 'types/automations/conditions';
|
||||
import { Page } from "components/Page";
|
||||
|
||||
export default {
|
||||
title: 'ConditionEditor',
|
||||
@@ -40,12 +41,12 @@ export const Basic: ComponentStory<typeof ConditionEditor> = args => {
|
||||
]
|
||||
})
|
||||
return (
|
||||
<div className="page">
|
||||
<Page>
|
||||
<ConditionEditor
|
||||
onUpdate={setState}
|
||||
onDelete={() => { }}
|
||||
condition={state}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
)
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import InputYaml from "components/Inputs/InputYaml";
|
||||
import { getEditor } from "./editorRender";
|
||||
import { useStyles } from "./style";
|
||||
import { getViewer } from "./viewRender";
|
||||
import useWindowSize from "utils/useWindowSize";
|
||||
|
||||
|
||||
|
||||
@@ -31,6 +32,7 @@ export const ConditionNode: FC<{
|
||||
// state
|
||||
const [internalDisplayMode, setInternalDisplayMode] = useState(displayMode);
|
||||
const [yamlMode, setYamlMode] = useState(false);
|
||||
const { isMobile } = useWindowSize();
|
||||
// alias
|
||||
const effectiveDM = internalDisplayMode || yamlMode;
|
||||
// effect
|
||||
@@ -76,53 +78,56 @@ export const ConditionNode: FC<{
|
||||
} else if (condition.condition === 'or') {
|
||||
hasChildren = true
|
||||
}
|
||||
const { classes } = useStyles({ hasChildren });
|
||||
const { classes } = useStyles({ hasChildren, isMobile });
|
||||
|
||||
// components
|
||||
const DeleteButton = (p: { onClick?: () => void, isRoot?: boolean }) =>
|
||||
<button className={p.isRoot ? classes.deleteBtnRoot : classes.deleteBtn} onClick={p?.onClick}>X</button>
|
||||
|
||||
return <div className={classes.root}>
|
||||
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
||||
<div className={classes.title}>
|
||||
<InputList
|
||||
label=""
|
||||
className={classes.titleText}
|
||||
current={condition.condition}
|
||||
options={[
|
||||
'or', 'not', 'and',
|
||||
'template',
|
||||
'numeric_state',
|
||||
'state',
|
||||
'time',
|
||||
'trigger',
|
||||
'zone',
|
||||
]}
|
||||
onChange={(n: any) => onUpdate({
|
||||
...getConditionDefaultValues(n),
|
||||
...condition,
|
||||
condition: n,
|
||||
} as any)}
|
||||
/>
|
||||
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
||||
{yamlMode ? 'visual' : 'yaml'}
|
||||
</button>}
|
||||
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
||||
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
||||
</button>}
|
||||
</div>
|
||||
<div className={classes.children}>
|
||||
{yamlMode && <InputYaml
|
||||
label=""
|
||||
value={condition}
|
||||
onChange={update => onUpdate(update as any)}
|
||||
resizable
|
||||
/>}
|
||||
{!yamlMode && childrenConditions}
|
||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
||||
</div>}
|
||||
</div>
|
||||
{children({ classes })}
|
||||
<>
|
||||
{(showDelete && !effectiveDM) && <DeleteButton isRoot onClick={() => onDelete('root')} />}
|
||||
<div className={classes.title}>
|
||||
<InputList
|
||||
label=""
|
||||
className={classes.titleText}
|
||||
current={condition.condition}
|
||||
options={[
|
||||
'or', 'not', 'and',
|
||||
'template',
|
||||
'numeric_state',
|
||||
'state',
|
||||
'time',
|
||||
'trigger',
|
||||
'zone',
|
||||
]}
|
||||
onChange={(n: any) => onUpdate({
|
||||
...getConditionDefaultValues(n),
|
||||
...condition,
|
||||
condition: n,
|
||||
} as any)}
|
||||
/>
|
||||
{effectiveDM && <button className={classes.yamlBtn} onClick={() => setYamlMode(!yamlMode)}>
|
||||
{yamlMode ? 'visual' : 'yaml'}
|
||||
</button>}
|
||||
{!yamlMode && <button className={classes.modifyBtn} onClick={() => setInternalDisplayMode(!effectiveDM)}>
|
||||
{effectiveDM ? <PencilIcon className={classes.icon} /> : <CheckMarkIcon className={classes.icon} />}
|
||||
</button>}
|
||||
</div>
|
||||
<div className={classes.children}>
|
||||
{yamlMode && <InputYaml
|
||||
label=""
|
||||
value={condition}
|
||||
onChange={update => onUpdate(update as any)}
|
||||
/>}
|
||||
<div className={classes.conditionWrap}>
|
||||
{!yamlMode && childrenConditions}
|
||||
</div>
|
||||
{!yamlMode && hasChildren && <div className={classes.addBtnContainer}>
|
||||
<button className={classes.addBtn} onClick={() => onAddChild()}>Add</button>
|
||||
</div>}
|
||||
</div>
|
||||
{children({ classes })}
|
||||
</>
|
||||
</div>
|
||||
}
|
||||
@@ -1,13 +1,12 @@
|
||||
import { FC } from "react";
|
||||
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 InputText from "components/Inputs/InputText";
|
||||
import InputTextArea from "components/Inputs/InputTextArea";
|
||||
import { InputEntity } from "components/Inputs/InputTextBubble";
|
||||
import { InputEntity } from "components/Inputs/InputEntities";
|
||||
import { ConditionNode } from "./ConditionNode";
|
||||
import { genUpdateMethods } from "./nestedUpdater";
|
||||
import InputTime from "components/Inputs/InputTime";
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
|
||||
|
||||
interface Editor<C extends AutomationCondition> extends FC<{
|
||||
@@ -45,16 +44,12 @@ export const TemplateEditor: Editor<TemplateCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
<InputTextArea label="Template" value={condition.value_template} onChange={value_template => onChange({
|
||||
return <>
|
||||
<InputYaml label="Template" value={condition.value_template} onChange={value_template => onChange({
|
||||
...condition,
|
||||
value_template
|
||||
})} resizable />
|
||||
</div>
|
||||
})} />
|
||||
</>
|
||||
}
|
||||
|
||||
|
||||
@@ -62,13 +57,10 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputEntity
|
||||
value={condition.entity_id}
|
||||
multiple
|
||||
onChange={entity_id => onChange({
|
||||
...condition,
|
||||
entity_id
|
||||
@@ -94,11 +86,11 @@ export const NumericStateEditor: Editor<NumericCondition> = ({
|
||||
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,
|
||||
value_template
|
||||
})} resizable />
|
||||
</div>
|
||||
})} />
|
||||
</>
|
||||
}
|
||||
|
||||
|
||||
@@ -126,13 +118,10 @@ export const StateEditor: Editor<StateCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputEntity
|
||||
value={condition.entity_id}
|
||||
multiple
|
||||
onChange={entity_id => onChange({
|
||||
...condition,
|
||||
entity_id
|
||||
@@ -158,18 +147,14 @@ export const StateEditor: Editor<StateCondition> = ({
|
||||
for: _for,
|
||||
})}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
|
||||
export const TimeEditor: Editor<TimeCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputTime
|
||||
label="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}
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
|
||||
export const TriggerEditor: Editor<TriggerCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputText label="Trigger ID" value={condition.id} onChange={id => onChange({
|
||||
...condition,
|
||||
id
|
||||
})} />
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
|
||||
export const ZoneEditor: Editor<ZoneCondition> = ({
|
||||
onChange,
|
||||
condition,
|
||||
}) => {
|
||||
return <div>
|
||||
<InputText label="Alias" value={condition.alias ?? getDescriptionFromAutomationNode(condition)} onChange={alias => onChange({
|
||||
...condition,
|
||||
alias
|
||||
})} />
|
||||
return <>
|
||||
<InputText label="Zone" value={condition.zone} onChange={zone => onChange({
|
||||
...condition,
|
||||
zone
|
||||
})} />
|
||||
<InputEntity
|
||||
value={condition.entity_id}
|
||||
multiple
|
||||
onChange={entity_id => onChange({
|
||||
...condition,
|
||||
entity_id
|
||||
@@ -234,5 +212,5 @@ export const ZoneEditor: Editor<ZoneCondition> = ({
|
||||
state,
|
||||
})}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { ComponentMeta, ComponentStory } from "@storybook/react";
|
||||
import { Page } from "components/Page";
|
||||
import { useState } from "react";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
|
||||
@@ -14,14 +15,14 @@ export default {
|
||||
const Template: ComponentStory<typeof ConditionEditor> = ({ condition, ...args }) => {
|
||||
|
||||
const [data, setData] = useState(condition);
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ConditionEditor {...args}
|
||||
condition={data}
|
||||
onUpdate={data => {
|
||||
setData(data)
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const TemplateViewer = Template.bind({})
|
||||
|
||||
@@ -2,7 +2,8 @@ import { Styles } from "jss";
|
||||
import { createAppUseStyles } from "styles/theme";
|
||||
|
||||
export const useStyles = createAppUseStyles<{
|
||||
hasChildren: boolean
|
||||
hasChildren: boolean,
|
||||
isMobile: boolean,
|
||||
}>(theme => {
|
||||
const deleteBtn: Styles = {
|
||||
borderRadius: '10px',
|
||||
@@ -20,12 +21,12 @@ export const useStyles = createAppUseStyles<{
|
||||
}
|
||||
}
|
||||
return {
|
||||
root: ({ hasChildren }) => ({
|
||||
root: ({ hasChildren, isMobile }) => ({
|
||||
background: theme.primary,
|
||||
padding: 0,
|
||||
position: 'relative',
|
||||
display: 'flex',
|
||||
flexDirection: hasChildren ? 'column' : 'row',
|
||||
flexDirection: isMobile ? 'column' : hasChildren ? 'column' : 'row',
|
||||
}),
|
||||
title: ({ hasChildren }) => ({
|
||||
display: 'flex',
|
||||
@@ -42,8 +43,8 @@ export const useStyles = createAppUseStyles<{
|
||||
borderTopRightRadius: 0,
|
||||
borderBottomRightRadius: 0,
|
||||
borderBottomLeftRadius: hasChildren ? 0 : 10,
|
||||
padding: 10,
|
||||
minWidth: 30,
|
||||
minWidth: '10em',
|
||||
maxWidth: '30em',
|
||||
textOverflow: 'ellipsis',
|
||||
textAlign: 'center',
|
||||
cursor: 'pointer',
|
||||
@@ -86,6 +87,9 @@ export const useStyles = createAppUseStyles<{
|
||||
}),
|
||||
icon: {},
|
||||
deleteBtn,
|
||||
conditionWrap: {
|
||||
overflow: 'auto',
|
||||
},
|
||||
children: ({ hasChildren }) => ({
|
||||
flex: 1,
|
||||
paddingLeft: hasChildren ? 50 : 10,
|
||||
@@ -96,7 +100,8 @@ export const useStyles = createAppUseStyles<{
|
||||
border: `1px solid ${theme.secondaryAccent}`,
|
||||
borderBottomRightRadius: hasChildren ? 10 : 0,
|
||||
borderBottomLeftRadius: hasChildren ? 10 : 0,
|
||||
minHeight: hasChildren ? undefined : '100%'
|
||||
minHeight: hasChildren ? undefined : '100%',
|
||||
overflow: 'scroll'
|
||||
}),
|
||||
addBtnContainer: {
|
||||
display: 'flex',
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { FC } from "react";
|
||||
import { AddIcon, PencilIcon, TrashIcon } from '../Icons/index';
|
||||
import { AddIcon, TrashIcon } from '../Icons/index';
|
||||
import { useCircleStyles } from './styles';
|
||||
import { Handle, Position, XYPosition } from 'react-flow-renderer';
|
||||
|
||||
@@ -12,6 +12,7 @@ export interface DAGCircleProps {
|
||||
backgroundColor?: string;
|
||||
disableSource?: boolean;
|
||||
disableTarget?: boolean;
|
||||
flipped: boolean;
|
||||
}
|
||||
export const makeFlowCircle = (
|
||||
circleId: string,
|
||||
@@ -32,6 +33,7 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
|
||||
backgroundColor,
|
||||
disableSource = false,
|
||||
disableTarget = false,
|
||||
flipped,
|
||||
}
|
||||
}) => {
|
||||
const { classes } = useCircleStyles({
|
||||
@@ -41,8 +43,8 @@ export const DAGCircle: FC<{ data: DAGCircleProps }> = ({
|
||||
backgroundColor,
|
||||
});
|
||||
return <>
|
||||
{!disableSource && <Handle type="source" position={Position.Right} />}
|
||||
{!disableTarget && <Handle type="target" position={Position.Left} />}
|
||||
{!disableSource && <Handle type="source" position={flipped ? Position.Bottom : Position.Right} />}
|
||||
{!disableTarget && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
|
||||
<div className={classes.root}>
|
||||
{
|
||||
onAdd ?
|
||||
|
||||
@@ -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;
|
||||
flipped: boolean;
|
||||
hasInput?: boolean;
|
||||
error?: any,
|
||||
onEdit: () => void;
|
||||
}
|
||||
export const DAGErrorNode: FC<DAGErrorNodeProps> = ({
|
||||
height, width, hasInput, error, onEdit, flipped
|
||||
}) => {
|
||||
// render
|
||||
return <>
|
||||
{hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
|
||||
<Handle type="source" position={flipped ? Position.Bottom : 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>
|
||||
}
|
||||
@@ -14,18 +14,18 @@ export interface DAGNodeProps {
|
||||
label: string;
|
||||
hasInput?: boolean;
|
||||
accentBackground?: boolean;
|
||||
flipped: boolean;
|
||||
}
|
||||
export const DAGNode: FC<{ data: DAGNodeProps }> = ({
|
||||
data: {
|
||||
label,
|
||||
height,
|
||||
width,
|
||||
onXClick,
|
||||
onEditClick = () => { },
|
||||
color,
|
||||
hasInput = false,
|
||||
accentBackground = false,
|
||||
},
|
||||
export const DAGNode: FC<DAGNodeProps> = ({
|
||||
label,
|
||||
height,
|
||||
width,
|
||||
onXClick,
|
||||
onEditClick = () => { },
|
||||
color,
|
||||
hasInput = false,
|
||||
accentBackground = false,
|
||||
flipped,
|
||||
}) => {
|
||||
const { classes, theme } = useNodeStyles({
|
||||
color,
|
||||
@@ -34,8 +34,8 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
|
||||
accentBackground,
|
||||
});
|
||||
return <>
|
||||
{hasInput && <Handle type="target" position={Position.Left} />}
|
||||
<Handle type="source" position={Position.Right} />
|
||||
{hasInput && <Handle type="target" position={flipped ? Position.Top : Position.Left} />}
|
||||
<Handle type="source" position={flipped ? Position.Bottom : Position.Right} />
|
||||
<div className={classes.root}>
|
||||
<div className={classes.inner}>
|
||||
<div className={classes.leftEdge} onClick={onXClick}>
|
||||
@@ -46,9 +46,7 @@ export const DAGNode: FC<{ data: DAGNodeProps }> = ({
|
||||
{label}
|
||||
</span>
|
||||
</div>
|
||||
<div className={classes.rightEdge} onClick={() => {
|
||||
console.log('editing me', label, onEditClick, onEditClick())
|
||||
}}>
|
||||
<div className={classes.rightEdge} onClick={onEditClick}>
|
||||
<button className={classes.buttonEdit}>
|
||||
<PencilIcon size={1.1} color={theme.green} />
|
||||
</button>
|
||||
|
||||
+1
@@ -19,4 +19,5 @@ export const DEFAULT_DIMS = {
|
||||
x: PADDING,
|
||||
y: PADDING,
|
||||
},
|
||||
flipped: false,
|
||||
} as DAGAutomationFlowDims
|
||||
@@ -1,19 +1,22 @@
|
||||
import { makeFlowCircle } from "./DAGCircle"
|
||||
import { DAGAutomationFlowDims, FlowData } from "./types"
|
||||
import { XYPosition } from 'react-flow-renderer';
|
||||
import { DAGCircleProps, makeFlowCircle } from "./DAGCircle"
|
||||
import { DAGAutomationFlowDims } from "./types"
|
||||
import { Node, XYPosition } from 'react-flow-renderer';
|
||||
import { DAGNodeProps } from "./DAGNode";
|
||||
|
||||
export const makeAddButton = (
|
||||
id: string,
|
||||
position: XYPosition,
|
||||
{
|
||||
circleSize,
|
||||
flipped,
|
||||
}: DAGAutomationFlowDims,
|
||||
onAdd: () => void,
|
||||
disableTarget: boolean = true,
|
||||
) => makeFlowCircle(
|
||||
): Node<DAGCircleProps> => makeFlowCircle(
|
||||
id,
|
||||
position,
|
||||
{
|
||||
flipped,
|
||||
size: circleSize,
|
||||
onAdd,
|
||||
disableSource: true,
|
||||
@@ -25,22 +28,17 @@ export const makeConditionPoint = (
|
||||
id: string,
|
||||
position: XYPosition,
|
||||
{
|
||||
padding,
|
||||
conditionWidth,
|
||||
conditionHeight,
|
||||
nodeWidth,
|
||||
nodeHeight,
|
||||
circleSize,
|
||||
distanceFactor,
|
||||
flipped,
|
||||
}: DAGAutomationFlowDims,
|
||||
totalConditions: number,
|
||||
onEditClick: () => void,
|
||||
) => ({
|
||||
): Node<DAGNodeProps> => ({
|
||||
id,
|
||||
type: 'dagnode',
|
||||
position,
|
||||
data: {
|
||||
size: circleSize,
|
||||
color: 'lblue',
|
||||
accentBackground: true,
|
||||
label: `${totalConditions} Condition${totalConditions !== 1 ? 's' : ''}`,
|
||||
@@ -48,5 +46,6 @@ export const makeConditionPoint = (
|
||||
width: conditionWidth,
|
||||
hasInput: true,
|
||||
onEditClick,
|
||||
flipped,
|
||||
}
|
||||
})
|
||||
@@ -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 { DAGAutomationFlow } from '.';
|
||||
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 {
|
||||
@@ -22,18 +23,17 @@ const Template: ComponentStory<typeof DAGAutomationFlow> = args => {
|
||||
sequence: args.sequence,
|
||||
condition: args.condition,
|
||||
})
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<DAGAutomationFlow
|
||||
{...args}
|
||||
{...state}
|
||||
onTriggerUpdate={trigger => {
|
||||
console.log({ trigger })
|
||||
setState({ ...state, trigger })
|
||||
}}
|
||||
onSequenceUpdate={sequence => setState({ ...state, sequence })}
|
||||
onConditionUpdate={condition => setState({ ...state, condition })}
|
||||
/>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const Simple = Template.bind({})
|
||||
@@ -92,7 +92,10 @@ Complex.args = {
|
||||
{
|
||||
"platform": "homeassistant",
|
||||
"event": "start",
|
||||
}
|
||||
},
|
||||
{
|
||||
"bad": "node"
|
||||
} as any
|
||||
],
|
||||
sequence: [
|
||||
{
|
||||
@@ -120,6 +123,9 @@ Complex.args = {
|
||||
"media_content_type": "SPOTIFY"
|
||||
}
|
||||
},
|
||||
{
|
||||
"alias": "Bad Node",
|
||||
},
|
||||
{
|
||||
"choose": [
|
||||
{
|
||||
@@ -211,3 +217,47 @@ EmptyStart.args = {
|
||||
trigger: [],
|
||||
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
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
export const ComplexFlipped = Complex.bind({})
|
||||
|
||||
ComplexFlipped.args = {
|
||||
...Complex.args,
|
||||
dims: {
|
||||
...dgconst.DEFAULT_DIMS,
|
||||
...Complex.args.dims,
|
||||
flipped: true,
|
||||
}
|
||||
}
|
||||
|
||||
export const SimpleFlipped = Simple.bind({})
|
||||
|
||||
SimpleFlipped.args = {
|
||||
...Simple.args,
|
||||
dims: {
|
||||
...dgconst.DEFAULT_DIMS,
|
||||
...Complex.args.dims,
|
||||
flipped: true,
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import { FC, useState } from "react";
|
||||
|
||||
import ReactFlow, { MiniMap, Controls } from 'react-flow-renderer';
|
||||
import ReactFlow, { Controls } from 'react-flow-renderer';
|
||||
import { AutomationSequenceNode } from "types/automations";
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { triggerToFlow } from "./triggerConvertor";
|
||||
@@ -14,13 +14,27 @@ import { MultiNodeEditor } from "components/MultiNodeEditors";
|
||||
import { Modal } from "components/Modal";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { makeConditionPoint } from "./flowDataMods";
|
||||
import { convertToFlowNode } from "./helpers";
|
||||
import { DAGErrorNode } from "./DAGErrorNode";
|
||||
|
||||
const nodeTypes = {
|
||||
'dagnode': DAGNode,
|
||||
'dagnode': convertToFlowNode(DAGNode),
|
||||
'errornode': convertToFlowNode(DAGErrorNode),
|
||||
'dagcircle': DAGCircle,
|
||||
}
|
||||
|
||||
interface Props {
|
||||
const makeOnEditAutomationConditions = (
|
||||
conditions: AutomationCondition[],
|
||||
updateConditions: (c: AutomationCondition[]) => void,
|
||||
openModal: UpdateModalState,
|
||||
) => () => openModal({
|
||||
single: false,
|
||||
node: conditions,
|
||||
allowedTypes: ['condition'],
|
||||
update: c => updateConditions(c as any),
|
||||
})
|
||||
|
||||
export interface DAGAutomationFlowProps {
|
||||
className?: string;
|
||||
trigger: AutomationTrigger[];
|
||||
condition: AutomationCondition[];
|
||||
@@ -31,7 +45,7 @@ interface Props {
|
||||
onConditionUpdate: (s: AutomationCondition[]) => void;
|
||||
}
|
||||
|
||||
export const DAGAutomationFlow: FC<Props> = ({
|
||||
export const DAGAutomationFlow: FC<DAGAutomationFlowProps> = ({
|
||||
className,
|
||||
trigger,
|
||||
condition,
|
||||
@@ -46,12 +60,17 @@ export const DAGAutomationFlow: FC<Props> = ({
|
||||
|
||||
// modal
|
||||
let modalBody = <></>
|
||||
console.log(modalState)
|
||||
if (modalState) {
|
||||
if (modalState.single) {
|
||||
modalBody = <NodeEditor
|
||||
node={modalState.node}
|
||||
isErrored={modalState.isError}
|
||||
onClose={() => setModalState(null)}
|
||||
onSave={n => { modalState.update(n as any); setModalState(null); }}
|
||||
onSave={n => {
|
||||
modalState.update(n as any);
|
||||
setModalState(null);
|
||||
}}
|
||||
allowedTypes={modalState.allowedTypes}
|
||||
saveBtnCreateText={modalState.saveBtnCreateText}
|
||||
/>
|
||||
@@ -66,7 +85,11 @@ export const DAGAutomationFlow: FC<Props> = ({
|
||||
}
|
||||
|
||||
// convert automation to flow data
|
||||
const condPoint = makeConditionPoint('c', {
|
||||
const condPoint = makeConditionPoint(
|
||||
'c', dims.flipped ? {
|
||||
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor,
|
||||
x: dims.padding.x + dims.nodeWidth * 0.25
|
||||
} : {
|
||||
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor,
|
||||
y: dims.padding.y + dims.nodeHeight * 0.25
|
||||
}, dims, condition.length, makeOnEditAutomationConditions(
|
||||
@@ -105,14 +128,16 @@ export const DAGAutomationFlow: FC<Props> = ({
|
||||
sequence,
|
||||
condPoint.id,
|
||||
{
|
||||
...dims, padding: {
|
||||
...dims, padding: dims.flipped ? {
|
||||
y: condPoint.position.y - dims.nodeHeight - dims.conditionHeight,
|
||||
x: dims.padding.x,
|
||||
} : {
|
||||
x: condPoint.position.x - dims.nodeWidth - dims.conditionWidth,
|
||||
y: dims.padding.y,
|
||||
}
|
||||
},
|
||||
makeSequenceUpdater(sequence, onSequenceUpdate, setModalState),
|
||||
);
|
||||
|
||||
// render
|
||||
return <>
|
||||
<Modal open={!!modalState}>
|
||||
@@ -127,19 +152,7 @@ export const DAGAutomationFlow: FC<Props> = ({
|
||||
nodesDraggable={false}
|
||||
{...flowData}
|
||||
>
|
||||
<MiniMap />
|
||||
<Controls />
|
||||
</ReactFlow>
|
||||
</>;
|
||||
}
|
||||
|
||||
const makeOnEditAutomationConditions = (
|
||||
conditions: AutomationCondition[],
|
||||
updateConditions: (c: AutomationCondition[]) => void,
|
||||
openModal: UpdateModalState,
|
||||
) => () => openModal({
|
||||
single: false,
|
||||
node: conditions,
|
||||
allowedTypes: ['condition'],
|
||||
update: c => updateConditions(c as any),
|
||||
})
|
||||
@@ -0,0 +1,4 @@
|
||||
.dag-flow-safe {
|
||||
height: 100%;
|
||||
overflow: scroll;
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
import "./safe.css";
|
||||
import { Component, ErrorInfo } from "react";
|
||||
import { DAGAutomationFlow, DAGAutomationFlowProps } from ".";
|
||||
import { AutomationSequenceNode } from "types/automations";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import InputYaml from "components/Inputs/InputYaml";
|
||||
import { Button } from "components/Inputs/Button";
|
||||
|
||||
type GoodState = {
|
||||
hasError: false;
|
||||
}
|
||||
type FailedStateData = {
|
||||
sequence: AutomationSequenceNode[],
|
||||
condition: AutomationCondition[],
|
||||
trigger: AutomationTrigger[],
|
||||
}
|
||||
type FailedState = {
|
||||
hasError: true,
|
||||
error: any,
|
||||
errorInfo?: ErrorInfo,
|
||||
} & FailedStateData
|
||||
type State = GoodState | FailedState
|
||||
export class SafeDAGAutomationFlow extends Component<DAGAutomationFlowProps, State> {
|
||||
|
||||
state: State = {
|
||||
hasError: false
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: ErrorInfo) {
|
||||
this.setState({
|
||||
hasError: true,
|
||||
error,
|
||||
errorInfo,
|
||||
sequence: this.props.sequence,
|
||||
condition: this.props.condition,
|
||||
trigger: this.props.trigger,
|
||||
})
|
||||
}
|
||||
|
||||
render() {
|
||||
if (this.state.hasError) {
|
||||
const makeSet = <K extends keyof FailedStateData>(k: K) => (d: FailedStateData[K]) => this.setState({
|
||||
...this.state,
|
||||
[k]: d,
|
||||
});
|
||||
const makeSave = <K extends keyof FailedStateData>(k: K) => () => {
|
||||
if (!this.state.hasError) {
|
||||
return
|
||||
}
|
||||
if (k === 'condition') {
|
||||
this.props.onConditionUpdate(this.state.condition)
|
||||
} else if (k === 'sequence') {
|
||||
this.props.onSequenceUpdate(this.state.sequence)
|
||||
} else if (k === 'trigger') {
|
||||
this.props.onTriggerUpdate(this.state.trigger)
|
||||
}
|
||||
}
|
||||
return <div className="dag-flow-safe">
|
||||
<h1>An Error has occured.</h1>
|
||||
|
||||
<h1>Failed to Open Autmation!</h1>
|
||||
Something is likely not configured in your automation properly.
|
||||
<hr />
|
||||
<h2>Error:</h2>
|
||||
<h2>{String(this.state.error)}</h2>
|
||||
<br />
|
||||
{JSON.stringify(this.state.error, null, 4)}
|
||||
{this.state.errorInfo && this.state.errorInfo.componentStack.split('\n').map((s, i) => <>
|
||||
<span key={i}>{s}</span><br key={`br-${i}`} />
|
||||
</>)}
|
||||
<h2>Automation YAML</h2>
|
||||
<InputYaml label="Trigger" value={this.state.trigger} onChange={makeSet('trigger')} />
|
||||
<Button onClick={makeSave('trigger')}>Save Triggers</Button>
|
||||
<InputYaml label="Condition" value={this.state.condition} onChange={makeSet('condition')} />
|
||||
<Button onClick={makeSave('condition')}>Save Conditions</Button>
|
||||
<InputYaml label="Action" value={this.state.sequence} onChange={makeSet('sequence')} />
|
||||
<Button onClick={makeSave('sequence')}>Save Actions</Button>
|
||||
</div>
|
||||
}
|
||||
|
||||
return <DAGAutomationFlow {...this.props} />;
|
||||
}
|
||||
}
|
||||
@@ -25,12 +25,18 @@ export const sequenceToFlow = (
|
||||
const nodeId = `${prefix}n-${i}`;
|
||||
let position: XYPosition;
|
||||
if (lasPos) {
|
||||
position = {
|
||||
position = dims.flipped ? {
|
||||
y: lasPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||
x: dims.padding.x
|
||||
} : {
|
||||
x: lasPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||
y: dims.padding.y
|
||||
}
|
||||
} else {
|
||||
position = {
|
||||
position = dims.flipped ? {
|
||||
y: dims.padding.y + dims.nodeHeight * dims.distanceFactor * (i + 2),
|
||||
x: dims.padding.x
|
||||
} : {
|
||||
x: dims.padding.x + dims.nodeWidth * dims.distanceFactor * (i + 2),
|
||||
y: dims.padding.y
|
||||
};
|
||||
@@ -38,7 +44,14 @@ export const sequenceToFlow = (
|
||||
// draw node
|
||||
if (getNodeType(node) === 'action') {
|
||||
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 {
|
||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||
@@ -56,10 +69,18 @@ export const sequenceToFlow = (
|
||||
lastPointId = nodeId;
|
||||
lasPos = position;
|
||||
}
|
||||
|
||||
// add button
|
||||
const addCircle = makeAddButton(
|
||||
`${prefix}-+`,
|
||||
{
|
||||
dims.flipped ? {
|
||||
y: (
|
||||
lasPos === null ?
|
||||
dims.padding.y + dims.nodeHeight * dims.distanceFactor * (sequence.length + 1) :
|
||||
lasPos.y
|
||||
) + dims.nodeHeight * dims.distanceFactor,
|
||||
x: dims.padding.x + dims.circleSize * 1.5
|
||||
} : {
|
||||
x: (
|
||||
lasPos === null ?
|
||||
dims.padding.x + dims.nodeWidth * dims.distanceFactor * (sequence.length + 1) :
|
||||
@@ -96,6 +117,7 @@ const addSingleNode = (
|
||||
position: XYPosition,
|
||||
nodeId: string,
|
||||
{
|
||||
flipped,
|
||||
nodeHeight,
|
||||
nodeWidth,
|
||||
}: DAGAutomationFlowDims,
|
||||
@@ -112,15 +134,39 @@ const addSingleNode = (
|
||||
width: nodeWidth,
|
||||
color: getNodeType(node) === 'action' ? 'green' : 'blue',
|
||||
hasInput: true,
|
||||
flipped,
|
||||
...opts,
|
||||
},
|
||||
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 = (
|
||||
flowData: FlowData,
|
||||
node: ChooseAction,
|
||||
position: XYPosition,
|
||||
nodeId: string,
|
||||
@@ -128,6 +174,10 @@ const addChooseNode = (
|
||||
updater: SequenceUpdater,
|
||||
i: number,
|
||||
) => {
|
||||
const flowData: FlowData = {
|
||||
nodes: [],
|
||||
edges: [],
|
||||
};
|
||||
addSingleNode(flowData, node, position, nodeId, dims, {
|
||||
onEditClick: updater.makeOnModalOpenForNode(i, node),
|
||||
onXClick: () => updater.removeNode(i),
|
||||
@@ -137,10 +187,14 @@ const addChooseNode = (
|
||||
node.choose.forEach(({ sequence, conditions }, j) => {
|
||||
const sequenceId = `${nodeId}.${j}`;
|
||||
// edit/delete circle
|
||||
const circle = makeFlowCircle(`${sequenceId}>delete`, {
|
||||
const circle = makeFlowCircle(`${sequenceId}>delete`, dims.flipped ? {
|
||||
y: position.y + dims.nodeHeight * dims.distanceFactor,
|
||||
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||
} : {
|
||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||
}, {
|
||||
flipped: dims.flipped,
|
||||
size: dims.circleSize,
|
||||
onRemove: createOnRemoveForChooseNode(
|
||||
node,
|
||||
@@ -152,7 +206,10 @@ const addChooseNode = (
|
||||
addEdge(flowData, nodeId, circle.id, true)
|
||||
const condNode = makeConditionPoint(
|
||||
`${sequenceId}>cond`,
|
||||
{
|
||||
dims.flipped ? {
|
||||
y: circle.position.y + dims.circleSize * dims.distanceFactor,
|
||||
x: circle.position.x - dims.circleSize,
|
||||
} : {
|
||||
x: circle.position.x + dims.circleSize * dims.distanceFactor,
|
||||
y: circle.position.y + dims.circleSize / 8,
|
||||
},
|
||||
@@ -166,7 +223,10 @@ const addChooseNode = (
|
||||
// actual sub sequence
|
||||
const lastPoint = sequenceToFlow(flowData, sequence, condNode.id, {
|
||||
...dims,
|
||||
padding: {
|
||||
padding: dims.flipped ? {
|
||||
y: condNode.position.y - dims.nodeHeight * dims.distanceFactor,
|
||||
x: condNode.position.x - dims.conditionHeight / 2,
|
||||
} : {
|
||||
x: condNode.position.x - (dims.nodeWidth + dims.conditionWidth),
|
||||
y: condNode.position.y - dims.conditionHeight / 2,
|
||||
},
|
||||
@@ -174,7 +234,13 @@ const addChooseNode = (
|
||||
if (lastPoint.position) {
|
||||
lastPos = xyApply(lastPos, lastPoint.position, Math.max)
|
||||
} else {
|
||||
lastPos = xyApply(lastPos, { x: lastPos.x, y: lastPos.y + dims.nodeHeight * dims.distanceFactor }, Math.max)
|
||||
lastPos = xyApply(lastPos, dims.flipped ? {
|
||||
y: lastPos.y,
|
||||
x: lastPos.x + dims.nodeWidth * dims.distanceFactor
|
||||
} : {
|
||||
x: lastPos.x,
|
||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor
|
||||
}, Math.max)
|
||||
}
|
||||
})
|
||||
const totalChildren = node.choose.length;
|
||||
@@ -182,7 +248,10 @@ const addChooseNode = (
|
||||
// add button
|
||||
const addCirlce = makeAddButton(
|
||||
`${nodeId}>add`,
|
||||
{
|
||||
dims.flipped ? {
|
||||
y: position.y + dims.nodeHeight * dims.distanceFactor,
|
||||
x: lastPos.x + dims.nodeWidth * dims.distanceFactor,
|
||||
} : {
|
||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor,
|
||||
},
|
||||
@@ -203,15 +272,21 @@ const addChooseNode = (
|
||||
addEdge(flowData, nodeId, addCirlce.id, true)
|
||||
|
||||
// else
|
||||
const elseCircle = makeFlowCircle(`${nodeId}>else`, {
|
||||
const elseCircle = makeFlowCircle(`${nodeId}>else`, dims.flipped ? {
|
||||
y: position.y + dims.nodeHeight * dims.distanceFactor,
|
||||
x: lastPos.x + dims.nodeWidth * dims.distanceFactor * 2,
|
||||
} : {
|
||||
x: position.x + dims.nodeWidth * dims.distanceFactor,
|
||||
y: lastPos.y + dims.nodeHeight * dims.distanceFactor * 2,
|
||||
}, { size: dims.circleSize })
|
||||
}, { size: dims.circleSize, flipped: dims.flipped })
|
||||
flowData.nodes.push(elseCircle)
|
||||
addEdge(flowData, nodeId, elseCircle.id, true)
|
||||
const lastPoint = sequenceToFlow(flowData, node.default, elseCircle.id, {
|
||||
const lastPoint = sequenceToFlow(flowData, node.default ?? [], elseCircle.id, {
|
||||
...dims,
|
||||
padding: {
|
||||
padding: dims.flipped ? {
|
||||
y: position.y,
|
||||
x: elseCircle.position.x - 1.4 * dims.circleSize,
|
||||
} : {
|
||||
x: position.x - dims.nodeWidth,
|
||||
y: elseCircle.position.y - dims.circleSize / 4,
|
||||
},
|
||||
@@ -221,5 +296,11 @@ const addChooseNode = (
|
||||
} else {
|
||||
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',
|
||||
overflow: "hidden",
|
||||
whiteSpace: "break-spaces",
|
||||
lineBreak: "anywhere",
|
||||
cursor: 'default',
|
||||
},
|
||||
buttonDelete: {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { DAGAutomationFlowDims, FlowData, TriggerMakerOptions } from './types';
|
||||
import { makeFlowCircle } from './DAGCircle';
|
||||
import { makeAddButton } from './flowDataMods';
|
||||
import { getDescriptionFromAutomationNode } from 'utils/formatting';
|
||||
|
||||
export const triggerToFlow = (
|
||||
flowData: FlowData,
|
||||
@@ -14,9 +14,11 @@ export const triggerToFlow = (
|
||||
distanceFactor,
|
||||
nodeHeight,
|
||||
nodeWidth,
|
||||
circleSize,
|
||||
padding,
|
||||
conditionHeight,
|
||||
conditionWidth,
|
||||
circleSize,
|
||||
flipped,
|
||||
} = dims;
|
||||
// convert all triggers to dag nodes
|
||||
trigger.forEach((t, i) => {
|
||||
@@ -25,14 +27,21 @@ export const triggerToFlow = (
|
||||
id: flowId,
|
||||
type: 'dagnode',
|
||||
data: {
|
||||
label: t.alias ?? t.platform,
|
||||
label: getDescriptionFromAutomationNode(t),
|
||||
height: nodeHeight,
|
||||
width: nodeWidth,
|
||||
flipped,
|
||||
color: 'red',
|
||||
onEditClick: () => opts.onEdit(i),
|
||||
onXClick: () => opts.onDelete(i),
|
||||
},
|
||||
position: { x: padding.x, y: padding.y + nodeHeight * distanceFactor * i }
|
||||
position: flipped ? {
|
||||
y: padding.y,
|
||||
x: padding.x + nodeWidth * distanceFactor * i
|
||||
} : {
|
||||
x: padding.x,
|
||||
y: padding.y + nodeHeight * distanceFactor * i
|
||||
}
|
||||
})
|
||||
flowData.edges.push({
|
||||
id: `e(${flowId})-(${toPoint})`,
|
||||
@@ -44,7 +53,10 @@ export const triggerToFlow = (
|
||||
// create a 'add button'
|
||||
flowData.nodes.push(makeAddButton(
|
||||
'trigger-add',
|
||||
{
|
||||
flipped ? {
|
||||
y: padding.y + circleSize / 4,
|
||||
x: padding.x + nodeWidth * distanceFactor * trigger.length,
|
||||
} : {
|
||||
x: padding.x + nodeWidth * 0.4,
|
||||
y: padding.y + conditionHeight / 2 + nodeHeight * distanceFactor * trigger.length,
|
||||
},
|
||||
|
||||
@@ -4,6 +4,7 @@ import { DAGCircleProps } from './DAGCircle';
|
||||
import { DAGNodeProps } from './DAGNode';
|
||||
import { AutomationTrigger } from 'types/automations/triggers';
|
||||
import { MultiNodeEditorProps } from 'components/MultiNodeEditors/types';
|
||||
import { DAGErrorNodeProps } from './DAGErrorNode';
|
||||
|
||||
|
||||
export type DAGAutomationFlowDims = {
|
||||
@@ -14,9 +15,10 @@ export type DAGAutomationFlowDims = {
|
||||
conditionHeight: number;
|
||||
circleSize: number;
|
||||
distanceFactor: number;
|
||||
flipped: boolean;
|
||||
}
|
||||
|
||||
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | any>;
|
||||
export type DAGAutomationFlowNode = Node<DAGNodeProps | DAGCircleProps | DAGErrorNodeProps | any>;
|
||||
export type FlowData = {
|
||||
nodes: DAGAutomationFlowNode[],
|
||||
edges: Edge[],
|
||||
@@ -34,6 +36,7 @@ export type UpdateModalState<T extends AutomationSequenceNode | AutomationTrigge
|
||||
|
||||
export type ModalState<T extends AutomationSequenceNode | AutomationTrigger = any> = {
|
||||
single: true,
|
||||
isError?: boolean,
|
||||
node: T
|
||||
update: (n: T) => void;
|
||||
saveBtnCreateText?: boolean;
|
||||
|
||||
@@ -11,7 +11,6 @@ const mockSequenceUpdater = (defaultState: AutomationSequenceNode[] = []) => {
|
||||
state,
|
||||
s => {
|
||||
state = s
|
||||
console.log(state, s)
|
||||
},
|
||||
ms => modalStates.push(ms)
|
||||
);
|
||||
@@ -41,8 +40,8 @@ test("sequence updater updates nodes", () => {
|
||||
mock.updater.updateNode(0, {
|
||||
...mock.state[0],
|
||||
alias: "Hello"
|
||||
})
|
||||
expect(mock.state[0].alias).toBe("Hello")
|
||||
} as any)
|
||||
expect((mock.state[0] as any).alias).toBe("Hello")
|
||||
})
|
||||
test('update conditions for node', () => {
|
||||
const mock = mockSequenceUpdater([
|
||||
|
||||
@@ -2,6 +2,7 @@ import { AutomationSequenceNode } from "types/automations";
|
||||
import { ChooseAction } from "types/automations/actions";
|
||||
import { AutomationCondition } from "types/automations/conditions";
|
||||
import { UpdateModalState } from "./types";
|
||||
import { getNodeType } from '../../utils/automations';
|
||||
|
||||
export type SequenceUpdater = ReturnType<typeof makeSequenceUpdater>;
|
||||
|
||||
@@ -26,19 +27,23 @@ export const makeSequenceUpdater = (
|
||||
choose: [],
|
||||
default: [],
|
||||
},
|
||||
update: n => onChange([
|
||||
...sequence,
|
||||
n,
|
||||
]),
|
||||
update: n => {
|
||||
onChange([
|
||||
...sequence,
|
||||
n,
|
||||
])
|
||||
},
|
||||
allowedTypes: ['action', 'condition']
|
||||
})
|
||||
},
|
||||
updateNode(i: number, node: AutomationSequenceNode) {
|
||||
return onChange([
|
||||
...sequence.slice(0, i),
|
||||
node,
|
||||
...sequence.slice(i + 1),
|
||||
])
|
||||
if (JSON.stringify(node) !== JSON.stringify(sequence[i])) {
|
||||
return onChange([
|
||||
...sequence.slice(0, i),
|
||||
node,
|
||||
...sequence.slice(i + 1),
|
||||
])
|
||||
}
|
||||
},
|
||||
updateChooseActionData(i: number, data: ChooseAction) {
|
||||
const node = sequence[i] as ChooseAction;
|
||||
@@ -68,7 +73,7 @@ export const makeSequenceUpdater = (
|
||||
)
|
||||
} else {
|
||||
return makeSequenceUpdater(
|
||||
node.default,
|
||||
node.default ?? [],
|
||||
seq => this.updateNode(i, {
|
||||
...node,
|
||||
default: seq
|
||||
@@ -114,6 +119,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 { ComponentMeta, ComponentStory } from '@storybook/react';
|
||||
import { ErrorBoundary } from ".";
|
||||
import { Page } from "components/Page";
|
||||
|
||||
|
||||
export default {
|
||||
@@ -15,20 +16,20 @@ export const ErrorThrown: ComponentStory<typeof ErrorBoundary> = args => {
|
||||
const BadComponent: FC = () => {
|
||||
throw new Error("!!!")
|
||||
}
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ErrorBoundary>
|
||||
<BadComponent />
|
||||
</ErrorBoundary>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
|
||||
export const NoError: ComponentStory<typeof ErrorBoundary> = args => {
|
||||
const GoodComponent: FC = () => {
|
||||
return <span>All Good.</span>
|
||||
}
|
||||
return <div className="page">
|
||||
return <Page>
|
||||
<ErrorBoundary>
|
||||
<GoodComponent />
|
||||
</ErrorBoundary>
|
||||
</div>
|
||||
</Page>
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
import "./index.css";
|
||||
import { Component, ErrorInfo } from "react";
|
||||
import { Component, ErrorInfo, ReactNode } from "react";
|
||||
|
||||
type State = {
|
||||
hasError: false;
|
||||
@@ -8,7 +8,9 @@ type State = {
|
||||
error: any,
|
||||
errorInfo?: ErrorInfo,
|
||||
}
|
||||
export class ErrorBoundary extends Component<{}, State> {
|
||||
export class ErrorBoundary extends Component<{
|
||||
children: ReactNode
|
||||
}, State> {
|
||||
|
||||
state: State = {
|
||||
hasError: false
|
||||
@@ -39,6 +41,8 @@ export class ErrorBoundary extends Component<{}, State> {
|
||||
</div>
|
||||
}
|
||||
|
||||
return this.props.children;
|
||||
return <>
|
||||
{this.props.children}
|
||||
</>;
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import { createAppUseStyles } from 'styles/theme';
|
||||
export interface ButtonIconStyleProps {
|
||||
}
|
||||
export interface ButtonIconProps extends IconBaseProps, ButtonIconStyleProps {
|
||||
children: FC<IconBaseProps>;
|
||||
Icon: FC<IconBaseProps>;
|
||||
}
|
||||
const useButtonIconStyles = createAppUseStyles(theme => ({
|
||||
buttonIcon: {
|
||||
@@ -22,9 +22,9 @@ const useButtonIconStyles = createAppUseStyles(theme => ({
|
||||
|
||||
|
||||
export const ButtonIcon: FC<ButtonIconProps> = ({
|
||||
children: Child,
|
||||
Icon,
|
||||
className,
|
||||
...props
|
||||
}) => <Child
|
||||
}) => <Icon
|
||||
className={`${useButtonIconStyles({}).classes.buttonIcon} ${className}`} {...props}
|
||||
/>
|
||||
Loaded 100 of 202 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user