Compare commits

...
6 Commits
Author SHA1 Message Date
ari 7333f9e159 added manual build 2022-05-17 22:15:06 -04:00
ari 809095f8e0 added edge tag 2022-05-17 22:14:38 -04:00
ari 8942693a32 added a manual build 2022-05-17 22:13:57 -04:00
ari db49ed02ed updated tsc 2022-05-17 22:10:08 -04:00
ari cce2e03053 fixed up trigger issues 2022-05-17 22:03:22 -04:00
ari 4509a224a9 minor style patch 2022-05-17 21:51:20 -04:00
7 changed files with 243 additions and 4 deletions

No files matched your search

+34
View File
@@ -0,0 +1,34 @@
name: Manual Build
env:
MONITORED_FILES: "apparmor.txt build.yaml config.yaml Dockerfile data rootfs"
on:
workflow_dispatch:
version:
type: string
jobs:
build:
runs-on: ubuntu-latest
name: Build & Publish ${{ 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 }} \
--additional-tag edge \
--target .
+5 -1
View File
@@ -1,6 +1,10 @@
# Changelog
## [0.1.7] - Support for Malformed Automations
## [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
+1 -1
View File
@@ -1,5 +1,5 @@
name: Shortumation
version: 0.1.7
version: 0.1.9
slug: shortumation
image: asosnovsky/shortumation-{arch}
url: "https://github.com/asosnovsky/Shortumation"
@@ -9,6 +9,8 @@
display: flex;
flex-direction: column;
padding: 1em;
overflow: scroll;
height: 100%;
}
.automation-editor--flow-wrapper {
@@ -62,6 +62,198 @@ FewAutos.args = {
createMockAuto({ "Room": "Office", "Type": "Lights" }),
createMockAuto({ "Room": "Office" }),
createMockAuto(),
{
"metadata": {
"id": "1649947692702",
"alias": "Bed Remote",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_on",
"id": "turn_on"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "turn_off",
"id": "turn_off"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_up",
"id": "dim_up"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_short_press",
"subtype": "dim_down",
"id": "dim_down"
},
{
"device_id": "asdasdasdas",
"domain": "zha",
"platform": "device",
"type": "remote_button_double_press",
"subtype": "turn_on",
"id": "up_dbclk"
}
],
"condition": [],
"sequence": [
{
"choose": [
{
"conditions": [
{
"condition": "trigger",
"id": "turn_off"
}
],
"sequence": [
{
"type": "turn_off",
"device_id": "asdasdasdasdas",
"entity_id": "light.bulb_ari_lamp",
"domain": "light"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "turn_on"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 153,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_up"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_increase"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "dim_down"
}
],
"sequence": [
{
"device_id": "asdasdasdasdas",
"domain": "light",
"entity_id": "light.bulb_ari_lamp",
"type": "brightness_decrease"
}
]
},
{
"conditions": [
{
"condition": "trigger",
"id": "up_dbclk"
}
],
"sequence": [
{
"service": "light.turn_on",
"data": {
"color_temp": 500,
"brightness_pct": 100
},
"target": {
"device_id": "asdasdasdasdas"
}
}
]
}
],
"default": []
}
],
"tags": {
"Type": "Remote",
"Room": "Bedroom"
}
},
{
"metadata": {
"id": "1641617168123",
"alias": "Ensure On",
"description": "",
"trigger_variables": null,
"mode": "single"
},
"trigger": [
{
"platform": "device",
"type": "turned_off",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"platform": "device",
"type": "turned_off",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"condition": [],
"sequence": [
{
"type": "turn_on",
"device_id": "tasdasdasdasdasdasda",
"entity_id": "switch.power_washer",
"domain": "switch"
},
{
"type": "turn_on",
"device_id": "dasdasdasdasdas",
"entity_id": "switch.plug_living_room_tv",
"domain": "switch"
}
],
"tags": {}
}
],
}
@@ -11,6 +11,7 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
"type": "",
"subtype": "",
"device_id": "",
"entity_id": "",
}),
isReady: ({ alias }) => {
return (alias !== '')
@@ -33,6 +34,10 @@ export const TriggerDevice: OptionManager<AutomationTriggerDevice> = {
...state,
device_id
})} />
<InputText label="Entity" value={state.entity_id ?? ""} onChange={entity_id => setState({
...state,
entity_id
})} />
</>
}
}
+4 -2
View File
@@ -3,7 +3,8 @@ import { AutomationTime } from './common'
const AutomationTriggerBase = {
alias: st.optional(st.string())
alias: st.optional(st.string()),
id: st.optional(st.string()),
}
export const AutomationTriggerEvent = st.object({
@@ -94,10 +95,11 @@ export const AutomationTriggerZone = st.object({
export const AutomationTriggerDevice = st.object({
...AutomationTriggerBase,
platform: st.literal('device'),
entity_id: st.optional(st.string()),
device_id: st.string(),
domain: st.string(),
type: st.string(),
subtype: st.string(),
subtype: st.optional(st.string()),
})