Compare commits
492 Commits
add-Use-UU
...
history-en
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8940397b23 | ||
![]() |
8ac6ae1187 | ||
![]() |
049af5b00c | ||
![]() |
8b007610f9 | ||
![]() |
e2f20ecd48 | ||
![]() |
64533865b0 | ||
![]() |
51a2983310 | ||
![]() |
ba7351a676 | ||
![]() |
b633067e5c | ||
![]() |
1b8874cbd4 | ||
![]() |
9324061d05 | ||
![]() |
eafcbdc65b | ||
![]() |
0175522c17 | ||
![]() |
cff3f51d34 | ||
![]() |
0f580a91c9 | ||
![]() |
389f50b29a | ||
![]() |
b689bb8fcf | ||
![]() |
36f067ede4 | ||
![]() |
c2178622dd | ||
![]() |
014448e7ea | ||
![]() |
08eff0509a | ||
![]() |
62d0882e82 | ||
![]() |
86a574dbbd | ||
![]() |
71ac4620c5 | ||
![]() |
f611049517 | ||
![]() |
45fa8c272f | ||
![]() |
28a1c97571 | ||
![]() |
d9a5ae0cf1 | ||
![]() |
c03849d30b | ||
![]() |
535fe2686b | ||
![]() |
709bc87a36 | ||
![]() |
2812b467ec | ||
![]() |
7d118a5715 | ||
![]() |
8bd7370a02 | ||
![]() |
9fa8a96d09 | ||
![]() |
508d1fffef | ||
![]() |
3633daa814 | ||
![]() |
05346ae9fc | ||
![]() |
ea667cf0b9 | ||
![]() |
048ac3965e | ||
![]() |
276b6f4d1f | ||
![]() |
e765d7749c | ||
![]() |
9a3b4d6df2 | ||
![]() |
529e27992e | ||
![]() |
6c5cf2a0ec | ||
![]() |
a4cb270f09 | ||
![]() |
5160a1f55c | ||
![]() |
6a3a0db338 | ||
![]() |
765d4eb3b4 | ||
![]() |
cc09e24d66 | ||
![]() |
e7848262ea | ||
![]() |
0926202eca | ||
![]() |
e83af02410 | ||
![]() |
74d6a52fa9 | ||
![]() |
5baa975632 | ||
![]() |
4ad49ef07f | ||
![]() |
bc47ecaa57 | ||
![]() |
2bd617ce6e | ||
![]() |
dbaf955525 | ||
![]() |
578ff5b53f | ||
![]() |
e386942ea7 | ||
![]() |
2fdd50f45f | ||
![]() |
4b36770adf | ||
![]() |
54377225ec | ||
![]() |
f020add6be | ||
![]() |
b1a3996cf1 | ||
![]() |
a47a0ed716 | ||
![]() |
91cd584b4b | ||
![]() |
75562efb79 | ||
![]() |
f464bcfc14 | ||
![]() |
f8af66d310 | ||
![]() |
4922e575f8 | ||
![]() |
ac08daa64e | ||
![]() |
97f082a384 | ||
![]() |
ced37aab4c | ||
![]() |
1938fb89e6 | ||
![]() |
6842c479d6 | ||
![]() |
881f6b0531 | ||
![]() |
a564ceb9e3 | ||
![]() |
077fa3f6b2 | ||
![]() |
ceda911670 | ||
![]() |
afd41e79f0 | ||
![]() |
10f63180eb | ||
![]() |
e54802bd87 | ||
![]() |
c1d6b51065 | ||
![]() |
ab65ce819f | ||
![]() |
1e011bfe34 | ||
![]() |
5951f5c5c4 | ||
![]() |
0183e32267 | ||
![]() |
588fd87654 | ||
![]() |
e2944b098d | ||
![]() |
cbb962f084 | ||
![]() |
93f4ae1bea | ||
![]() |
d810cae194 | ||
![]() |
6797e17fc8 | ||
![]() |
6e58cd5d12 | ||
![]() |
a72fd19b73 | ||
![]() |
41c61a2895 | ||
![]() |
f35af9ed98 | ||
![]() |
abf7cb7a74 | ||
![]() |
6ec2e32241 | ||
![]() |
b7cdd9a22f | ||
![]() |
6278eefc5d | ||
![]() |
73cf0b54c9 | ||
![]() |
00dcecabb7 | ||
![]() |
c9df93bc54 | ||
![]() |
3550a8c263 | ||
![]() |
c0d30c56d6 | ||
![]() |
10813d06b6 | ||
![]() |
d0ead1fdb8 | ||
![]() |
b0e6c41238 | ||
![]() |
2c1550b10f | ||
![]() |
ffc4ca5b56 | ||
![]() |
85ad6619b7 | ||
![]() |
7358faf88e | ||
![]() |
19d014307a | ||
![]() |
5217f5c50c | ||
![]() |
c4624faa71 | ||
![]() |
b35ba4d673 | ||
![]() |
f8303bff76 | ||
![]() |
e61aa266a6 | ||
![]() |
d7971c69ad | ||
![]() |
d65e45ecfd | ||
![]() |
966a624ef6 | ||
![]() |
7cc576a616 | ||
![]() |
2dec8e70ec | ||
![]() |
97663aef42 | ||
![]() |
3f1a2526b3 | ||
![]() |
e7517a8b61 | ||
![]() |
e3d394eb32 | ||
![]() |
536ea822b3 | ||
![]() |
8e4e22b6f8 | ||
![]() |
2eaa246a03 | ||
![]() |
e841bf89be | ||
![]() |
36e1203fb1 | ||
![]() |
3acab5a39c | ||
![]() |
49cfde1fe7 | ||
![]() |
49c018c000 | ||
![]() |
b71b230bfd | ||
![]() |
e1fd7244a5 | ||
![]() |
067c2fdfa8 | ||
![]() |
a02b817d7f | ||
![]() |
7db6e0b779 | ||
![]() |
1d5cc91a2d | ||
![]() |
0623e7dce4 | ||
![]() |
da106d278c | ||
![]() |
51c5ab33f0 | ||
![]() |
8ac4a6d900 | ||
![]() |
fae1bcf0e0 | ||
![]() |
9a9eec40b2 | ||
![]() |
6ab19d66d5 | ||
![]() |
a0a7ce014f | ||
![]() |
bfeb90780f | ||
![]() |
1f105b6c15 | ||
![]() |
5b7b0ea326 | ||
![]() |
32a991989f | ||
![]() |
788f76ab9c | ||
![]() |
f6411dce66 | ||
![]() |
6f19ea1d84 | ||
![]() |
448609533f | ||
![]() |
6c48ace41e | ||
![]() |
c41e100c1c | ||
![]() |
8216b522c2 | ||
![]() |
82035d587a | ||
![]() |
2796c3570a | ||
![]() |
f4f51e1de5 | ||
![]() |
af6b0d3266 | ||
![]() |
7d1c77a38f | ||
![]() |
f807618f75 | ||
![]() |
4cfb6713cb | ||
![]() |
d32f84f28d | ||
![]() |
5fb1504211 | ||
![]() |
c37e1f0c9d | ||
![]() |
90c234ffad | ||
![]() |
dd3a3ec586 | ||
![]() |
6f67da09c0 | ||
![]() |
ba27c184f6 | ||
![]() |
b37f97128a | ||
![]() |
ee0de942f7 | ||
![]() |
ae2d48f2f4 | ||
![]() |
1bd760b455 | ||
![]() |
3d66a68791 | ||
![]() |
01a53439c4 | ||
![]() |
09ee8dbeb6 | ||
![]() |
f36c91550d | ||
![]() |
6be6c711d0 | ||
![]() |
72a36fb1cd | ||
![]() |
4c982b3323 | ||
![]() |
c9c3be71cc | ||
![]() |
f1b965dcc5 | ||
![]() |
a08a23a93d | ||
![]() |
2040a49458 | ||
![]() |
df94f4f907 | ||
![]() |
96d375cb84 | ||
![]() |
7a9c2f56c5 | ||
![]() |
5ec7193e5c | ||
![]() |
d89e4337f2 | ||
![]() |
2e192d5021 | ||
![]() |
7db28c0156 | ||
![]() |
f09c842981 | ||
![]() |
b295bbd706 | ||
![]() |
8d3132fefc | ||
![]() |
00c5d3dbbb | ||
![]() |
ca37aff47d | ||
![]() |
9ed069ef6a | ||
![]() |
6faa3eb848 | ||
![]() |
1b158d8310 | ||
![]() |
6c73ae5bf7 | ||
![]() |
9d2fcec458 | ||
![]() |
60cd6c65f0 | ||
![]() |
ce77ddf365 | ||
![]() |
cf05fbaa9d | ||
![]() |
552c474feb | ||
![]() |
a39af9c307 | ||
![]() |
a4f8e886bc | ||
![]() |
cc0c96b8b4 | ||
![]() |
445f0e23fe | ||
![]() |
6f240297d1 | ||
![]() |
6da4981b70 | ||
![]() |
cfadf4d700 | ||
![]() |
7e60de0531 | ||
![]() |
aaef6d7b91 | ||
![]() |
02af4c2156 | ||
![]() |
58c5ce2638 | ||
![]() |
a9d01c7b55 | ||
![]() |
c5de8a4361 | ||
![]() |
b53645ce92 | ||
![]() |
de34a5a597 | ||
![]() |
bd8e15bdd1 | ||
![]() |
45c7e0eeeb | ||
![]() |
a35a380ec7 | ||
![]() |
02e67d1146 | ||
![]() |
a5411f7ac4 | ||
![]() |
e8da203fe1 | ||
![]() |
10aa0a8829 | ||
![]() |
85a37e2d2f | ||
![]() |
ba8621fa2c | ||
![]() |
43e80f1a2e | ||
![]() |
3a305a44b6 | ||
![]() |
e99143139e | ||
![]() |
f0c7232704 | ||
![]() |
b2186592df | ||
![]() |
e51e3e79d5 | ||
![]() |
3b6b4d7664 | ||
![]() |
239e71b414 | ||
![]() |
080cad0ccd | ||
![]() |
dd49fd2788 | ||
![]() |
a571fb5528 | ||
![]() |
1369c1ae8c | ||
![]() |
f5864181af | ||
![]() |
a4a0d7cf19 | ||
![]() |
092dfd1e87 | ||
![]() |
a29ac33810 | ||
![]() |
1421df2a5a | ||
![]() |
591b8cc503 | ||
![]() |
011467ece0 | ||
![]() |
f52e8c3392 | ||
![]() |
c8b87b65bd | ||
![]() |
98cc82db44 | ||
![]() |
f510e2a8e0 | ||
![]() |
3438912ba5 | ||
![]() |
671c8e387f | ||
![]() |
0108ec65cf | ||
![]() |
39f7034578 | ||
![]() |
bf8affaf2b | ||
![]() |
e16a61eb53 | ||
![]() |
cadbe45bab | ||
![]() |
51f971337d | ||
![]() |
1f3c23de29 | ||
![]() |
bdfb17d957 | ||
![]() |
8c97aee1fe | ||
![]() |
38b4090daa | ||
![]() |
b8c55f2f65 | ||
![]() |
7ca379e0a1 | ||
![]() |
1617a9dfed | ||
![]() |
2c9411c6c3 | ||
![]() |
67626d4a06 | ||
![]() |
8135611688 | ||
![]() |
3ccbf6983e | ||
![]() |
e4f91195d8 | ||
![]() |
2751f8f33b | ||
![]() |
57f2df3b3e | ||
![]() |
6822f0d067 | ||
![]() |
cfba957313 | ||
![]() |
3149ffbf19 | ||
![]() |
4cd8b76d7e | ||
![]() |
4b644d8bc5 | ||
![]() |
307cd5ad8c | ||
![]() |
ebc807a6a4 | ||
![]() |
66adecdfc9 | ||
![]() |
2cc6432a0f | ||
![]() |
a2c0c0474a | ||
![]() |
27884b9a54 | ||
![]() |
293df61872 | ||
![]() |
f82dada3e5 | ||
![]() |
e5824c4794 | ||
![]() |
186550229c | ||
![]() |
7877dd8e6b | ||
![]() |
b03abc249b | ||
![]() |
fda03918b9 | ||
![]() |
6747375a1b | ||
![]() |
53b6e31881 | ||
![]() |
fa004de2d1 | ||
![]() |
3605f7b70f | ||
![]() |
5348c54c91 | ||
![]() |
684e4421bc | ||
![]() |
28f5611df5 | ||
![]() |
8da73d49d7 | ||
![]() |
049ddd5f84 | ||
![]() |
8ae2d4e93a | ||
![]() |
824bb9ba35 | ||
![]() |
d550b1a18e | ||
![]() |
dea6c0e761 | ||
![]() |
9caee357c0 | ||
![]() |
35d892c418 | ||
![]() |
9572a2a46b | ||
![]() |
8996361b26 | ||
![]() |
02ee731602 | ||
![]() |
bb1e6bf35b | ||
![]() |
c1b65285c1 | ||
![]() |
8b8d6e5fa3 | ||
![]() |
c34fe184e8 | ||
![]() |
7363838f86 | ||
![]() |
3081425ccd | ||
![]() |
95d494a54c | ||
![]() |
145e5d7bc6 | ||
![]() |
876fd9e85a | ||
![]() |
e8c30cabca | ||
![]() |
490f84a7b1 | ||
![]() |
ca28178b86 | ||
![]() |
2fceb0aeee | ||
![]() |
86f39d1d43 | ||
![]() |
1faf60444d | ||
![]() |
e927091d21 | ||
![]() |
cff2f856b3 | ||
![]() |
a743e3bbba | ||
![]() |
f8a52d250e | ||
![]() |
b70a523bdf | ||
![]() |
8f2ed747e6 | ||
![]() |
5deccefb15 | ||
![]() |
3f04abfa9d | ||
![]() |
8e55c83996 | ||
![]() |
dee59486ba | ||
![]() |
77ef509aea | ||
![]() |
bfa7bccfa6 | ||
![]() |
a8c365edc8 | ||
![]() |
94953ddf6c | ||
![]() |
6b67546daf | ||
![]() |
3e188d1f87 | ||
![]() |
f69eb15a90 | ||
![]() |
dfe348187f | ||
![]() |
9706c56c5c | ||
![]() |
3677c5be2c | ||
![]() |
bd339fa963 | ||
![]() |
28f1b6bdf4 | ||
![]() |
c5aac3b81d | ||
![]() |
70836597e9 | ||
![]() |
958a1de2fd | ||
![]() |
36d30266e3 | ||
![]() |
558ab9761d | ||
![]() |
269ef370e4 | ||
![]() |
ba2958ecd2 | ||
![]() |
3b8b6eb315 | ||
![]() |
4f13db3178 | ||
![]() |
ee7aa54ab4 | ||
![]() |
c305dd4cd5 | ||
![]() |
6865791596 | ||
![]() |
2099259393 | ||
![]() |
27ca45dc70 | ||
![]() |
d290c11219 | ||
![]() |
cabe10ffdb | ||
![]() |
aa562c21a8 | ||
![]() |
22175a7271 | ||
![]() |
1e0647c0d1 | ||
![]() |
58d94da8b3 | ||
![]() |
d97763a3e8 | ||
![]() |
aa129aa123 | ||
![]() |
f648317206 | ||
![]() |
0685fdf7c6 | ||
![]() |
6fd4cda534 | ||
![]() |
511368da13 | ||
![]() |
76e1721c58 | ||
![]() |
bad5a389b5 | ||
![]() |
85d1f49763 | ||
![]() |
7723d47ac1 | ||
![]() |
30b130ca74 | ||
![]() |
a124ec0717 | ||
![]() |
323d98ecf7 | ||
![]() |
125a601ae3 | ||
![]() |
3c549c6b31 | ||
![]() |
9c1494c74d | ||
![]() |
e751abd775 | ||
![]() |
714f2447b7 | ||
![]() |
d900e40d04 | ||
![]() |
8b82383790 | ||
![]() |
5a2cc2646c | ||
![]() |
16a0902989 | ||
![]() |
8f67aa38af | ||
![]() |
34184cf2ab | ||
![]() |
611cd2818e | ||
![]() |
0a4e8fd5d0 | ||
![]() |
11f0361f48 | ||
![]() |
cfa048ea4e | ||
![]() |
bbca7b762b | ||
![]() |
1dba849567 | ||
![]() |
aff1ec10bf | ||
![]() |
351ec08a71 | ||
![]() |
d02cd122a9 | ||
![]() |
a1a6a2cd30 | ||
![]() |
4e82c23b29 | ||
![]() |
59595aabde | ||
![]() |
358f91c2a9 | ||
![]() |
e0e01e68b4 | ||
![]() |
61dc4eaaea | ||
![]() |
65c4d02452 | ||
![]() |
f78ce2c844 | ||
![]() |
4d1ab83b30 | ||
![]() |
fb4b40b828 | ||
![]() |
db0c4ef941 | ||
![]() |
c5b60b826b | ||
![]() |
718f0330a7 | ||
![]() |
89e31486c5 | ||
![]() |
717eec1860 | ||
![]() |
b6e51352e3 | ||
![]() |
2ade728bc3 | ||
![]() |
8e962fdecb | ||
![]() |
62f227da83 | ||
![]() |
1f65193a97 | ||
![]() |
9557b604da | ||
![]() |
b45c355c9f | ||
![]() |
0b47d2c687 | ||
![]() |
8baa0b2a9b | ||
![]() |
c68a1d21ff | ||
![]() |
419d659311 | ||
![]() |
ba8b20d877 | ||
![]() |
8de542388f | ||
![]() |
e6c580aadc | ||
![]() |
11696c566a | ||
![]() |
edc15940a2 | ||
![]() |
bf35ee549d | ||
![]() |
4c3baa678c | ||
![]() |
0bb2767696 | ||
![]() |
80a4852325 | ||
![]() |
24484d0e74 | ||
![]() |
9c3e0fc997 | ||
![]() |
9e4bee123f | ||
![]() |
c2c09b1284 | ||
![]() |
bad776b979 | ||
![]() |
396791b805 | ||
![]() |
2b1457e1cd | ||
![]() |
b5861869e3 | ||
![]() |
9444228907 | ||
![]() |
86afd883a5 | ||
![]() |
062f21aa91 | ||
![]() |
ba235ac797 | ||
![]() |
505c22248b | ||
![]() |
624cb48f78 | ||
![]() |
7ab54ee5ce | ||
![]() |
f5af63a50e | ||
![]() |
ff80ab34ee | ||
![]() |
cfc1999a28 | ||
![]() |
7ca28469b7 | ||
![]() |
ac670614b4 | ||
![]() |
e263b57296 | ||
![]() |
c7050e4676 | ||
![]() |
00cbd1d9e6 | ||
![]() |
2a12172eeb | ||
![]() |
85d3011625 | ||
![]() |
ca22ec6340 | ||
![]() |
61f6e8855b | ||
![]() |
a44b8981e1 | ||
![]() |
b080bca9ce | ||
![]() |
d30e8ee9d8 | ||
![]() |
637e4203e5 | ||
![]() |
2648a53bbc | ||
![]() |
b3fa0cccb4 | ||
![]() |
dd963be723 | ||
![]() |
224df896a1 | ||
![]() |
a58b4fb262 | ||
![]() |
f9ccfa00a2 | ||
![]() |
070e11a2db | ||
![]() |
fc1c6cea24 | ||
![]() |
c6a103bd30 | ||
![]() |
9d1618024e | ||
![]() |
307aa161a6 | ||
![]() |
affa6a92e7 | ||
![]() |
1e5ec241d5 | ||
![]() |
27a98a32fc | ||
![]() |
2c8ac58f97 | ||
![]() |
6b995969b1 | ||
![]() |
72c107484a | ||
![]() |
d1085b6657 |
2
.github/ISSUE_TEMPLATE.md
vendored
@@ -51,7 +51,7 @@ DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed w
|
|||||||
<!--
|
<!--
|
||||||
Provide details about the versions you are using, which helps us reproducing
|
Provide details about the versions you are using, which helps us reproducing
|
||||||
and finding the issue quicker. Version information is found in the
|
and finding the issue quicker. Version information is found in the
|
||||||
Home Assistant frontend: Configuration -> Info.
|
Home Assistant frontend: Settings -> About.
|
||||||
|
|
||||||
Browser version and operating system is important! Please try to replicate
|
Browser version and operating system is important! Please try to replicate
|
||||||
your issue in a different browser and be sure to include your findings.
|
your issue in a different browser and be sure to include your findings.
|
||||||
|
6
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
@@ -1,4 +1,4 @@
|
|||||||
name: Report a bug with the UI, Frontend or Lovelace
|
name: Report a bug with the UI / Dashboards
|
||||||
description: Report an issue related to the Home Assistant frontend.
|
description: Report an issue related to the Home Assistant frontend.
|
||||||
labels: bug
|
labels: bug
|
||||||
body:
|
body:
|
||||||
@@ -9,7 +9,7 @@ body:
|
|||||||
|
|
||||||
If you have a feature or enhancement request for the frontend, please [start an discussion][fr] instead of creating an issue.
|
If you have a feature or enhancement request for the frontend, please [start an discussion][fr] instead of creating an issue.
|
||||||
|
|
||||||
**Please not not report issues for custom Lovelace cards.**
|
**Please not not report issues for custom cards.**
|
||||||
|
|
||||||
[fr]: https://github.com/home-assistant/frontend/discussions
|
[fr]: https://github.com/home-assistant/frontend/discussions
|
||||||
[releases]: https://github.com/home-assistant/home-assistant/releases
|
[releases]: https://github.com/home-assistant/home-assistant/releases
|
||||||
@@ -64,7 +64,7 @@ body:
|
|||||||
label: What version of Home Assistant Core has the issue?
|
label: What version of Home Assistant Core has the issue?
|
||||||
placeholder: core-
|
placeholder: core-
|
||||||
description: >
|
description: >
|
||||||
Can be found in the Configuration panel -> Info.
|
Can be found in: [Settings -> About](https://my.home-assistant.io/redirect/info/).
|
||||||
- type: input
|
- type: input
|
||||||
attributes:
|
attributes:
|
||||||
label: What was the last working version of Home Assistant Core?
|
label: What was the last working version of Home Assistant Core?
|
||||||
|
8
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -1,17 +1,17 @@
|
|||||||
blank_issues_enabled: false
|
blank_issues_enabled: false
|
||||||
contact_links:
|
contact_links:
|
||||||
- name: Request a feature for the UI, Frontend or Lovelace
|
- name: Request a feature for the UI / Dashboards
|
||||||
url: https://github.com/home-assistant/frontend/discussions/category_choices
|
url: https://github.com/home-assistant/frontend/discussions/category_choices
|
||||||
about: Request an new feature for the Home Assistant frontend.
|
about: Request an new feature for the Home Assistant frontend.
|
||||||
- name: Report a bug that is NOT related to the UI, Frontend or Lovelace
|
- name: Report a bug that is NOT related to the UI / Dashboards
|
||||||
url: https://github.com/home-assistant/core/issues
|
url: https://github.com/home-assistant/core/issues
|
||||||
about: This is the issue tracker for our frontend. Please report other issues with the backend repository.
|
about: This is the issue tracker for our frontend. Please report other issues in the backend ("core") repository.
|
||||||
- name: Report incorrect or missing information on our website
|
- name: Report incorrect or missing information on our website
|
||||||
url: https://github.com/home-assistant/home-assistant.io/issues
|
url: https://github.com/home-assistant/home-assistant.io/issues
|
||||||
about: Our documentation has its own issue tracker. Please report issues with the website there.
|
about: Our documentation has its own issue tracker. Please report issues with the website there.
|
||||||
- name: I have a question or need support
|
- name: I have a question or need support
|
||||||
url: https://www.home-assistant.io/help
|
url: https://www.home-assistant.io/help
|
||||||
about: We use GitHub for tracking bugs, check our website for resources on getting help.
|
about: We use GitHub for tracking bugs. Check our website for resources on getting help.
|
||||||
- name: I'm unsure where to go
|
- name: I'm unsure where to go
|
||||||
url: https://www.home-assistant.io/join-chat
|
url: https://www.home-assistant.io/join-chat
|
||||||
about: If you are unsure where to go, then joining our chat is recommended; Just ask!
|
about: If you are unsure where to go, then joining our chat is recommended; Just ask!
|
||||||
|
30
.github/workflows/release.yaml
vendored
@@ -74,33 +74,11 @@ jobs:
|
|||||||
version=$(echo "${{ github.ref }}" | awk -F"/" '{print $NF}' )
|
version=$(echo "${{ github.ref }}" | awk -F"/" '{print $NF}' )
|
||||||
echo "home-assistant-frontend==$version" > ./requirements.txt
|
echo "home-assistant-frontend==$version" > ./requirements.txt
|
||||||
|
|
||||||
- name: Upload requirements.txt
|
|
||||||
uses: actions/upload-artifact@v2
|
|
||||||
with:
|
|
||||||
name: requirements
|
|
||||||
path: ./requirements.txt
|
|
||||||
|
|
||||||
build-wheels:
|
|
||||||
name: Build wheels for ${{ matrix.arch }}
|
|
||||||
needs: wheels-init
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
arch: ["aarch64", "armhf", "armv7", "amd64", "i386"]
|
|
||||||
tag:
|
|
||||||
- "3.9-alpine3.14"
|
|
||||||
steps:
|
|
||||||
- name: Download requirements.txt
|
|
||||||
uses: actions/download-artifact@v2
|
|
||||||
with:
|
|
||||||
name: requirements
|
|
||||||
|
|
||||||
- name: Build wheels
|
- name: Build wheels
|
||||||
uses: home-assistant/wheels@master
|
uses: home-assistant/wheels@2022.06.7
|
||||||
with:
|
with:
|
||||||
tag: ${{ matrix.tag }}
|
abi: cp310
|
||||||
arch: ${{ matrix.arch }}
|
tag: musllinux_1_2
|
||||||
wheels-host: ${{ secrets.WHEELS_HOST }}
|
arch: amd64
|
||||||
wheels-key: ${{ secrets.WHEELS_KEY }}
|
wheels-key: ${{ secrets.WHEELS_KEY }}
|
||||||
wheels-user: wheels
|
|
||||||
requirements: "requirements.txt"
|
requirements: "requirements.txt"
|
||||||
|
2
.vscode/tasks.json
vendored
@@ -181,7 +181,7 @@
|
|||||||
{
|
{
|
||||||
"label": "Run HA Core for Supervisor in devcontainer",
|
"label": "Run HA Core for Supervisor in devcontainer",
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"command": "HASSIO=${input:supervisorHost} HASSIO_TOKEN=${input:supervisorToken} script/core",
|
"command": "SUPERVISOR=${input:supervisorHost} SUPERVISOR_TOKEN=${input:supervisorToken} script/core",
|
||||||
"isBackground": true,
|
"isBackground": true,
|
||||||
"group": {
|
"group": {
|
||||||
"kind": "build",
|
"kind": "build",
|
||||||
|
@@ -26,8 +26,8 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
version() {
|
version() {
|
||||||
const version = fs
|
const version = fs
|
||||||
.readFileSync(path.resolve(paths.polymer_dir, "setup.cfg"), "utf8")
|
.readFileSync(path.resolve(paths.polymer_dir, "pyproject.toml"), "utf8")
|
||||||
.match(/version\W+=\W(\d{8}\.\d)/);
|
.match(/version\W+=\W"(\d{8}\.\d)"/);
|
||||||
if (!version) {
|
if (!version) {
|
||||||
throw Error("Version not found");
|
throw Error("Version not found");
|
||||||
}
|
}
|
||||||
|
@@ -156,3 +156,12 @@ gulp.task("gen-icons-json", (done) => {
|
|||||||
|
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
gulp.task("gen-dummy-icons-json", (done) => {
|
||||||
|
if (!fs.existsSync(OUTPUT_DIR)) {
|
||||||
|
fs.mkdirSync(OUTPUT_DIR, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
fs.writeFileSync(path.resolve(OUTPUT_DIR, "iconList.json"), "[]");
|
||||||
|
done();
|
||||||
|
});
|
||||||
|
@@ -9,6 +9,7 @@ require("./compress.js");
|
|||||||
require("./rollup.js");
|
require("./rollup.js");
|
||||||
require("./gather-static.js");
|
require("./gather-static.js");
|
||||||
require("./translations.js");
|
require("./translations.js");
|
||||||
|
require("./gen-icons-json.js");
|
||||||
|
|
||||||
gulp.task(
|
gulp.task(
|
||||||
"develop-hassio",
|
"develop-hassio",
|
||||||
@@ -17,6 +18,7 @@ gulp.task(
|
|||||||
process.env.NODE_ENV = "development";
|
process.env.NODE_ENV = "development";
|
||||||
},
|
},
|
||||||
"clean-hassio",
|
"clean-hassio",
|
||||||
|
"gen-dummy-icons-json",
|
||||||
"gen-index-hassio-dev",
|
"gen-index-hassio-dev",
|
||||||
"build-supervisor-translations",
|
"build-supervisor-translations",
|
||||||
"copy-translations-supervisor",
|
"copy-translations-supervisor",
|
||||||
@@ -33,6 +35,7 @@ gulp.task(
|
|||||||
process.env.NODE_ENV = "production";
|
process.env.NODE_ENV = "production";
|
||||||
},
|
},
|
||||||
"clean-hassio",
|
"clean-hassio",
|
||||||
|
"gen-dummy-icons-json",
|
||||||
"build-supervisor-translations",
|
"build-supervisor-translations",
|
||||||
"copy-translations-supervisor",
|
"copy-translations-supervisor",
|
||||||
"build-locale-data",
|
"build-locale-data",
|
||||||
|
@@ -3,10 +3,10 @@ const webpack = require("webpack");
|
|||||||
const path = require("path");
|
const path = require("path");
|
||||||
const TerserPlugin = require("terser-webpack-plugin");
|
const TerserPlugin = require("terser-webpack-plugin");
|
||||||
const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
|
const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
|
||||||
const paths = require("./paths.js");
|
|
||||||
const bundle = require("./bundle.js");
|
|
||||||
const log = require("fancy-log");
|
const log = require("fancy-log");
|
||||||
const WebpackBar = require("webpackbar");
|
const WebpackBar = require("webpackbar");
|
||||||
|
const paths = require("./paths.js");
|
||||||
|
const bundle = require("./bundle.js");
|
||||||
|
|
||||||
class LogStartCompilePlugin {
|
class LogStartCompilePlugin {
|
||||||
ignoredFirst = false;
|
ignoredFirst = false;
|
||||||
@@ -138,6 +138,8 @@ const createWebpackConfig = ({
|
|||||||
"lit/directives/cache$": "lit/directives/cache.js",
|
"lit/directives/cache$": "lit/directives/cache.js",
|
||||||
"lit/directives/repeat$": "lit/directives/repeat.js",
|
"lit/directives/repeat$": "lit/directives/repeat.js",
|
||||||
"lit/polyfill-support$": "lit/polyfill-support.js",
|
"lit/polyfill-support$": "lit/polyfill-support.js",
|
||||||
|
"@lit-labs/virtualizer/layouts/grid":
|
||||||
|
"@lit-labs/virtualizer/layouts/grid.js",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
output: {
|
output: {
|
||||||
|
9
cast/public/_redirects
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
# These redirects are handled by Netlify
|
||||||
|
#
|
||||||
|
|
||||||
|
# Some custom cards are not prefixing the instance URL when fetching data
|
||||||
|
# and can end up fetching the data from the Cast domain instead of HA.
|
||||||
|
# This will make sure that some common ones are replaced with a placeholder.
|
||||||
|
/api/camera_proxy/* /images/google-nest-hub.png
|
||||||
|
/api/camera_proxy_stream/* /images/google-nest-hub.png
|
||||||
|
/api/media_player_proxy/* /images/google-nest-hub.png
|
@@ -194,7 +194,7 @@ export const demoLovelaceJimpower: DemoConfig["lovelace"] = () => ({
|
|||||||
type: "state-icon",
|
type: "state-icon",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "group.downstairs_lights",
|
entity_id: "group.downstairs_lights",
|
||||||
},
|
},
|
||||||
service: "homeassistant.toggle",
|
service: "homeassistant.toggle",
|
||||||
|
@@ -59,7 +59,7 @@ export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
|
|||||||
attributes: {
|
attributes: {
|
||||||
hidden: true,
|
hidden: true,
|
||||||
radius: 50,
|
radius: 50,
|
||||||
friendly_name: "Skolan",
|
friendly_name: "School",
|
||||||
icon: "mdi:school",
|
icon: "mdi:school",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -137,7 +137,7 @@ export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
|
|||||||
state: "73",
|
state: "73",
|
||||||
attributes: {
|
attributes: {
|
||||||
unit_of_measurement: "%",
|
unit_of_measurement: "%",
|
||||||
friendly_name: "oskar batteri",
|
friendly_name: "Oskar battery",
|
||||||
device_class: "battery",
|
device_class: "battery",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -146,7 +146,7 @@ export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
|
|||||||
state: "88",
|
state: "88",
|
||||||
attributes: {
|
attributes: {
|
||||||
unit_of_measurement: "%",
|
unit_of_measurement: "%",
|
||||||
friendly_name: "bella batteri",
|
friendly_name: "Bella battery",
|
||||||
device_class: "battery",
|
device_class: "battery",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -154,7 +154,7 @@ export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
|
|||||||
entity_id: "binary_sensor.unifi_camera",
|
entity_id: "binary_sensor.unifi_camera",
|
||||||
state: "off",
|
state: "off",
|
||||||
attributes: {
|
attributes: {
|
||||||
friendly_name: "R\u00f6relsesensor kamera",
|
friendly_name: "Motion sensor camera",
|
||||||
icon: "mdi:walk",
|
icon: "mdi:walk",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -707,7 +707,7 @@ export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
cloudiness: 25,
|
cloudiness: 25,
|
||||||
friendly_name: "V\u00e4der",
|
friendly_name: "Weather",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"binary_sensor.ubiquiti_switch": {
|
"binary_sensor.ubiquiti_switch": {
|
||||||
@@ -731,7 +731,7 @@ export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
|
|||||||
round_trip_time_max: "0.626",
|
round_trip_time_max: "0.626",
|
||||||
round_trip_time_mdev: "",
|
round_trip_time_mdev: "",
|
||||||
round_trip_time_min: "0.358",
|
round_trip_time_min: "0.358",
|
||||||
friendly_name: "Entr\u00e9 kamera",
|
friendly_name: "Entrance camera",
|
||||||
device_class: "connectivity",
|
device_class: "connectivity",
|
||||||
icon: "mdi:cctv",
|
icon: "mdi:cctv",
|
||||||
},
|
},
|
||||||
@@ -807,7 +807,7 @@ export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
|
|||||||
attributes: {
|
attributes: {
|
||||||
battery_level: 88,
|
battery_level: 88,
|
||||||
on: true,
|
on: true,
|
||||||
friendly_name: "Altand\u00f6rren sensor",
|
friendly_name: "Back door sensor",
|
||||||
device_class: "opening",
|
device_class: "opening",
|
||||||
icon: "mdi:door",
|
icon: "mdi:door",
|
||||||
},
|
},
|
||||||
@@ -841,7 +841,7 @@ export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
|
|||||||
battery_level: 60,
|
battery_level: 60,
|
||||||
on: true,
|
on: true,
|
||||||
dark: true,
|
dark: true,
|
||||||
friendly_name: "R\u00f6relsesensor tv\u00e4ttstugan",
|
friendly_name: "Laundy room motion sensor",
|
||||||
device_class: "motion",
|
device_class: "motion",
|
||||||
icon: "mdi:walk",
|
icon: "mdi:walk",
|
||||||
},
|
},
|
||||||
|
@@ -377,7 +377,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
|
|||||||
name: "AC bed",
|
name: "AC bed",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "script.air_cleaner_quiet",
|
entity_id: "script.air_cleaner_quiet",
|
||||||
},
|
},
|
||||||
service: "script.turn_on",
|
service: "script.turn_on",
|
||||||
@@ -390,7 +390,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
|
|||||||
name: "AC bed",
|
name: "AC bed",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "script.air_cleaner_auto",
|
entity_id: "script.air_cleaner_auto",
|
||||||
},
|
},
|
||||||
service: "script.turn_on",
|
service: "script.turn_on",
|
||||||
@@ -403,7 +403,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
|
|||||||
name: "AC bed",
|
name: "AC bed",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "script.air_cleaner_turbo",
|
entity_id: "script.air_cleaner_turbo",
|
||||||
},
|
},
|
||||||
service: "script.turn_on",
|
service: "script.turn_on",
|
||||||
@@ -416,7 +416,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
|
|||||||
name: "AC",
|
name: "AC",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "script.ac_off",
|
entity_id: "script.ac_off",
|
||||||
},
|
},
|
||||||
service: "script.turn_on",
|
service: "script.turn_on",
|
||||||
@@ -429,7 +429,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
|
|||||||
name: "AC",
|
name: "AC",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "script.ac_on",
|
entity_id: "script.ac_on",
|
||||||
},
|
},
|
||||||
service: "script.turn_on",
|
service: "script.turn_on",
|
||||||
@@ -629,7 +629,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
|
|||||||
entity: "scene.morning_lights",
|
entity: "scene.morning_lights",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "scene.morning_lights",
|
entity_id: "scene.morning_lights",
|
||||||
},
|
},
|
||||||
service: "scene.turn_on",
|
service: "scene.turn_on",
|
||||||
@@ -641,7 +641,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
|
|||||||
entity: "scene.movie_time",
|
entity: "scene.movie_time",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "scene.movie_time",
|
entity_id: "scene.movie_time",
|
||||||
},
|
},
|
||||||
service: "scene.turn_on",
|
service: "scene.turn_on",
|
||||||
@@ -702,7 +702,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
|
|||||||
entity: "light.downstairs_lights",
|
entity: "light.downstairs_lights",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "light.downstairs_lights",
|
entity_id: "light.downstairs_lights",
|
||||||
},
|
},
|
||||||
service: "light.toggle",
|
service: "light.toggle",
|
||||||
@@ -714,7 +714,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
|
|||||||
entity: "light.upstairs_lights",
|
entity: "light.upstairs_lights",
|
||||||
tap_action: {
|
tap_action: {
|
||||||
action: "call-service",
|
action: "call-service",
|
||||||
service_data: {
|
data: {
|
||||||
entity_id: "light.upstairs_lights",
|
entity_id: "light.upstairs_lights",
|
||||||
},
|
},
|
||||||
service: "light.toggle",
|
service: "light.toggle",
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
|
import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
|
||||||
|
|
||||||
export const mockConfig = (hass: MockHomeAssistant) => {
|
export const mockConfig = (hass: MockHomeAssistant) => {
|
||||||
hass.mockAPI("config/config_entries/entry", () => [
|
hass.mockAPI("config/config_entries/entry?domain=co2signal", () => [
|
||||||
{
|
{
|
||||||
entry_id: "co2signal",
|
entry_id: "co2signal",
|
||||||
domain: "co2signal",
|
domain: "co2signal",
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
import { format, startOfToday, startOfTomorrow } from "date-fns";
|
import { format, startOfToday, startOfTomorrow } from "date-fns/esm";
|
||||||
import { EnergySolarForecasts } from "../../../src/data/energy";
|
import { EnergySolarForecasts } from "../../../src/data/energy";
|
||||||
import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
|
import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
|
||||||
|
|
||||||
|
@@ -31,7 +31,7 @@ export const mockHassioSupervisor = (hass: MockHomeAssistant) => {
|
|||||||
version_latest: "3.6.2",
|
version_latest: "3.6.2",
|
||||||
update_available: false,
|
update_available: false,
|
||||||
repository: "a0d7b954",
|
repository: "a0d7b954",
|
||||||
icon: true,
|
icon: false,
|
||||||
logo: true,
|
logo: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@@ -4,7 +4,7 @@ import {
|
|||||||
addMonths,
|
addMonths,
|
||||||
differenceInHours,
|
differenceInHours,
|
||||||
endOfDay,
|
endOfDay,
|
||||||
} from "date-fns";
|
} from "date-fns/esm";
|
||||||
import { HassEntity } from "home-assistant-js-websocket";
|
import { HassEntity } from "home-assistant-js-websocket";
|
||||||
import { StatisticValue } from "../../../src/data/history";
|
import { StatisticValue } from "../../../src/data/history";
|
||||||
import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
|
import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
|
||||||
@@ -466,6 +466,7 @@ export const mockHistory = (mockHass: MockHomeAssistant) => {
|
|||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
mockHass.mockWS("recorder/get_statistics_metadata", () => []);
|
||||||
mockHass.mockWS("history/list_statistic_ids", () => []);
|
mockHass.mockWS("history/list_statistic_ids", () => []);
|
||||||
mockHass.mockWS(
|
mockHass.mockWS(
|
||||||
"history/statistics_during_period",
|
"history/statistics_during_period",
|
||||||
|
BIN
gallery/public/api/hassio/addons/core_zwave_js/icon
Normal file
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 32 KiB |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 27 KiB |
Before Width: | Height: | Size: 67 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 27 KiB After Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 94 KiB After Width: | Height: | Size: 90 KiB |
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 25 KiB |
@@ -53,13 +53,19 @@ class DemoBlackWhiteRow extends LitElement {
|
|||||||
|
|
||||||
firstUpdated(changedProps) {
|
firstUpdated(changedProps) {
|
||||||
super.firstUpdated(changedProps);
|
super.firstUpdated(changedProps);
|
||||||
applyThemesOnElement(this.shadowRoot!.querySelector(".dark"), {
|
applyThemesOnElement(
|
||||||
|
this.shadowRoot!.querySelector(".dark"),
|
||||||
|
{
|
||||||
default_theme: "default",
|
default_theme: "default",
|
||||||
default_dark_theme: "default",
|
default_dark_theme: "default",
|
||||||
themes: {},
|
themes: {},
|
||||||
darkMode: true,
|
darkMode: true,
|
||||||
theme: "default",
|
theme: "default",
|
||||||
});
|
},
|
||||||
|
undefined,
|
||||||
|
undefined,
|
||||||
|
true
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
handleSubmit(ev) {
|
handleSubmit(ev) {
|
||||||
|
11
gallery/src/data/text.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
export const LONG_TEXT = `
|
||||||
|
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc laoreet velit ut elit volutpat, eget ultrices odio lacinia. In imperdiet malesuada est, nec sagittis metus ultricies quis. Sed nisl ex, convallis porttitor ante quis, hendrerit tristique justo. Mauris pharetra venenatis augue, eu maximus sem cursus in. Quisque sed consequat risus. Suspendisse facilisis ligula a odio consectetur condimentum. Curabitur vehicula elit nec augue mollis, et volutpat massa dictum.
|
||||||
|
|
||||||
|
Nam pellentesque auctor rutrum. Suspendisse elit est, sodales vel diam nec, porttitor faucibus massa. Ut pretium ac orci eu pharetra. Praesent in nibh at magna viverra rutrum eu vitae tortor. Etiam eget sem ex. Fusce tristique odio nec lacus mattis, vitae tempor nunc malesuada. Maecenas faucibus magna vel libero maximus egestas. Vestibulum luctus semper velit, in lobortis risus tempus non. Curabitur bibendum ornare commodo. Quisque commodo neque sit amet tincidunt lacinia. Proin elementum ante velit, eu congue nulla semper quis. Pellentesque consequat vel nunc at scelerisque. Mauris sit amet venenatis diam, blandit viverra leo. Integer commodo laoreet orci.
|
||||||
|
|
||||||
|
Curabitur ipsum tortor, sodales ut augue sed, commodo porttitor libero. Pellentesque molestie vitae mi consectetur tempor. In sed lectus consequat, lobortis neque non, semper ipsum. Etiam eget ex et nibh sagittis pulvinar lacinia ac mauris. Aenean ligula eros, viverra ac nibh at, venenatis semper quam. Sed interdum ligula sit amet massa tincidunt tincidunt. Suspendisse potenti. Aliquam egestas facilisis est, sed faucibus erat scelerisque id. Duis dolor quam, viverra vitae orci euismod, laoreet pellentesque justo. Nunc malesuada non erat at ullamcorper. Mauris eget posuere odio. Vestibulum turpis nunc, pharetra eget ante in, feugiat mollis justo. Proin porttitor, diam nec vulputate pretium, tellus arcu rhoncus turpis, a blandit nisi nulla quis arcu. Nunc ac ullamcorper ligula, nec facilisis leo.
|
||||||
|
|
||||||
|
In vitae eros sollicitudin, iaculis ex eget, egestas orci. Etiam sed pretium lorem. Nam nisi enim, consectetur sit amet semper ac, semper pharetra diam. In pulvinar neque sapien, ac ullamcorper est lacinia a. Etiam tincidunt velit sed diam malesuada, eu ornare ex consectetur. Phasellus in imperdiet tellus. Sed bibendum, dui sit amet fringilla aliquet, enim odio sollicitudin lorem, vel semper turpis mauris vel mauris. Aenean congue magna ac massa cursus, in dictum orci commodo. Pellentesque mollis velit in sollicitudin tincidunt. Vestibulum et efficitur nulla.
|
||||||
|
|
||||||
|
Quisque posuere, velit sed porttitor dapibus, neque augue fringilla felis, eu luctus nisi nisl nec ipsum. Curabitur pellentesque ac lectus eget ultricies. Vestibulum est dolor, lacinia pharetra vulputate a, facilisis a magna. Nam vitae arcu nibh. Praesent finibus blandit ante, ac gravida ex mollis eget. Donec quam est, pulvinar vitae neque ut, bibendum aliquam erat. Nullam mollis arcu at sem tincidunt, in tristique lectus facilisis. Aenean ut lacus vel nisl finibus iaculis non a turpis. Integer eget ipsum ante. Donec nunc neque, vestibulum ac magna ac, posuere scelerisque dui. Pellentesque massa nibh, rhoncus id dolor quis, placerat posuere turpis. Donec aliquet augue nisi, eu finibus dui auctor et. Vestibulum eu varius lorem. Quisque lectus ante, malesuada pretium risus eget, interdum mattis enim.
|
||||||
|
`;
|
@@ -119,7 +119,7 @@ export const basicTrace: DemoTrace = {
|
|||||||
params: {
|
params: {
|
||||||
domain: "input_boolean",
|
domain: "input_boolean",
|
||||||
service: "toggle",
|
service: "toggle",
|
||||||
service_data: {},
|
data: {},
|
||||||
target: {
|
target: {
|
||||||
entity_id: ["input_boolean.toggle_4"],
|
entity_id: ["input_boolean.toggle_4"],
|
||||||
},
|
},
|
||||||
@@ -164,7 +164,7 @@ export const basicTrace: DemoTrace = {
|
|||||||
params: {
|
params: {
|
||||||
domain: "input_boolean",
|
domain: "input_boolean",
|
||||||
service: "toggle",
|
service: "toggle",
|
||||||
service_data: {},
|
data: {},
|
||||||
target: {
|
target: {
|
||||||
entity_id: ["input_boolean.toggle_2"],
|
entity_id: ["input_boolean.toggle_2"],
|
||||||
},
|
},
|
||||||
@@ -182,7 +182,7 @@ export const basicTrace: DemoTrace = {
|
|||||||
params: {
|
params: {
|
||||||
domain: "input_boolean",
|
domain: "input_boolean",
|
||||||
service: "toggle",
|
service: "toggle",
|
||||||
service_data: {},
|
data: {},
|
||||||
target: {
|
target: {
|
||||||
entity_id: ["input_boolean.toggle_3"],
|
entity_id: ["input_boolean.toggle_3"],
|
||||||
},
|
},
|
||||||
@@ -200,7 +200,7 @@ export const basicTrace: DemoTrace = {
|
|||||||
params: {
|
params: {
|
||||||
domain: "input_boolean",
|
domain: "input_boolean",
|
||||||
service: "toggle",
|
service: "toggle",
|
||||||
service_data: {},
|
data: {},
|
||||||
target: {
|
target: {
|
||||||
entity_id: ["input_boolean.toggle_4"],
|
entity_id: ["input_boolean.toggle_4"],
|
||||||
},
|
},
|
||||||
@@ -298,11 +298,11 @@ export const basicTrace: DemoTrace = {
|
|||||||
source: "state of input_boolean.toggle_1",
|
source: "state of input_boolean.toggle_1",
|
||||||
entity_id: "automation.toggle_toggles",
|
entity_id: "automation.toggle_toggles",
|
||||||
context_id: "6cfcae368e7b3686fad6c59e83ae76c9",
|
context_id: "6cfcae368e7b3686fad6c59e83ae76c9",
|
||||||
when: "2021-03-25T04:36:51.240832+00:00",
|
when: 1616647011.240832,
|
||||||
domain: "automation",
|
domain: "automation",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
when: "2021-03-25T04:36:51.249828+00:00",
|
when: 1616647011.249828,
|
||||||
name: "Toggle 4",
|
name: "Toggle 4",
|
||||||
state: "on",
|
state: "on",
|
||||||
entity_id: "input_boolean.toggle_4",
|
entity_id: "input_boolean.toggle_4",
|
||||||
@@ -313,7 +313,7 @@ export const basicTrace: DemoTrace = {
|
|||||||
context_name: "Ensure Party mode",
|
context_name: "Ensure Party mode",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
when: "2021-03-25T04:36:51.258947+00:00",
|
when: 1616647011.258947,
|
||||||
name: "Toggle 2",
|
name: "Toggle 2",
|
||||||
state: "on",
|
state: "on",
|
||||||
entity_id: "input_boolean.toggle_2",
|
entity_id: "input_boolean.toggle_2",
|
||||||
@@ -324,7 +324,7 @@ export const basicTrace: DemoTrace = {
|
|||||||
context_name: "Ensure Party mode",
|
context_name: "Ensure Party mode",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
when: "2021-03-25T04:36:51.261806+00:00",
|
when: 1616647011.261806,
|
||||||
name: "Toggle 3",
|
name: "Toggle 3",
|
||||||
state: "off",
|
state: "off",
|
||||||
entity_id: "input_boolean.toggle_3",
|
entity_id: "input_boolean.toggle_3",
|
||||||
@@ -335,7 +335,7 @@ export const basicTrace: DemoTrace = {
|
|||||||
context_name: "Ensure Party mode",
|
context_name: "Ensure Party mode",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
when: "2021-03-25T04:36:51.265246+00:00",
|
when: 1616647011.265246,
|
||||||
name: "Toggle 4",
|
name: "Toggle 4",
|
||||||
state: "off",
|
state: "off",
|
||||||
entity_id: "input_boolean.toggle_4",
|
entity_id: "input_boolean.toggle_4",
|
||||||
|
@@ -185,11 +185,11 @@ export const motionLightTrace: DemoTrace = {
|
|||||||
"has been triggered by state of binary_sensor.pauluss_macbook_pro_camera_in_use",
|
"has been triggered by state of binary_sensor.pauluss_macbook_pro_camera_in_use",
|
||||||
source: "state of binary_sensor.pauluss_macbook_pro_camera_in_use",
|
source: "state of binary_sensor.pauluss_macbook_pro_camera_in_use",
|
||||||
entity_id: "automation.auto_elgato",
|
entity_id: "automation.auto_elgato",
|
||||||
when: "2021-03-14T06:07:01.768492+00:00",
|
when: 1615702021.768492,
|
||||||
domain: "automation",
|
domain: "automation",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
when: "2021-03-14T06:07:01.872187+00:00",
|
when: 1615702021.872187,
|
||||||
name: "Elgato Key Light Air",
|
name: "Elgato Key Light Air",
|
||||||
state: "on",
|
state: "on",
|
||||||
entity_id: "light.elgato_key_light_air",
|
entity_id: "light.elgato_key_light_air",
|
||||||
@@ -200,7 +200,7 @@ export const motionLightTrace: DemoTrace = {
|
|||||||
context_name: "Auto Elgato",
|
context_name: "Auto Elgato",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
when: "2021-03-14T06:07:53.284505+00:00",
|
when: 1615702073.284505,
|
||||||
name: "Elgato Key Light Air",
|
name: "Elgato Key Light Air",
|
||||||
state: "off",
|
state: "off",
|
||||||
entity_id: "light.elgato_key_light_air",
|
entity_id: "light.elgato_key_light_air",
|
||||||
|
@@ -62,6 +62,45 @@ const ACTIONS = [
|
|||||||
entity_id: "input_boolean.toggle_4",
|
entity_id: "input_boolean.toggle_4",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
parallel: [
|
||||||
|
{ scene: "scene.kitchen_morning" },
|
||||||
|
{
|
||||||
|
service: "media_player.play_media",
|
||||||
|
target: { entity_id: "media_player.living_room" },
|
||||||
|
data: { media_content_id: "", media_content_type: "" },
|
||||||
|
metadata: { title: "Happy Song" },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
stop: "No one is home!",
|
||||||
|
},
|
||||||
|
{ repeat: { count: 3, sequence: [{ delay: "00:00:01" }] } },
|
||||||
|
{
|
||||||
|
repeat: {
|
||||||
|
for_each: ["bread", "butter", "cheese"],
|
||||||
|
sequence: [{ delay: "00:00:01" }],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
if: [{ condition: "state" }],
|
||||||
|
then: [{ delay: "00:00:01" }],
|
||||||
|
else: [{ delay: "00:00:05" }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
choose: [
|
||||||
|
{
|
||||||
|
conditions: [{ condition: "state" }],
|
||||||
|
sequence: [{ delay: "00:00:01" }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
conditions: [{ condition: "sun" }],
|
||||||
|
sequence: [{ delay: "00:00:05" }],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
default: [{ delay: "00:00:03" }],
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
@customElement("demo-automation-describe-action")
|
@customElement("demo-automation-describe-action")
|
||||||
|
@@ -20,6 +20,10 @@ import { HaWaitForTriggerAction } from "../../../../src/panels/config/automation
|
|||||||
import { HaWaitAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-wait_template";
|
import { HaWaitAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-wait_template";
|
||||||
import { Action } from "../../../../src/data/script";
|
import { Action } from "../../../../src/data/script";
|
||||||
import { HaConditionAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-condition";
|
import { HaConditionAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-condition";
|
||||||
|
import { HaParallelAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-parallel";
|
||||||
|
import { HaIfAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-if";
|
||||||
|
import { HaStopAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-stop";
|
||||||
|
import { HaPlayMediaAction } from "../../../../src/panels/config/automation/action/types/ha-automation-action-play_media";
|
||||||
|
|
||||||
const SCHEMAS: { name: string; actions: Action[] }[] = [
|
const SCHEMAS: { name: string; actions: Action[] }[] = [
|
||||||
{ name: "Event", actions: [HaEventAction.defaultConfig] },
|
{ name: "Event", actions: [HaEventAction.defaultConfig] },
|
||||||
@@ -28,11 +32,15 @@ const SCHEMAS: { name: string; actions: Action[] }[] = [
|
|||||||
{ name: "Condition", actions: [HaConditionAction.defaultConfig] },
|
{ name: "Condition", actions: [HaConditionAction.defaultConfig] },
|
||||||
{ name: "Delay", actions: [HaDelayAction.defaultConfig] },
|
{ name: "Delay", actions: [HaDelayAction.defaultConfig] },
|
||||||
{ name: "Scene", actions: [HaSceneAction.defaultConfig] },
|
{ name: "Scene", actions: [HaSceneAction.defaultConfig] },
|
||||||
|
{ name: "Play media", actions: [HaPlayMediaAction.defaultConfig] },
|
||||||
{ name: "Wait", actions: [HaWaitAction.defaultConfig] },
|
{ name: "Wait", actions: [HaWaitAction.defaultConfig] },
|
||||||
{ name: "WaitForTrigger", actions: [HaWaitForTriggerAction.defaultConfig] },
|
{ name: "WaitForTrigger", actions: [HaWaitForTriggerAction.defaultConfig] },
|
||||||
{ name: "Repeat", actions: [HaRepeatAction.defaultConfig] },
|
{ name: "Repeat", actions: [HaRepeatAction.defaultConfig] },
|
||||||
|
{ name: "If-Then", actions: [HaIfAction.defaultConfig] },
|
||||||
{ name: "Choose", actions: [HaChooseAction.defaultConfig] },
|
{ name: "Choose", actions: [HaChooseAction.defaultConfig] },
|
||||||
{ name: "Variables", actions: [{ variables: { hello: "1" } }] },
|
{ name: "Variables", actions: [{ variables: { hello: "1" } }] },
|
||||||
|
{ name: "Parallel", actions: [HaParallelAction.defaultConfig] },
|
||||||
|
{ name: "Stop", actions: [HaStopAction.defaultConfig] },
|
||||||
];
|
];
|
||||||
|
|
||||||
@customElement("demo-automation-editor-action")
|
@customElement("demo-automation-editor-action")
|
||||||
@@ -86,6 +94,6 @@ class DemoHaAutomationEditorAction extends LitElement {
|
|||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
interface HTMLElementTagNameMap {
|
interface HTMLElementTagNameMap {
|
||||||
"demo-ha-automation-editor-action": DemoHaAutomationEditorAction;
|
"demo-automation-editor-action": DemoHaAutomationEditorAction;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -8,7 +8,7 @@ import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
|
|||||||
import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
|
import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
|
||||||
import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
|
import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
|
||||||
import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
|
import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
|
||||||
import type { Condition } from "../../../../src/data/automation";
|
import type { ConditionWithShorthand } from "../../../../src/data/automation";
|
||||||
import "../../../../src/panels/config/automation/condition/ha-automation-condition";
|
import "../../../../src/panels/config/automation/condition/ha-automation-condition";
|
||||||
import { HaDeviceCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-device";
|
import { HaDeviceCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-device";
|
||||||
import { HaLogicalCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-logical";
|
import { HaLogicalCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-logical";
|
||||||
@@ -20,7 +20,7 @@ import { HaTimeCondition } from "../../../../src/panels/config/automation/condit
|
|||||||
import { HaTriggerCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-trigger";
|
import { HaTriggerCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-trigger";
|
||||||
import { HaZoneCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-zone";
|
import { HaZoneCondition } from "../../../../src/panels/config/automation/condition/types/ha-automation-condition-zone";
|
||||||
|
|
||||||
const SCHEMAS: { name: string; conditions: Condition[] }[] = [
|
const SCHEMAS: { name: string; conditions: ConditionWithShorthand[] }[] = [
|
||||||
{
|
{
|
||||||
name: "State",
|
name: "State",
|
||||||
conditions: [{ condition: "state", ...HaStateCondition.defaultConfig }],
|
conditions: [{ condition: "state", ...HaStateCondition.defaultConfig }],
|
||||||
@@ -69,6 +69,14 @@ const SCHEMAS: { name: string; conditions: Condition[] }[] = [
|
|||||||
name: "Trigger",
|
name: "Trigger",
|
||||||
conditions: [{ condition: "trigger", ...HaTriggerCondition.defaultConfig }],
|
conditions: [{ condition: "trigger", ...HaTriggerCondition.defaultConfig }],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "Shorthand",
|
||||||
|
conditions: [
|
||||||
|
{ and: HaLogicalCondition.defaultConfig.conditions },
|
||||||
|
{ or: HaLogicalCondition.defaultConfig.conditions },
|
||||||
|
{ not: HaLogicalCondition.defaultConfig.conditions },
|
||||||
|
],
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
@customElement("demo-automation-editor-condition")
|
@customElement("demo-automation-editor-condition")
|
||||||
|
@@ -159,13 +159,19 @@ export class DemoHaAlert extends LitElement {
|
|||||||
|
|
||||||
firstUpdated(changedProps) {
|
firstUpdated(changedProps) {
|
||||||
super.firstUpdated(changedProps);
|
super.firstUpdated(changedProps);
|
||||||
applyThemesOnElement(this.shadowRoot!.querySelector(".dark"), {
|
applyThemesOnElement(
|
||||||
|
this.shadowRoot!.querySelector(".dark"),
|
||||||
|
{
|
||||||
default_theme: "default",
|
default_theme: "default",
|
||||||
default_dark_theme: "default",
|
default_dark_theme: "default",
|
||||||
themes: {},
|
themes: {},
|
||||||
darkMode: true,
|
darkMode: true,
|
||||||
theme: "default",
|
theme: "default",
|
||||||
});
|
},
|
||||||
|
undefined,
|
||||||
|
undefined,
|
||||||
|
true
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static get styles() {
|
static get styles() {
|
||||||
|
@@ -3,18 +3,7 @@ import { customElement } from "lit/decorators";
|
|||||||
import "../../../../src/components/ha-card";
|
import "../../../../src/components/ha-card";
|
||||||
import "../../../../src/components/ha-faded";
|
import "../../../../src/components/ha-faded";
|
||||||
import "../../../../src/components/ha-markdown";
|
import "../../../../src/components/ha-markdown";
|
||||||
|
import { LONG_TEXT } from "../../data/text";
|
||||||
const LONG_TEXT = `
|
|
||||||
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc laoreet velit ut elit volutpat, eget ultrices odio lacinia. In imperdiet malesuada est, nec sagittis metus ultricies quis. Sed nisl ex, convallis porttitor ante quis, hendrerit tristique justo. Mauris pharetra venenatis augue, eu maximus sem cursus in. Quisque sed consequat risus. Suspendisse facilisis ligula a odio consectetur condimentum. Curabitur vehicula elit nec augue mollis, et volutpat massa dictum.
|
|
||||||
|
|
||||||
Nam pellentesque auctor rutrum. Suspendisse elit est, sodales vel diam nec, porttitor faucibus massa. Ut pretium ac orci eu pharetra. Praesent in nibh at magna viverra rutrum eu vitae tortor. Etiam eget sem ex. Fusce tristique odio nec lacus mattis, vitae tempor nunc malesuada. Maecenas faucibus magna vel libero maximus egestas. Vestibulum luctus semper velit, in lobortis risus tempus non. Curabitur bibendum ornare commodo. Quisque commodo neque sit amet tincidunt lacinia. Proin elementum ante velit, eu congue nulla semper quis. Pellentesque consequat vel nunc at scelerisque. Mauris sit amet venenatis diam, blandit viverra leo. Integer commodo laoreet orci.
|
|
||||||
|
|
||||||
Curabitur ipsum tortor, sodales ut augue sed, commodo porttitor libero. Pellentesque molestie vitae mi consectetur tempor. In sed lectus consequat, lobortis neque non, semper ipsum. Etiam eget ex et nibh sagittis pulvinar lacinia ac mauris. Aenean ligula eros, viverra ac nibh at, venenatis semper quam. Sed interdum ligula sit amet massa tincidunt tincidunt. Suspendisse potenti. Aliquam egestas facilisis est, sed faucibus erat scelerisque id. Duis dolor quam, viverra vitae orci euismod, laoreet pellentesque justo. Nunc malesuada non erat at ullamcorper. Mauris eget posuere odio. Vestibulum turpis nunc, pharetra eget ante in, feugiat mollis justo. Proin porttitor, diam nec vulputate pretium, tellus arcu rhoncus turpis, a blandit nisi nulla quis arcu. Nunc ac ullamcorper ligula, nec facilisis leo.
|
|
||||||
|
|
||||||
In vitae eros sollicitudin, iaculis ex eget, egestas orci. Etiam sed pretium lorem. Nam nisi enim, consectetur sit amet semper ac, semper pharetra diam. In pulvinar neque sapien, ac ullamcorper est lacinia a. Etiam tincidunt velit sed diam malesuada, eu ornare ex consectetur. Phasellus in imperdiet tellus. Sed bibendum, dui sit amet fringilla aliquet, enim odio sollicitudin lorem, vel semper turpis mauris vel mauris. Aenean congue magna ac massa cursus, in dictum orci commodo. Pellentesque mollis velit in sollicitudin tincidunt. Vestibulum et efficitur nulla.
|
|
||||||
|
|
||||||
Quisque posuere, velit sed porttitor dapibus, neque augue fringilla felis, eu luctus nisi nisl nec ipsum. Curabitur pellentesque ac lectus eget ultricies. Vestibulum est dolor, lacinia pharetra vulputate a, facilisis a magna. Nam vitae arcu nibh. Praesent finibus blandit ante, ac gravida ex mollis eget. Donec quam est, pulvinar vitae neque ut, bibendum aliquam erat. Nullam mollis arcu at sem tincidunt, in tristique lectus facilisis. Aenean ut lacus vel nisl finibus iaculis non a turpis. Integer eget ipsum ante. Donec nunc neque, vestibulum ac magna ac, posuere scelerisque dui. Pellentesque massa nibh, rhoncus id dolor quis, placerat posuere turpis. Donec aliquet augue nisi, eu finibus dui auctor et. Vestibulum eu varius lorem. Quisque lectus ante, malesuada pretium risus eget, interdum mattis enim.
|
|
||||||
`;
|
|
||||||
|
|
||||||
const SMALL_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
|
const SMALL_TEXT = "Lorem ipsum dolor sit amet, consectetur adipiscing elit.";
|
||||||
|
|
||||||
|
@@ -1,18 +1,18 @@
|
|||||||
/* eslint-disable lit/no-template-arrow */
|
/* eslint-disable lit/no-template-arrow */
|
||||||
import "@material/mwc-button";
|
import "@material/mwc-button";
|
||||||
import { LitElement, TemplateResult, html } from "lit";
|
import { html, LitElement, TemplateResult } from "lit";
|
||||||
import { customElement, state } from "lit/decorators";
|
import { customElement, state } from "lit/decorators";
|
||||||
import { computeInitialHaFormData } from "../../../../src/components/ha-form/compute-initial-ha-form-data";
|
|
||||||
import type { HaFormSchema } from "../../../../src/components/ha-form/types";
|
|
||||||
import "../../../../src/components/ha-form/ha-form";
|
|
||||||
import "../../components/demo-black-white-row";
|
|
||||||
import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
|
import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
|
||||||
import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
|
import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
|
||||||
import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
|
import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
|
||||||
import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
|
import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
|
||||||
|
import { computeInitialHaFormData } from "../../../../src/components/ha-form/compute-initial-ha-form-data";
|
||||||
|
import "../../../../src/components/ha-form/ha-form";
|
||||||
|
import type { HaFormSchema } from "../../../../src/components/ha-form/types";
|
||||||
|
import { getEntity } from "../../../../src/fake_data/entity";
|
||||||
import { provideHass } from "../../../../src/fake_data/provide_hass";
|
import { provideHass } from "../../../../src/fake_data/provide_hass";
|
||||||
import { HomeAssistant } from "../../../../src/types";
|
import { HomeAssistant } from "../../../../src/types";
|
||||||
import { getEntity } from "../../../../src/fake_data/entity";
|
import "../../components/demo-black-white-row";
|
||||||
|
|
||||||
const ENTITIES = [
|
const ENTITIES = [
|
||||||
getEntity("alarm_control_panel", "alarm", "disarmed", {
|
getEntity("alarm_control_panel", "alarm", "disarmed", {
|
||||||
@@ -147,7 +147,9 @@ const SCHEMAS: {
|
|||||||
{ name: "target", selector: { target: {} } },
|
{ name: "target", selector: { target: {} } },
|
||||||
{ name: "number", selector: { number: { min: 0, max: 10 } } },
|
{ name: "number", selector: { number: { min: 0, max: 10 } } },
|
||||||
{ name: "boolean", selector: { boolean: {} } },
|
{ name: "boolean", selector: { boolean: {} } },
|
||||||
{ name: "time", selector: { time: {} } },
|
{ name: "time", required: true, selector: { time: {} } },
|
||||||
|
{ name: "datetime", required: true, selector: { datetime: {} } },
|
||||||
|
{ name: "date", required: true, selector: { date: {} } },
|
||||||
{ name: "action", selector: { action: {} } },
|
{ name: "action", selector: { action: {} } },
|
||||||
{ name: "text", selector: { text: { multiline: false } } },
|
{ name: "text", selector: { text: { multiline: false } } },
|
||||||
{ name: "text_multiline", selector: { text: { multiline: true } } },
|
{ name: "text_multiline", selector: { text: { multiline: true } } },
|
||||||
|
@@ -1,20 +1,20 @@
|
|||||||
/* eslint-disable lit/no-template-arrow */
|
/* eslint-disable lit/no-template-arrow */
|
||||||
import "@material/mwc-button";
|
import "@material/mwc-button";
|
||||||
import { LitElement, TemplateResult, css, html } from "lit";
|
import { css, html, LitElement, TemplateResult } from "lit";
|
||||||
import { customElement, state } from "lit/decorators";
|
import { customElement, state } from "lit/decorators";
|
||||||
|
import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
|
||||||
|
import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
|
||||||
|
import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
|
||||||
|
import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
|
||||||
import "../../../../src/components/ha-selector/ha-selector";
|
import "../../../../src/components/ha-selector/ha-selector";
|
||||||
import "../../../../src/components/ha-settings-row";
|
import "../../../../src/components/ha-settings-row";
|
||||||
|
import { BlueprintInput } from "../../../../src/data/blueprint";
|
||||||
|
import { showDialog } from "../../../../src/dialogs/make-dialog-manager";
|
||||||
|
import { getEntity } from "../../../../src/fake_data/entity";
|
||||||
import { provideHass } from "../../../../src/fake_data/provide_hass";
|
import { provideHass } from "../../../../src/fake_data/provide_hass";
|
||||||
|
import { ProvideHassElement } from "../../../../src/mixins/provide-hass-lit-mixin";
|
||||||
import type { HomeAssistant } from "../../../../src/types";
|
import type { HomeAssistant } from "../../../../src/types";
|
||||||
import "../../components/demo-black-white-row";
|
import "../../components/demo-black-white-row";
|
||||||
import { BlueprintInput } from "../../../../src/data/blueprint";
|
|
||||||
import { mockEntityRegistry } from "../../../../demo/src/stubs/entity_registry";
|
|
||||||
import { mockDeviceRegistry } from "../../../../demo/src/stubs/device_registry";
|
|
||||||
import { mockAreaRegistry } from "../../../../demo/src/stubs/area_registry";
|
|
||||||
import { mockHassioSupervisor } from "../../../../demo/src/stubs/hassio_supervisor";
|
|
||||||
import { getEntity } from "../../../../src/fake_data/entity";
|
|
||||||
import { ProvideHassElement } from "../../../../src/mixins/provide-hass-lit-mixin";
|
|
||||||
import { showDialog } from "../../../../src/dialogs/make-dialog-manager";
|
|
||||||
|
|
||||||
const ENTITIES = [
|
const ENTITIES = [
|
||||||
getEntity("alarm_control_panel", "alarm", "disarmed", {
|
getEntity("alarm_control_panel", "alarm", "disarmed", {
|
||||||
@@ -109,7 +109,7 @@ const AREAS = [
|
|||||||
|
|
||||||
const SCHEMAS: {
|
const SCHEMAS: {
|
||||||
name: string;
|
name: string;
|
||||||
input: Record<string, BlueprintInput | null>;
|
input: Record<string, (BlueprintInput & { required?: boolean }) | null>;
|
||||||
}[] = [
|
}[] = [
|
||||||
{
|
{
|
||||||
name: "One of each",
|
name: "One of each",
|
||||||
@@ -166,8 +166,11 @@ const SCHEMAS: {
|
|||||||
object: { name: "Object", selector: { object: {} } },
|
object: { name: "Object", selector: { object: {} } },
|
||||||
select_radio: {
|
select_radio: {
|
||||||
name: "Select (Radio)",
|
name: "Select (Radio)",
|
||||||
selector: { select: { options: ["Option 1", "Option 2"] } },
|
selector: {
|
||||||
|
select: { options: ["Option 1", "Option 2"], mode: "list" },
|
||||||
},
|
},
|
||||||
|
},
|
||||||
|
template: { name: "Template", selector: { template: {} } },
|
||||||
select: {
|
select: {
|
||||||
name: "Select",
|
name: "Select",
|
||||||
selector: {
|
selector: {
|
||||||
@@ -183,6 +186,22 @@ const SCHEMAS: {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
select_custom: {
|
||||||
|
name: "Select (Custom)",
|
||||||
|
selector: {
|
||||||
|
select: {
|
||||||
|
custom_value: true,
|
||||||
|
options: [
|
||||||
|
"Option 1",
|
||||||
|
"Option 2",
|
||||||
|
"Option 3",
|
||||||
|
"Option 4",
|
||||||
|
"Option 5",
|
||||||
|
"Option 6",
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
icon: { name: "Icon", selector: { icon: {} } },
|
icon: { name: "Icon", selector: { icon: {} } },
|
||||||
media: { name: "Media", selector: { media: {} } },
|
media: { name: "Media", selector: { media: {} } },
|
||||||
location: { name: "Location", selector: { location: {} } },
|
location: { name: "Location", selector: { location: {} } },
|
||||||
@@ -202,6 +221,35 @@ const SCHEMAS: {
|
|||||||
input: {
|
input: {
|
||||||
entity: { name: "Entity", selector: { entity: { multiple: true } } },
|
entity: { name: "Entity", selector: { entity: { multiple: true } } },
|
||||||
device: { name: "Device", selector: { device: { multiple: true } } },
|
device: { name: "Device", selector: { device: { multiple: true } } },
|
||||||
|
area: { name: "Area", selector: { area: { multiple: true } } },
|
||||||
|
select: {
|
||||||
|
name: "Select Multiple",
|
||||||
|
selector: {
|
||||||
|
select: {
|
||||||
|
multiple: true,
|
||||||
|
custom_value: true,
|
||||||
|
options: [
|
||||||
|
"Option 1",
|
||||||
|
"Option 2",
|
||||||
|
"Option 3",
|
||||||
|
"Option 4",
|
||||||
|
"Option 5",
|
||||||
|
"Option 6",
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
select_checkbox: {
|
||||||
|
name: "Select Multiple (Checkbox)",
|
||||||
|
required: false,
|
||||||
|
selector: {
|
||||||
|
select: {
|
||||||
|
mode: "list",
|
||||||
|
multiple: true,
|
||||||
|
options: ["Option 1", "Option 2", "Option 3", "Option 4"],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
@@ -210,6 +258,14 @@ const SCHEMAS: {
|
|||||||
class DemoHaSelector extends LitElement implements ProvideHassElement {
|
class DemoHaSelector extends LitElement implements ProvideHassElement {
|
||||||
@state() public hass!: HomeAssistant;
|
@state() public hass!: HomeAssistant;
|
||||||
|
|
||||||
|
@state() private _disabled = false;
|
||||||
|
|
||||||
|
@state() private _required = false;
|
||||||
|
|
||||||
|
@state() private _helper = false;
|
||||||
|
|
||||||
|
@state() private _label = true;
|
||||||
|
|
||||||
private data = SCHEMAS.map(() => ({}));
|
private data = SCHEMAS.map(() => ({}));
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
@@ -343,6 +399,36 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
|
|||||||
|
|
||||||
protected render(): TemplateResult {
|
protected render(): TemplateResult {
|
||||||
return html`
|
return html`
|
||||||
|
<div class="options">
|
||||||
|
<ha-formfield label="Labels">
|
||||||
|
<ha-switch
|
||||||
|
.name=${"label"}
|
||||||
|
.checked=${this._label}
|
||||||
|
@change=${this._handleOptionChange}
|
||||||
|
></ha-switch>
|
||||||
|
</ha-formfield>
|
||||||
|
<ha-formfield label="Required">
|
||||||
|
<ha-switch
|
||||||
|
.name=${"required"}
|
||||||
|
.checked=${this._required}
|
||||||
|
@change=${this._handleOptionChange}
|
||||||
|
></ha-switch>
|
||||||
|
</ha-formfield>
|
||||||
|
<ha-formfield label="Disabled">
|
||||||
|
<ha-switch
|
||||||
|
.name=${"disabled"}
|
||||||
|
.checked=${this._disabled}
|
||||||
|
@change=${this._handleOptionChange}
|
||||||
|
></ha-switch>
|
||||||
|
</ha-formfield>
|
||||||
|
<ha-formfield label="Helper text">
|
||||||
|
<ha-switch
|
||||||
|
.name=${"helper"}
|
||||||
|
.checked=${this._helper}
|
||||||
|
@change=${this._handleOptionChange}
|
||||||
|
></ha-switch>
|
||||||
|
</ha-formfield>
|
||||||
|
</div>
|
||||||
${SCHEMAS.map((info, idx) => {
|
${SCHEMAS.map((info, idx) => {
|
||||||
const data = this.data[idx];
|
const data = this.data[idx];
|
||||||
const valueChanged = (ev) => {
|
const valueChanged = (ev) => {
|
||||||
@@ -365,8 +451,12 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
|
|||||||
.hass=${this.hass}
|
.hass=${this.hass}
|
||||||
.selector=${value!.selector}
|
.selector=${value!.selector}
|
||||||
.key=${key}
|
.key=${key}
|
||||||
|
.label=${this._label ? value!.name : undefined}
|
||||||
.value=${data[key] ?? value!.default}
|
.value=${data[key] ?? value!.default}
|
||||||
|
.disabled=${this._disabled}
|
||||||
|
.required=${this._required}
|
||||||
@value-changed=${valueChanged}
|
@value-changed=${valueChanged}
|
||||||
|
.helper=${this._helper ? "Helper text" : undefined}
|
||||||
></ha-selector>
|
></ha-selector>
|
||||||
</ha-settings-row>
|
</ha-settings-row>
|
||||||
`
|
`
|
||||||
@@ -378,10 +468,21 @@ class DemoHaSelector extends LitElement implements ProvideHassElement {
|
|||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private _handleOptionChange(ev) {
|
||||||
|
this[`_${ev.target.name}`] = ev.target.checked;
|
||||||
|
}
|
||||||
|
|
||||||
static styles = css`
|
static styles = css`
|
||||||
ha-selector {
|
ha-selector {
|
||||||
width: 60;
|
width: 60;
|
||||||
}
|
}
|
||||||
|
.options {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 16px auto;
|
||||||
|
}
|
||||||
|
.options ha-formfield {
|
||||||
|
margin-right: 16px;
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
3
gallery/src/pages/components/ha-tip.markdown
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
---
|
||||||
|
title: Tips
|
||||||
|
---
|
73
gallery/src/pages/components/ha-tip.ts
Normal file
@@ -0,0 +1,73 @@
|
|||||||
|
import { html, css, LitElement, TemplateResult } from "lit";
|
||||||
|
import { customElement } from "lit/decorators";
|
||||||
|
import "../../../../src/components/ha-tip";
|
||||||
|
import "../../../../src/components/ha-card";
|
||||||
|
import { applyThemesOnElement } from "../../../../src/common/dom/apply_themes_on_element";
|
||||||
|
|
||||||
|
const tips: (string | TemplateResult)[] = [
|
||||||
|
"Test tip",
|
||||||
|
"Bigger test tip, with some random text just to fill up as much space as possible without it looking like I'm really trying to to that",
|
||||||
|
html`<i>Tip</i> <b>with</b> <sub>HTML</sub>`,
|
||||||
|
];
|
||||||
|
|
||||||
|
@customElement("demo-components-ha-tip")
|
||||||
|
export class DemoHaTip extends LitElement {
|
||||||
|
protected render(): TemplateResult {
|
||||||
|
return html` ${["light", "dark"].map(
|
||||||
|
(mode) => html`
|
||||||
|
<div class=${mode}>
|
||||||
|
<ha-card header="ha-tip ${mode} demo">
|
||||||
|
<div class="card-content">
|
||||||
|
${tips.map((tip) => html`<ha-tip>${tip}</ha-tip>`)}
|
||||||
|
</div>
|
||||||
|
</ha-card>
|
||||||
|
</div>
|
||||||
|
`
|
||||||
|
)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
firstUpdated(changedProps) {
|
||||||
|
super.firstUpdated(changedProps);
|
||||||
|
applyThemesOnElement(
|
||||||
|
this.shadowRoot!.querySelector(".dark"),
|
||||||
|
{
|
||||||
|
default_theme: "default",
|
||||||
|
default_dark_theme: "default",
|
||||||
|
themes: {},
|
||||||
|
darkMode: true,
|
||||||
|
theme: "default",
|
||||||
|
},
|
||||||
|
undefined,
|
||||||
|
undefined,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static get styles() {
|
||||||
|
return css`
|
||||||
|
:host {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
justify-content: space-between;
|
||||||
|
}
|
||||||
|
.dark,
|
||||||
|
.light {
|
||||||
|
display: block;
|
||||||
|
background-color: var(--primary-background-color);
|
||||||
|
padding: 0 50px;
|
||||||
|
}
|
||||||
|
ha-tip {
|
||||||
|
margin-bottom: 14px;
|
||||||
|
}
|
||||||
|
ha-card {
|
||||||
|
margin: 24px auto;
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
declare global {
|
||||||
|
interface HTMLElementTagNameMap {
|
||||||
|
"demo-components-ha-tip": DemoHaTip;
|
||||||
|
}
|
||||||
|
}
|
@@ -249,7 +249,7 @@ const CONFIGS = [
|
|||||||
name: Bed light
|
name: Bed light
|
||||||
action_name: Toggle light
|
action_name: Toggle light
|
||||||
service: light.toggle
|
service: light.toggle
|
||||||
service_data:
|
data:
|
||||||
entity_id: light.bed_light
|
entity_id: light.bed_light
|
||||||
- type: section
|
- type: section
|
||||||
label: Links
|
label: Links
|
||||||
|
@@ -199,7 +199,7 @@ const CONFIGS = [
|
|||||||
tap_action:
|
tap_action:
|
||||||
action: call-service
|
action: call-service
|
||||||
service: light.turn_on
|
service: light.turn_on
|
||||||
service_data:
|
data:
|
||||||
entity_id: light.ceiling_lights
|
entity_id: light.ceiling_lights
|
||||||
- entity: sun.sun
|
- entity: sun.sun
|
||||||
name: Regular
|
name: Regular
|
||||||
|
@@ -9,7 +9,7 @@ const CONFIGS = [
|
|||||||
heading: "markdown-it demo",
|
heading: "markdown-it demo",
|
||||||
config: `
|
config: `
|
||||||
- type: markdown
|
- type: markdown
|
||||||
content: >
|
content: >-
|
||||||
# h1 Heading 8-)
|
# h1 Heading 8-)
|
||||||
|
|
||||||
## h2 Heading
|
## h2 Heading
|
||||||
@@ -249,6 +249,17 @@ const CONFIGS = [
|
|||||||
::: warning
|
::: warning
|
||||||
*here be dragons*
|
*here be dragons*
|
||||||
:::
|
:::
|
||||||
|
|
||||||
|
### ha-alert
|
||||||
|
|
||||||
|
You can use our [\`ha-alert\`](https://design.home-assistant.io/#components/ha-alert) component in markdown content rendered in the Home Assistant Frontend.
|
||||||
|
|
||||||
|
<ha-alert alert-type="error">This is an error alert — check it out!</ha-alert>
|
||||||
|
<ha-alert alert-type="warning">This is a warning alert — check it out!</ha-alert>
|
||||||
|
<ha-alert alert-type="info">This is an info alert — check it out!</ha-alert>
|
||||||
|
<ha-alert alert-type="success">This is a success alert — check it out!</ha-alert>
|
||||||
|
<ha-alert title="Test alert">This is an alert with a title</ha-alert>
|
||||||
|
|
||||||
`,
|
`,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
@@ -40,7 +40,7 @@ const CONFIGS = [
|
|||||||
left: 90%
|
left: 90%
|
||||||
padding: 0px
|
padding: 0px
|
||||||
service: light.turn_off
|
service: light.turn_off
|
||||||
service_data:
|
data:
|
||||||
entity_id: group.all_lights
|
entity_id: group.all_lights
|
||||||
- type: icon
|
- type: icon
|
||||||
icon: mdi:cctv
|
icon: mdi:cctv
|
||||||
@@ -88,7 +88,7 @@ const CONFIGS = [
|
|||||||
left: 90%
|
left: 90%
|
||||||
padding: 0px
|
padding: 0px
|
||||||
service: light.turn_off
|
service: light.turn_off
|
||||||
service_data:
|
data:
|
||||||
entity_id: group.all_lights
|
entity_id: group.all_lights
|
||||||
- type: icon
|
- type: icon
|
||||||
icon: mdi:cctv
|
icon: mdi:cctv
|
||||||
|
@@ -5,6 +5,7 @@ import {
|
|||||||
UPDATE_SUPPORT_BACKUP,
|
UPDATE_SUPPORT_BACKUP,
|
||||||
UPDATE_SUPPORT_PROGRESS,
|
UPDATE_SUPPORT_PROGRESS,
|
||||||
UPDATE_SUPPORT_INSTALL,
|
UPDATE_SUPPORT_INSTALL,
|
||||||
|
UPDATE_SUPPORT_RELEASE_NOTES,
|
||||||
} from "../../../../src/data/update";
|
} from "../../../../src/data/update";
|
||||||
import "../../../../src/dialogs/more-info/more-info-content";
|
import "../../../../src/dialogs/more-info/more-info-content";
|
||||||
import { getEntity } from "../../../../src/fake_data/entity";
|
import { getEntity } from "../../../../src/fake_data/entity";
|
||||||
@@ -13,10 +14,11 @@ import {
|
|||||||
provideHass,
|
provideHass,
|
||||||
} from "../../../../src/fake_data/provide_hass";
|
} from "../../../../src/fake_data/provide_hass";
|
||||||
import "../../components/demo-more-infos";
|
import "../../components/demo-more-infos";
|
||||||
|
import { LONG_TEXT } from "../../data/text";
|
||||||
|
|
||||||
const base_attributes = {
|
const base_attributes = {
|
||||||
title: "Awesome",
|
title: "Awesome",
|
||||||
current_version: "1.2.2",
|
installed_version: "1.2.2",
|
||||||
latest_version: "1.2.3",
|
latest_version: "1.2.3",
|
||||||
release_url: "https://home-assistant.io",
|
release_url: "https://home-assistant.io",
|
||||||
supported_features: UPDATE_SUPPORT_INSTALL,
|
supported_features: UPDATE_SUPPORT_INSTALL,
|
||||||
@@ -48,7 +50,7 @@ const ENTITIES = [
|
|||||||
}),
|
}),
|
||||||
getEntity("update", "update5", "off", {
|
getEntity("update", "update5", "off", {
|
||||||
...base_attributes,
|
...base_attributes,
|
||||||
current_version: "1.2.3",
|
installed_version: "1.2.3",
|
||||||
friendly_name: "No update",
|
friendly_name: "No update",
|
||||||
}),
|
}),
|
||||||
getEntity("update", "update6", "off", {
|
getEntity("update", "update6", "off", {
|
||||||
@@ -100,14 +102,43 @@ const ENTITIES = [
|
|||||||
}),
|
}),
|
||||||
getEntity("update", "update14", "off", {
|
getEntity("update", "update14", "off", {
|
||||||
...base_attributes,
|
...base_attributes,
|
||||||
current_version: null,
|
installed_version: null,
|
||||||
friendly_name: "Update without current_version",
|
friendly_name: "Update without installed_version",
|
||||||
}),
|
}),
|
||||||
getEntity("update", "update15", "off", {
|
getEntity("update", "update15", "off", {
|
||||||
...base_attributes,
|
...base_attributes,
|
||||||
latest_version: null,
|
latest_version: null,
|
||||||
friendly_name: "Update without latest_version",
|
friendly_name: "Update without latest_version",
|
||||||
}),
|
}),
|
||||||
|
getEntity("update", "update16", "off", {
|
||||||
|
...base_attributes,
|
||||||
|
friendly_name: "Update with release notes",
|
||||||
|
supported_features:
|
||||||
|
base_attributes.supported_features + UPDATE_SUPPORT_RELEASE_NOTES,
|
||||||
|
}),
|
||||||
|
getEntity("update", "update17", "off", {
|
||||||
|
...base_attributes,
|
||||||
|
friendly_name: "Update with release notes error",
|
||||||
|
supported_features:
|
||||||
|
base_attributes.supported_features + UPDATE_SUPPORT_RELEASE_NOTES,
|
||||||
|
}),
|
||||||
|
getEntity("update", "update18", "off", {
|
||||||
|
...base_attributes,
|
||||||
|
friendly_name: "Update with release notes loading",
|
||||||
|
supported_features:
|
||||||
|
base_attributes.supported_features + UPDATE_SUPPORT_RELEASE_NOTES,
|
||||||
|
}),
|
||||||
|
getEntity("update", "update19", "on", {
|
||||||
|
...base_attributes,
|
||||||
|
friendly_name: "Update with auto update",
|
||||||
|
auto_update: true,
|
||||||
|
}),
|
||||||
|
getEntity("update", "update20", "on", {
|
||||||
|
...base_attributes,
|
||||||
|
in_progress: true,
|
||||||
|
title: undefined,
|
||||||
|
friendly_name: "Installing without title",
|
||||||
|
}),
|
||||||
];
|
];
|
||||||
|
|
||||||
@customElement("demo-more-info-update")
|
@customElement("demo-more-info-update")
|
||||||
@@ -130,6 +161,24 @@ class DemoMoreInfoUpdate extends LitElement {
|
|||||||
const hass = provideHass(this._demoRoot);
|
const hass = provideHass(this._demoRoot);
|
||||||
hass.updateTranslations(null, "en");
|
hass.updateTranslations(null, "en");
|
||||||
hass.addEntities(ENTITIES);
|
hass.addEntities(ENTITIES);
|
||||||
|
hass.mockWS(
|
||||||
|
"update/release_notes",
|
||||||
|
(msg: { type: string; entity_id: string }) => {
|
||||||
|
if (msg.entity_id === "update.update16") {
|
||||||
|
return LONG_TEXT;
|
||||||
|
}
|
||||||
|
if (msg.entity_id === "update.update17") {
|
||||||
|
return Promise.reject({
|
||||||
|
code: "error",
|
||||||
|
message: "Could not fetch release notes",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (msg.entity_id === "update.update18") {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -6,10 +6,8 @@ import { atLeastVersion } from "../../../src/common/config/version";
|
|||||||
import { navigate } from "../../../src/common/navigate";
|
import { navigate } from "../../../src/common/navigate";
|
||||||
import { caseInsensitiveStringCompare } from "../../../src/common/string/compare";
|
import { caseInsensitiveStringCompare } from "../../../src/common/string/compare";
|
||||||
import "../../../src/components/ha-card";
|
import "../../../src/components/ha-card";
|
||||||
import {
|
import { HassioAddonRepository } from "../../../src/data/hassio/addon";
|
||||||
HassioAddonInfo,
|
import { StoreAddon } from "../../../src/data/supervisor/store";
|
||||||
HassioAddonRepository,
|
|
||||||
} from "../../../src/data/hassio/addon";
|
|
||||||
import { Supervisor } from "../../../src/data/supervisor/supervisor";
|
import { Supervisor } from "../../../src/data/supervisor/supervisor";
|
||||||
import { HomeAssistant } from "../../../src/types";
|
import { HomeAssistant } from "../../../src/types";
|
||||||
import "../components/hassio-card-content";
|
import "../components/hassio-card-content";
|
||||||
@@ -23,20 +21,16 @@ class HassioAddonRepositoryEl extends LitElement {
|
|||||||
|
|
||||||
@property({ attribute: false }) public repo!: HassioAddonRepository;
|
@property({ attribute: false }) public repo!: HassioAddonRepository;
|
||||||
|
|
||||||
@property({ attribute: false }) public addons!: HassioAddonInfo[];
|
@property({ attribute: false }) public addons!: StoreAddon[];
|
||||||
|
|
||||||
@property() public filter!: string;
|
@property() public filter!: string;
|
||||||
|
|
||||||
private _getAddons = memoizeOne(
|
private _getAddons = memoizeOne((addons: StoreAddon[], filter?: string) => {
|
||||||
(addons: HassioAddonInfo[], filter?: string) => {
|
|
||||||
if (filter) {
|
if (filter) {
|
||||||
return filterAndSort(addons, filter);
|
return filterAndSort(addons, filter);
|
||||||
}
|
}
|
||||||
return addons.sort((a, b) =>
|
return addons.sort((a, b) => caseInsensitiveStringCompare(a.name, b.name));
|
||||||
caseInsensitiveStringCompare(a.name, b.name)
|
});
|
||||||
);
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
protected render(): TemplateResult {
|
protected render(): TemplateResult {
|
||||||
const repo = this.repo;
|
const repo = this.repo;
|
||||||
@@ -68,6 +62,7 @@ class HassioAddonRepositoryEl extends LitElement {
|
|||||||
${addons.map(
|
${addons.map(
|
||||||
(addon) => html`
|
(addon) => html`
|
||||||
<ha-card
|
<ha-card
|
||||||
|
outlined
|
||||||
.addon=${addon}
|
.addon=${addon}
|
||||||
class=${addon.available ? "" : "not_available"}
|
class=${addon.available ? "" : "not_available"}
|
||||||
@click=${this._addonTapped}
|
@click=${this._addonTapped}
|
||||||
|
@@ -14,15 +14,15 @@ import memoizeOne from "memoize-one";
|
|||||||
import { atLeastVersion } from "../../../src/common/config/version";
|
import { atLeastVersion } from "../../../src/common/config/version";
|
||||||
import { fireEvent } from "../../../src/common/dom/fire_event";
|
import { fireEvent } from "../../../src/common/dom/fire_event";
|
||||||
import { navigate } from "../../../src/common/navigate";
|
import { navigate } from "../../../src/common/navigate";
|
||||||
import "../../../src/components/search-input";
|
|
||||||
import { extractSearchParam } from "../../../src/common/url/search-params";
|
import { extractSearchParam } from "../../../src/common/url/search-params";
|
||||||
import "../../../src/components/ha-button-menu";
|
import "../../../src/components/ha-button-menu";
|
||||||
import "../../../src/components/ha-icon-button";
|
import "../../../src/components/ha-icon-button";
|
||||||
|
import "../../../src/components/search-input";
|
||||||
import {
|
import {
|
||||||
HassioAddonInfo,
|
|
||||||
HassioAddonRepository,
|
HassioAddonRepository,
|
||||||
reloadHassioAddons,
|
reloadHassioAddons,
|
||||||
} from "../../../src/data/hassio/addon";
|
} from "../../../src/data/hassio/addon";
|
||||||
|
import { StoreAddon } from "../../../src/data/supervisor/store";
|
||||||
import { Supervisor } from "../../../src/data/supervisor/supervisor";
|
import { Supervisor } from "../../../src/data/supervisor/supervisor";
|
||||||
import "../../../src/layouts/hass-loading-screen";
|
import "../../../src/layouts/hass-loading-screen";
|
||||||
import "../../../src/layouts/hass-subpage";
|
import "../../../src/layouts/hass-subpage";
|
||||||
@@ -66,10 +66,10 @@ class HassioAddonStore extends LitElement {
|
|||||||
protected render(): TemplateResult {
|
protected render(): TemplateResult {
|
||||||
let repos: TemplateResult[] = [];
|
let repos: TemplateResult[] = [];
|
||||||
|
|
||||||
if (this.supervisor.addon.repositories) {
|
if (this.supervisor.store.repositories) {
|
||||||
repos = this.addonRepositories(
|
repos = this.addonRepositories(
|
||||||
this.supervisor.addon.repositories,
|
this.supervisor.store.repositories,
|
||||||
this.supervisor.addon.addons,
|
this.supervisor.store.addons,
|
||||||
this._filter
|
this._filter
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -145,7 +145,7 @@ class HassioAddonStore extends LitElement {
|
|||||||
private addonRepositories = memoizeOne(
|
private addonRepositories = memoizeOne(
|
||||||
(
|
(
|
||||||
repositories: HassioAddonRepository[],
|
repositories: HassioAddonRepository[],
|
||||||
addons: HassioAddonInfo[],
|
addons: StoreAddon[],
|
||||||
filter?: string
|
filter?: string
|
||||||
) =>
|
) =>
|
||||||
repositories.sort(sortRepos).map((repo) => {
|
repositories.sort(sortRepos).map((repo) => {
|
||||||
|
@@ -50,6 +50,7 @@ class HassioAddonAudio extends LitElement {
|
|||||||
protected render(): TemplateResult {
|
protected render(): TemplateResult {
|
||||||
return html`
|
return html`
|
||||||
<ha-card
|
<ha-card
|
||||||
|
outlined
|
||||||
.header=${this.supervisor.localize("addon.configuration.audio.header")}
|
.header=${this.supervisor.localize("addon.configuration.audio.header")}
|
||||||
>
|
>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
|
@@ -39,7 +39,14 @@ import type { HomeAssistant } from "../../../../src/types";
|
|||||||
import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
|
import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
|
||||||
import { hassioStyle } from "../../resources/hassio-style";
|
import { hassioStyle } from "../../resources/hassio-style";
|
||||||
|
|
||||||
const SUPPORTED_UI_TYPES = ["string", "select", "boolean", "integer", "float"];
|
const SUPPORTED_UI_TYPES = [
|
||||||
|
"string",
|
||||||
|
"select",
|
||||||
|
"boolean",
|
||||||
|
"integer",
|
||||||
|
"float",
|
||||||
|
"schema",
|
||||||
|
];
|
||||||
|
|
||||||
const ADDON_YAML_SCHEMA = DEFAULT_SCHEMA.extend([
|
const ADDON_YAML_SCHEMA = DEFAULT_SCHEMA.extend([
|
||||||
new Type("!secret", {
|
new Type("!secret", {
|
||||||
@@ -48,6 +55,8 @@ const ADDON_YAML_SCHEMA = DEFAULT_SCHEMA.extend([
|
|||||||
}),
|
}),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
const MASKED_FIELDS = ["password", "secret", "token"];
|
||||||
|
|
||||||
@customElement("hassio-addon-config")
|
@customElement("hassio-addon-config")
|
||||||
class HassioAddonConfig extends LitElement {
|
class HassioAddonConfig extends LitElement {
|
||||||
@property({ attribute: false }) public addon!: HassioAddonDetails;
|
@property({ attribute: false }) public addon!: HassioAddonDetails;
|
||||||
@@ -75,16 +84,63 @@ class HassioAddonConfig extends LitElement {
|
|||||||
public computeLabel = (entry: HaFormSchema): string =>
|
public computeLabel = (entry: HaFormSchema): string =>
|
||||||
this.addon.translations[this.hass.language]?.configuration?.[entry.name]
|
this.addon.translations[this.hass.language]?.configuration?.[entry.name]
|
||||||
?.name ||
|
?.name ||
|
||||||
this.addon.translations.en?.configuration?.[entry.name].name ||
|
this.addon.translations.en?.configuration?.[entry.name]?.name ||
|
||||||
entry.name;
|
entry.name;
|
||||||
|
|
||||||
private _schema = memoizeOne((schema: HaFormSchema[]): HaFormSchema[] =>
|
public computeHelper = (entry: HaFormSchema): string =>
|
||||||
// @ts-expect-error supervisor does not implement [string, string] for select.options[]
|
this.addon.translations[this.hass.language]?.configuration?.[entry.name]
|
||||||
|
?.description ||
|
||||||
|
this.addon.translations.en?.configuration?.[entry.name]?.description ||
|
||||||
|
"";
|
||||||
|
|
||||||
|
private _convertSchema = memoizeOne(
|
||||||
|
// Convert supervisor schema to selectors
|
||||||
|
(schema: Record<string, any>): HaFormSchema[] =>
|
||||||
schema.map((entry) =>
|
schema.map((entry) =>
|
||||||
entry.type === "select"
|
entry.type === "select"
|
||||||
? {
|
? {
|
||||||
...entry,
|
name: entry.name,
|
||||||
options: entry.options.map((option) => [option, option]),
|
required: entry.required,
|
||||||
|
selector: { select: { options: entry.options } },
|
||||||
|
}
|
||||||
|
: entry.type === "string"
|
||||||
|
? entry.multiple
|
||||||
|
? {
|
||||||
|
name: entry.name,
|
||||||
|
required: entry.required,
|
||||||
|
selector: {
|
||||||
|
select: { options: [], multiple: true, custom_value: true },
|
||||||
|
},
|
||||||
|
}
|
||||||
|
: {
|
||||||
|
name: entry.name,
|
||||||
|
required: entry.required,
|
||||||
|
selector: {
|
||||||
|
text: {
|
||||||
|
type:
|
||||||
|
entry.format || MASKED_FIELDS.includes(entry.name)
|
||||||
|
? "password"
|
||||||
|
: "text",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
: entry.type === "boolean"
|
||||||
|
? {
|
||||||
|
name: entry.name,
|
||||||
|
required: entry.required,
|
||||||
|
selector: { boolean: {} },
|
||||||
|
}
|
||||||
|
: entry.type === "schema"
|
||||||
|
? {
|
||||||
|
name: entry.name,
|
||||||
|
required: entry.required,
|
||||||
|
selector: { object: {} },
|
||||||
|
}
|
||||||
|
: entry.type === "float" || entry.type === "integer"
|
||||||
|
? {
|
||||||
|
name: entry.name,
|
||||||
|
required: entry.required,
|
||||||
|
selector: { number: { mode: "box" } },
|
||||||
}
|
}
|
||||||
: entry
|
: entry
|
||||||
)
|
)
|
||||||
@@ -106,7 +162,7 @@ class HassioAddonConfig extends LitElement {
|
|||||||
);
|
);
|
||||||
return html`
|
return html`
|
||||||
<h1>${this.addon.name}</h1>
|
<h1>${this.addon.name}</h1>
|
||||||
<ha-card>
|
<ha-card outlined>
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<h2>
|
<h2>
|
||||||
${this.supervisor.localize("addon.configuration.options.header")}
|
${this.supervisor.localize("addon.configuration.options.header")}
|
||||||
@@ -140,7 +196,8 @@ class HassioAddonConfig extends LitElement {
|
|||||||
.data=${this._options!}
|
.data=${this._options!}
|
||||||
@value-changed=${this._configChanged}
|
@value-changed=${this._configChanged}
|
||||||
.computeLabel=${this.computeLabel}
|
.computeLabel=${this.computeLabel}
|
||||||
.schema=${this._schema(
|
.computeHelper=${this.computeHelper}
|
||||||
|
.schema=${this._convertSchema(
|
||||||
this._showOptional
|
this._showOptional
|
||||||
? this.addon.schema!
|
? this.addon.schema!
|
||||||
: this._filteredShchema(
|
: this._filteredShchema(
|
||||||
@@ -197,8 +254,9 @@ class HassioAddonConfig extends LitElement {
|
|||||||
protected firstUpdated(changedProps) {
|
protected firstUpdated(changedProps) {
|
||||||
super.firstUpdated(changedProps);
|
super.firstUpdated(changedProps);
|
||||||
this._canShowSchema = !this.addon.schema!.find(
|
this._canShowSchema = !this.addon.schema!.find(
|
||||||
|
(entry) =>
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
(entry) => !SUPPORTED_UI_TYPES.includes(entry.type) || entry.multiple
|
!SUPPORTED_UI_TYPES.includes(entry.type)
|
||||||
);
|
);
|
||||||
this._yamlMode = !this._canShowSchema;
|
this._yamlMode = !this._canShowSchema;
|
||||||
}
|
}
|
||||||
|
@@ -1,4 +1,3 @@
|
|||||||
import { PaperInputElement } from "@polymer/paper-input/paper-input";
|
|
||||||
import {
|
import {
|
||||||
css,
|
css,
|
||||||
CSSResultGroup,
|
CSSResultGroup,
|
||||||
@@ -8,10 +7,13 @@ import {
|
|||||||
TemplateResult,
|
TemplateResult,
|
||||||
} from "lit";
|
} from "lit";
|
||||||
import { customElement, property, state } from "lit/decorators";
|
import { customElement, property, state } from "lit/decorators";
|
||||||
|
import memoizeOne from "memoize-one";
|
||||||
import { fireEvent } from "../../../../src/common/dom/fire_event";
|
import { fireEvent } from "../../../../src/common/dom/fire_event";
|
||||||
import "../../../../src/components/buttons/ha-progress-button";
|
import "../../../../src/components/buttons/ha-progress-button";
|
||||||
import "../../../../src/components/ha-alert";
|
import "../../../../src/components/ha-alert";
|
||||||
import "../../../../src/components/ha-card";
|
import "../../../../src/components/ha-card";
|
||||||
|
import "../../../../src/components/ha-form/ha-form";
|
||||||
|
import type { HaFormSchema } from "../../../../src/components/ha-form/types";
|
||||||
import {
|
import {
|
||||||
HassioAddonDetails,
|
HassioAddonDetails,
|
||||||
HassioAddonSetOptionParams,
|
HassioAddonSetOptionParams,
|
||||||
@@ -24,16 +26,6 @@ import { HomeAssistant } from "../../../../src/types";
|
|||||||
import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
|
import { suggestAddonRestart } from "../../dialogs/suggestAddonRestart";
|
||||||
import { hassioStyle } from "../../resources/hassio-style";
|
import { hassioStyle } from "../../resources/hassio-style";
|
||||||
|
|
||||||
interface NetworkItem {
|
|
||||||
description: string;
|
|
||||||
container: string;
|
|
||||||
host: number | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface NetworkItemInput extends PaperInputElement {
|
|
||||||
container: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
@customElement("hassio-addon-network")
|
@customElement("hassio-addon-network")
|
||||||
class HassioAddonNetwork extends LitElement {
|
class HassioAddonNetwork extends LitElement {
|
||||||
@property({ attribute: false }) public hass!: HomeAssistant;
|
@property({ attribute: false }) public hass!: HomeAssistant;
|
||||||
@@ -42,9 +34,13 @@ class HassioAddonNetwork extends LitElement {
|
|||||||
|
|
||||||
@property({ attribute: false }) public addon!: HassioAddonDetails;
|
@property({ attribute: false }) public addon!: HassioAddonDetails;
|
||||||
|
|
||||||
|
@state() private _showOptional = false;
|
||||||
|
|
||||||
|
@state() private _configHasChanged = false;
|
||||||
|
|
||||||
@state() private _error?: string;
|
@state() private _error?: string;
|
||||||
|
|
||||||
@state() private _config?: NetworkItem[];
|
@state() private _config?: Record<string, any>;
|
||||||
|
|
||||||
public connectedCallback(): void {
|
public connectedCallback(): void {
|
||||||
super.connectedCallback();
|
super.connectedCallback();
|
||||||
@@ -56,59 +52,61 @@ class HassioAddonNetwork extends LitElement {
|
|||||||
return html``;
|
return html``;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const hasHiddenOptions = Object.keys(this._config).find(
|
||||||
|
(entry) => this._config![entry] === null
|
||||||
|
);
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<ha-card
|
<ha-card
|
||||||
|
outlined
|
||||||
.header=${this.supervisor.localize(
|
.header=${this.supervisor.localize(
|
||||||
"addon.configuration.network.header"
|
"addon.configuration.network.header"
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
|
<p>
|
||||||
|
${this.supervisor.localize(
|
||||||
|
"addon.configuration.network.introduction"
|
||||||
|
)}
|
||||||
|
</p>
|
||||||
${this._error
|
${this._error
|
||||||
? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
|
? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
|
||||||
: ""}
|
: ""}
|
||||||
|
|
||||||
<table>
|
<ha-form
|
||||||
<tbody>
|
.data=${this._config}
|
||||||
<tr>
|
|
||||||
<th>
|
|
||||||
${this.supervisor.localize(
|
|
||||||
"addon.configuration.network.container"
|
|
||||||
)}
|
|
||||||
</th>
|
|
||||||
<th>
|
|
||||||
${this.supervisor.localize(
|
|
||||||
"addon.configuration.network.host"
|
|
||||||
)}
|
|
||||||
</th>
|
|
||||||
<th>${this.supervisor.localize("common.description")}</th>
|
|
||||||
</tr>
|
|
||||||
${this._config!.map(
|
|
||||||
(item) => html`
|
|
||||||
<tr>
|
|
||||||
<td>${item.container}</td>
|
|
||||||
<td>
|
|
||||||
<paper-input
|
|
||||||
@value-changed=${this._configChanged}
|
@value-changed=${this._configChanged}
|
||||||
placeholder=${this.supervisor.localize(
|
.computeLabel=${this._computeLabel}
|
||||||
"addon.configuration.network.disabled"
|
.computeHelper=${this._computeHelper}
|
||||||
|
.schema=${this._createSchema(
|
||||||
|
this._config,
|
||||||
|
this._showOptional,
|
||||||
|
this.hass.userData?.showAdvanced || false
|
||||||
)}
|
)}
|
||||||
.value=${item.host ? String(item.host) : ""}
|
></ha-form>
|
||||||
.container=${item.container}
|
|
||||||
no-label-float
|
|
||||||
></paper-input>
|
|
||||||
</td>
|
|
||||||
<td>${this._computeDescription(item)}</td>
|
|
||||||
</tr>
|
|
||||||
`
|
|
||||||
)}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
</div>
|
||||||
|
${hasHiddenOptions
|
||||||
|
? html`<ha-formfield
|
||||||
|
class="show-optional"
|
||||||
|
.label=${this.supervisor.localize(
|
||||||
|
"addon.configuration.network.show_disabled"
|
||||||
|
)}
|
||||||
|
>
|
||||||
|
<ha-switch
|
||||||
|
@change=${this._toggleOptional}
|
||||||
|
.checked=${this._showOptional}
|
||||||
|
>
|
||||||
|
</ha-switch>
|
||||||
|
</ha-formfield>`
|
||||||
|
: ""}
|
||||||
<div class="card-actions">
|
<div class="card-actions">
|
||||||
<ha-progress-button class="warning" @click=${this._resetTapped}>
|
<ha-progress-button class="warning" @click=${this._resetTapped}>
|
||||||
${this.supervisor.localize("common.reset_defaults")}
|
${this.supervisor.localize("common.reset_defaults")}
|
||||||
</ha-progress-button>
|
</ha-progress-button>
|
||||||
<ha-progress-button @click=${this._saveTapped}>
|
<ha-progress-button
|
||||||
|
@click=${this._saveTapped}
|
||||||
|
.disabled=${!this._configHasChanged}
|
||||||
|
>
|
||||||
${this.supervisor.localize("common.save")}
|
${this.supervisor.localize("common.save")}
|
||||||
</ha-progress-button>
|
</ha-progress-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -123,50 +121,60 @@ class HassioAddonNetwork extends LitElement {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private _computeDescription = (item: NetworkItem): string =>
|
private _createSchema = memoizeOne(
|
||||||
this.addon.translations[this.hass.language]?.network?.[item.container]
|
(
|
||||||
?.description ||
|
config: Record<string, number>,
|
||||||
this.addon.translations.en?.network?.[item.container]?.description ||
|
showOptional: boolean,
|
||||||
item.description;
|
advanced: boolean
|
||||||
|
): HaFormSchema[] =>
|
||||||
|
(showOptional
|
||||||
|
? Object.keys(config)
|
||||||
|
: Object.keys(config).filter((entry) => config[entry] !== null)
|
||||||
|
).map((entry) => ({
|
||||||
|
name: entry,
|
||||||
|
selector: {
|
||||||
|
number: {
|
||||||
|
mode: "box",
|
||||||
|
min: 0,
|
||||||
|
max: 65535,
|
||||||
|
unit_of_measurement: advanced ? entry : undefined,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
|
||||||
|
private _computeLabel = (_: HaFormSchema): string => "";
|
||||||
|
|
||||||
|
private _computeHelper = (item: HaFormSchema): string =>
|
||||||
|
this.addon.translations[this.hass.language]?.network?.[item.name] ||
|
||||||
|
this.addon.translations.en?.network?.[item.name] ||
|
||||||
|
this.addon.network_description?.[item.name] ||
|
||||||
|
item.name;
|
||||||
|
|
||||||
private _setNetworkConfig(): void {
|
private _setNetworkConfig(): void {
|
||||||
const network = this.addon.network || {};
|
this._config = this.addon.network || {};
|
||||||
const description = this.addon.network_description || {};
|
|
||||||
const items: NetworkItem[] = Object.keys(network).map((key) => ({
|
|
||||||
container: key,
|
|
||||||
host: network[key],
|
|
||||||
description: description[key],
|
|
||||||
}));
|
|
||||||
this._config = items.sort((a, b) => (a.container > b.container ? 1 : -1));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async _configChanged(ev: Event): Promise<void> {
|
private async _configChanged(ev: CustomEvent): Promise<void> {
|
||||||
const target = ev.target as NetworkItemInput;
|
this._configHasChanged = true;
|
||||||
this._config!.forEach((item) => {
|
this._config! = ev.detail.value;
|
||||||
if (
|
|
||||||
item.container === target.container &&
|
|
||||||
item.host !== parseInt(String(target.value), 10)
|
|
||||||
) {
|
|
||||||
item.host = target.value ? parseInt(String(target.value), 10) : null;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async _resetTapped(ev: CustomEvent): Promise<void> {
|
private async _resetTapped(ev: CustomEvent): Promise<void> {
|
||||||
const button = ev.currentTarget as any;
|
const button = ev.currentTarget as any;
|
||||||
button.progress = true;
|
|
||||||
|
|
||||||
const data: HassioAddonSetOptionParams = {
|
const data: HassioAddonSetOptionParams = {
|
||||||
network: null,
|
network: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
||||||
|
this._configHasChanged = false;
|
||||||
const eventdata = {
|
const eventdata = {
|
||||||
success: true,
|
success: true,
|
||||||
response: undefined,
|
response: undefined,
|
||||||
path: "option",
|
path: "option",
|
||||||
};
|
};
|
||||||
|
button.actionSuccess();
|
||||||
fireEvent(this, "hass-api-called", eventdata);
|
fireEvent(this, "hass-api-called", eventdata);
|
||||||
if (this.addon?.state === "started") {
|
if (this.addon?.state === "started") {
|
||||||
await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
|
await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
|
||||||
@@ -177,19 +185,21 @@ class HassioAddonNetwork extends LitElement {
|
|||||||
"error",
|
"error",
|
||||||
extractApiErrorMessage(err)
|
extractApiErrorMessage(err)
|
||||||
);
|
);
|
||||||
|
button.actionError();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
button.progress = false;
|
private _toggleOptional() {
|
||||||
|
this._showOptional = !this._showOptional;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async _saveTapped(ev: CustomEvent): Promise<void> {
|
private async _saveTapped(ev: CustomEvent): Promise<void> {
|
||||||
const button = ev.currentTarget as any;
|
const button = ev.currentTarget as any;
|
||||||
button.progress = true;
|
|
||||||
|
|
||||||
this._error = undefined;
|
this._error = undefined;
|
||||||
const networkconfiguration = {};
|
const networkconfiguration = {};
|
||||||
this._config!.forEach((item) => {
|
Object.entries(this._config!).forEach(([key, value]) => {
|
||||||
networkconfiguration[item.container] = parseInt(String(item.host), 10);
|
networkconfiguration[key] = value ?? null;
|
||||||
});
|
});
|
||||||
|
|
||||||
const data: HassioAddonSetOptionParams = {
|
const data: HassioAddonSetOptionParams = {
|
||||||
@@ -198,11 +208,13 @@ class HassioAddonNetwork extends LitElement {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
||||||
|
this._configHasChanged = false;
|
||||||
const eventdata = {
|
const eventdata = {
|
||||||
success: true,
|
success: true,
|
||||||
response: undefined,
|
response: undefined,
|
||||||
path: "option",
|
path: "option",
|
||||||
};
|
};
|
||||||
|
button.actionSuccess();
|
||||||
fireEvent(this, "hass-api-called", eventdata);
|
fireEvent(this, "hass-api-called", eventdata);
|
||||||
if (this.addon?.state === "started") {
|
if (this.addon?.state === "started") {
|
||||||
await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
|
await suggestAddonRestart(this, this.hass, this.supervisor, this.addon);
|
||||||
@@ -213,8 +225,8 @@ class HassioAddonNetwork extends LitElement {
|
|||||||
"error",
|
"error",
|
||||||
extractApiErrorMessage(err)
|
extractApiErrorMessage(err)
|
||||||
);
|
);
|
||||||
|
button.actionError();
|
||||||
}
|
}
|
||||||
button.progress = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static get styles(): CSSResultGroup {
|
static get styles(): CSSResultGroup {
|
||||||
@@ -232,6 +244,9 @@ class HassioAddonNetwork extends LitElement {
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
}
|
}
|
||||||
|
.show-optional {
|
||||||
|
padding: 16px;
|
||||||
|
}
|
||||||
`,
|
`,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@@ -38,7 +38,7 @@ class HassioAddonDocumentationDashboard extends LitElement {
|
|||||||
}
|
}
|
||||||
return html`
|
return html`
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<ha-card>
|
<ha-card outlined>
|
||||||
${this._error
|
${this._error
|
||||||
? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
|
? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
|
||||||
: ""}
|
: ""}
|
||||||
|
@@ -12,12 +12,19 @@ import { navigate } from "../../../src/common/navigate";
|
|||||||
import { extractSearchParam } from "../../../src/common/url/search-params";
|
import { extractSearchParam } from "../../../src/common/url/search-params";
|
||||||
import "../../../src/components/ha-circular-progress";
|
import "../../../src/components/ha-circular-progress";
|
||||||
import {
|
import {
|
||||||
|
fetchAddonInfo,
|
||||||
fetchHassioAddonInfo,
|
fetchHassioAddonInfo,
|
||||||
fetchHassioAddonsInfo,
|
fetchHassioAddonsInfo,
|
||||||
HassioAddonDetails,
|
HassioAddonDetails,
|
||||||
} from "../../../src/data/hassio/addon";
|
} from "../../../src/data/hassio/addon";
|
||||||
import { extractApiErrorMessage } from "../../../src/data/hassio/common";
|
import { extractApiErrorMessage } from "../../../src/data/hassio/common";
|
||||||
|
import {
|
||||||
|
addStoreRepository,
|
||||||
|
fetchSupervisorStore,
|
||||||
|
StoreAddonDetails,
|
||||||
|
} from "../../../src/data/supervisor/store";
|
||||||
import { Supervisor } from "../../../src/data/supervisor/supervisor";
|
import { Supervisor } from "../../../src/data/supervisor/supervisor";
|
||||||
|
import { showConfirmationDialog } from "../../../src/dialogs/generic/show-dialog-box";
|
||||||
import "../../../src/layouts/hass-error-screen";
|
import "../../../src/layouts/hass-error-screen";
|
||||||
import "../../../src/layouts/hass-loading-screen";
|
import "../../../src/layouts/hass-loading-screen";
|
||||||
import "../../../src/layouts/hass-tabs-subpage";
|
import "../../../src/layouts/hass-tabs-subpage";
|
||||||
@@ -40,7 +47,9 @@ class HassioAddonDashboard extends LitElement {
|
|||||||
|
|
||||||
@property({ attribute: false }) public route!: Route;
|
@property({ attribute: false }) public route!: Route;
|
||||||
|
|
||||||
@property({ attribute: false }) public addon?: HassioAddonDetails;
|
@property({ attribute: false }) public addon?:
|
||||||
|
| HassioAddonDetails
|
||||||
|
| StoreAddonDetails;
|
||||||
|
|
||||||
@property({ type: Boolean }) public narrow!: boolean;
|
@property({ type: Boolean }) public narrow!: boolean;
|
||||||
|
|
||||||
@@ -166,6 +175,39 @@ class HassioAddonDashboard extends LitElement {
|
|||||||
protected async firstUpdated(): Promise<void> {
|
protected async firstUpdated(): Promise<void> {
|
||||||
if (this.route.path === "") {
|
if (this.route.path === "") {
|
||||||
const requestedAddon = extractSearchParam("addon");
|
const requestedAddon = extractSearchParam("addon");
|
||||||
|
const requestedAddonRepository = extractSearchParam("repository_url");
|
||||||
|
if (requestedAddonRepository) {
|
||||||
|
const storeInfo = await fetchSupervisorStore(this.hass);
|
||||||
|
if (
|
||||||
|
!storeInfo.repositories.find(
|
||||||
|
(repo) => repo.source === requestedAddonRepository
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
if (
|
||||||
|
!(await showConfirmationDialog(this, {
|
||||||
|
title: this.supervisor.localize("my.add_addon_repository_title"),
|
||||||
|
text: this.supervisor.localize(
|
||||||
|
"my.add_addon_repository_description",
|
||||||
|
{ addon: requestedAddon, repository: requestedAddonRepository }
|
||||||
|
),
|
||||||
|
confirmText: this.supervisor.localize("common.add"),
|
||||||
|
dismissText: this.supervisor.localize("common.cancel"),
|
||||||
|
}))
|
||||||
|
) {
|
||||||
|
this._error = this.supervisor.localize(
|
||||||
|
"my.error_repository_not_found"
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await addStoreRepository(this.hass, requestedAddonRepository);
|
||||||
|
} catch (err: any) {
|
||||||
|
this._error = extractApiErrorMessage(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (requestedAddon) {
|
if (requestedAddon) {
|
||||||
const addonsInfo = await fetchHassioAddonsInfo(this.hass);
|
const addonsInfo = await fetchHassioAddonsInfo(this.hass);
|
||||||
const validAddon = addonsInfo.addons.some(
|
const validAddon = addonsInfo.addons.some(
|
||||||
@@ -202,6 +244,8 @@ class HassioAddonDashboard extends LitElement {
|
|||||||
|
|
||||||
if (path === "uninstall") {
|
if (path === "uninstall") {
|
||||||
window.history.back();
|
window.history.back();
|
||||||
|
} else if (path === "install") {
|
||||||
|
this.addon = await fetchHassioAddonInfo(this.hass, this.addon!.slug);
|
||||||
} else {
|
} else {
|
||||||
await this._routeDataChanged();
|
await this._routeDataChanged();
|
||||||
}
|
}
|
||||||
@@ -219,8 +263,7 @@ class HassioAddonDashboard extends LitElement {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const addoninfo = await fetchHassioAddonInfo(this.hass, addon);
|
this.addon = await fetchAddonInfo(this.hass, this.supervisor, addon);
|
||||||
this.addon = addoninfo;
|
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
this._error = `Error fetching addon info: ${extractApiErrorMessage(err)}`;
|
this._error = `Error fetching addon info: ${extractApiErrorMessage(err)}`;
|
||||||
this.addon = undefined;
|
this.addon = undefined;
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
import { customElement, property } from "lit/decorators";
|
import { customElement, property } from "lit/decorators";
|
||||||
import { HassioAddonDetails } from "../../../src/data/hassio/addon";
|
import { HassioAddonDetails } from "../../../src/data/hassio/addon";
|
||||||
|
import { StoreAddonDetails } from "../../../src/data/supervisor/store";
|
||||||
import { Supervisor } from "../../../src/data/supervisor/supervisor";
|
import { Supervisor } from "../../../src/data/supervisor/supervisor";
|
||||||
import {
|
import {
|
||||||
HassRouterPage,
|
HassRouterPage,
|
||||||
@@ -20,7 +21,9 @@ class HassioAddonRouter extends HassRouterPage {
|
|||||||
|
|
||||||
@property({ attribute: false }) public supervisor!: Supervisor;
|
@property({ attribute: false }) public supervisor!: Supervisor;
|
||||||
|
|
||||||
@property({ attribute: false }) public addon!: HassioAddonDetails;
|
@property({ attribute: false }) public addon!:
|
||||||
|
| HassioAddonDetails
|
||||||
|
| StoreAddonDetails;
|
||||||
|
|
||||||
protected routerOptions: RouterOptions = {
|
protected routerOptions: RouterOptions = {
|
||||||
defaultPage: "info",
|
defaultPage: "info",
|
||||||
|
@@ -59,7 +59,10 @@ import {
|
|||||||
fetchHassioStats,
|
fetchHassioStats,
|
||||||
HassioStats,
|
HassioStats,
|
||||||
} from "../../../../src/data/hassio/common";
|
} from "../../../../src/data/hassio/common";
|
||||||
import { StoreAddon } from "../../../../src/data/supervisor/store";
|
import {
|
||||||
|
StoreAddon,
|
||||||
|
StoreAddonDetails,
|
||||||
|
} from "../../../../src/data/supervisor/store";
|
||||||
import { Supervisor } from "../../../../src/data/supervisor/supervisor";
|
import { Supervisor } from "../../../../src/data/supervisor/supervisor";
|
||||||
import {
|
import {
|
||||||
showAlertDialog,
|
showAlertDialog,
|
||||||
@@ -100,7 +103,9 @@ class HassioAddonInfo extends LitElement {
|
|||||||
|
|
||||||
@property({ attribute: false }) public hass!: HomeAssistant;
|
@property({ attribute: false }) public hass!: HomeAssistant;
|
||||||
|
|
||||||
@property({ attribute: false }) public addon!: HassioAddonDetails;
|
@property({ attribute: false }) public addon!:
|
||||||
|
| HassioAddonDetails
|
||||||
|
| StoreAddonDetails;
|
||||||
|
|
||||||
@property({ attribute: false }) public supervisor!: Supervisor;
|
@property({ attribute: false }) public supervisor!: Supervisor;
|
||||||
|
|
||||||
@@ -143,7 +148,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
></update-available-card>
|
></update-available-card>
|
||||||
`
|
`
|
||||||
: ""}
|
: ""}
|
||||||
${!this.addon.protected
|
${"protected" in this.addon && !this.addon.protected
|
||||||
? html`
|
? html`
|
||||||
<ha-alert
|
<ha-alert
|
||||||
alert-type="error"
|
alert-type="error"
|
||||||
@@ -166,7 +171,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
`
|
`
|
||||||
: ""}
|
: ""}
|
||||||
|
|
||||||
<ha-card>
|
<ha-card outlined>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<div class="addon-header">
|
<div class="addon-header">
|
||||||
${!this.narrow ? this.addon.name : ""}
|
${!this.narrow ? this.addon.name : ""}
|
||||||
@@ -518,7 +523,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
: ""}
|
: ""}
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
${this.addon.state === "started"
|
${this.addon.version && this.addon.state === "started"
|
||||||
? html`<ha-settings-row ?three-line=${this.narrow}>
|
? html`<ha-settings-row ?three-line=${this.narrow}>
|
||||||
<span slot="heading">
|
<span slot="heading">
|
||||||
${this.supervisor.localize("addon.dashboard.hostname")}
|
${this.supervisor.localize("addon.dashboard.hostname")}
|
||||||
@@ -649,7 +654,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
|
|
||||||
${this.addon.long_description
|
${this.addon.long_description
|
||||||
? html`
|
? html`
|
||||||
<ha-card>
|
<ha-card outlined>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<ha-markdown
|
<ha-markdown
|
||||||
.content=${this.addon.long_description}
|
.content=${this.addon.long_description}
|
||||||
@@ -669,7 +674,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async _loadData(): Promise<void> {
|
private async _loadData(): Promise<void> {
|
||||||
if (this.addon.state === "started") {
|
if ("state" in this.addon && this.addon.state === "started") {
|
||||||
this._metrics = await fetchHassioStats(
|
this._metrics = await fetchHassioStats(
|
||||||
this.hass,
|
this.hass,
|
||||||
`addons/${this.addon.slug}`
|
`addons/${this.addon.slug}`
|
||||||
@@ -717,18 +722,22 @@ class HassioAddonInfo extends LitElement {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private get _computeIsRunning(): boolean {
|
private get _computeIsRunning(): boolean {
|
||||||
return this.addon?.state === "started";
|
return (this.addon as HassioAddonDetails)?.state === "started";
|
||||||
}
|
}
|
||||||
|
|
||||||
private get _pathWebui(): string | null {
|
private get _pathWebui(): string | null {
|
||||||
return (
|
return (this.addon as HassioAddonDetails).webui!.replace(
|
||||||
this.addon.webui &&
|
"[HOST]",
|
||||||
this.addon.webui.replace("[HOST]", document.location.hostname)
|
document.location.hostname
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private get _computeShowWebUI(): boolean | "" | null {
|
private get _computeShowWebUI(): boolean | "" | null {
|
||||||
return !this.addon.ingress && this.addon.webui && this._computeIsRunning;
|
return (
|
||||||
|
!this.addon.ingress &&
|
||||||
|
(this.addon as HassioAddonDetails).webui &&
|
||||||
|
this._computeIsRunning
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private _openIngress(): void {
|
private _openIngress(): void {
|
||||||
@@ -754,7 +763,8 @@ class HassioAddonInfo extends LitElement {
|
|||||||
private async _startOnBootToggled(): Promise<void> {
|
private async _startOnBootToggled(): Promise<void> {
|
||||||
this._error = undefined;
|
this._error = undefined;
|
||||||
const data: HassioAddonSetOptionParams = {
|
const data: HassioAddonSetOptionParams = {
|
||||||
boot: this.addon.boot === "auto" ? "manual" : "auto",
|
boot:
|
||||||
|
(this.addon as HassioAddonDetails).boot === "auto" ? "manual" : "auto",
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
||||||
@@ -776,7 +786,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
private async _watchdogToggled(): Promise<void> {
|
private async _watchdogToggled(): Promise<void> {
|
||||||
this._error = undefined;
|
this._error = undefined;
|
||||||
const data: HassioAddonSetOptionParams = {
|
const data: HassioAddonSetOptionParams = {
|
||||||
watchdog: !this.addon.watchdog,
|
watchdog: !(this.addon as HassioAddonDetails).watchdog,
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
||||||
@@ -798,7 +808,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
private async _autoUpdateToggled(): Promise<void> {
|
private async _autoUpdateToggled(): Promise<void> {
|
||||||
this._error = undefined;
|
this._error = undefined;
|
||||||
const data: HassioAddonSetOptionParams = {
|
const data: HassioAddonSetOptionParams = {
|
||||||
auto_update: !this.addon.auto_update,
|
auto_update: !(this.addon as HassioAddonDetails).auto_update,
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
||||||
@@ -820,7 +830,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
private async _protectionToggled(): Promise<void> {
|
private async _protectionToggled(): Promise<void> {
|
||||||
this._error = undefined;
|
this._error = undefined;
|
||||||
const data: HassioAddonSetSecurityParams = {
|
const data: HassioAddonSetSecurityParams = {
|
||||||
protected: !this.addon.protected,
|
protected: !(this.addon as HassioAddonDetails).protected,
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
await setHassioAddonSecurity(this.hass, this.addon.slug, data);
|
await setHassioAddonSecurity(this.hass, this.addon.slug, data);
|
||||||
@@ -842,7 +852,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
private async _panelToggled(): Promise<void> {
|
private async _panelToggled(): Promise<void> {
|
||||||
this._error = undefined;
|
this._error = undefined;
|
||||||
const data: HassioAddonSetOptionParams = {
|
const data: HassioAddonSetOptionParams = {
|
||||||
ingress_panel: !this.addon.ingress_panel,
|
ingress_panel: !(this.addon as HassioAddonDetails).ingress_panel,
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
await setHassioAddonOption(this.hass, this.addon.slug, data);
|
||||||
@@ -870,7 +880,7 @@ class HassioAddonInfo extends LitElement {
|
|||||||
|
|
||||||
showHassioMarkdownDialog(this, {
|
showHassioMarkdownDialog(this, {
|
||||||
title: this.supervisor.localize("addon.dashboard.changelog"),
|
title: this.supervisor.localize("addon.dashboard.changelog"),
|
||||||
content: extractChangelog(this.addon, content),
|
content: extractChangelog(this.addon as HassioAddonDetails, content),
|
||||||
});
|
});
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
showAlertDialog(this, {
|
showAlertDialog(this, {
|
||||||
|
@@ -2,6 +2,7 @@ import "@material/mwc-button";
|
|||||||
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
|
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
|
||||||
import { customElement, property, state } from "lit/decorators";
|
import { customElement, property, state } from "lit/decorators";
|
||||||
import "../../../../src/components/ha-alert";
|
import "../../../../src/components/ha-alert";
|
||||||
|
import "../../../../src/components/ha-ansi-to-html";
|
||||||
import "../../../../src/components/ha-card";
|
import "../../../../src/components/ha-card";
|
||||||
import {
|
import {
|
||||||
fetchHassioAddonLogs,
|
fetchHassioAddonLogs,
|
||||||
@@ -11,7 +12,6 @@ import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
|
|||||||
import { Supervisor } from "../../../../src/data/supervisor/supervisor";
|
import { Supervisor } from "../../../../src/data/supervisor/supervisor";
|
||||||
import { haStyle } from "../../../../src/resources/styles";
|
import { haStyle } from "../../../../src/resources/styles";
|
||||||
import { HomeAssistant } from "../../../../src/types";
|
import { HomeAssistant } from "../../../../src/types";
|
||||||
import "../../components/hassio-ansi-to-html";
|
|
||||||
import { hassioStyle } from "../../resources/hassio-style";
|
import { hassioStyle } from "../../resources/hassio-style";
|
||||||
|
|
||||||
@customElement("hassio-addon-logs")
|
@customElement("hassio-addon-logs")
|
||||||
@@ -34,15 +34,15 @@ class HassioAddonLogs extends LitElement {
|
|||||||
protected render(): TemplateResult {
|
protected render(): TemplateResult {
|
||||||
return html`
|
return html`
|
||||||
<h1>${this.addon.name}</h1>
|
<h1>${this.addon.name}</h1>
|
||||||
<ha-card>
|
<ha-card outlined>
|
||||||
${this._error
|
${this._error
|
||||||
? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
|
? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
|
||||||
: ""}
|
: ""}
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
${this._content
|
${this._content
|
||||||
? html`<hassio-ansi-to-html
|
? html`<ha-ansi-to-html
|
||||||
.content=${this._content}
|
.content=${this._content}
|
||||||
></hassio-ansi-to-html>`
|
></ha-ansi-to-html>`
|
||||||
: ""}
|
: ""}
|
||||||
</div>
|
</div>
|
||||||
<div class="card-actions">
|
<div class="card-actions">
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
import "@material/mwc-button";
|
import "@material/mwc-button";
|
||||||
import { ActionDetail } from "@material/mwc-list";
|
import { ActionDetail } from "@material/mwc-list";
|
||||||
import "@material/mwc-list/mwc-list-item";
|
import "@material/mwc-list/mwc-list-item";
|
||||||
import { mdiDelete, mdiDotsVertical, mdiPlus } from "@mdi/js";
|
import { mdiBackupRestore, mdiDelete, mdiDotsVertical, mdiPlus } from "@mdi/js";
|
||||||
import {
|
import {
|
||||||
css,
|
css,
|
||||||
CSSResultGroup,
|
CSSResultGroup,
|
||||||
@@ -98,9 +98,8 @@ export class HassioBackups extends LitElement {
|
|||||||
if (backup.content.addons.length !== 0) {
|
if (backup.content.addons.length !== 0) {
|
||||||
for (const addon of backup.content.addons) {
|
for (const addon of backup.content.addons) {
|
||||||
content.push(
|
content.push(
|
||||||
this.supervisor.supervisor.addons.find(
|
this.supervisor.addon.addons.find((entry) => entry.slug === addon)
|
||||||
(entry) => entry.slug === addon
|
?.name || addon
|
||||||
)?.name || addon
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -166,7 +165,15 @@ export class HassioBackups extends LitElement {
|
|||||||
}
|
}
|
||||||
return html`
|
return html`
|
||||||
<hass-tabs-subpage-data-table
|
<hass-tabs-subpage-data-table
|
||||||
.tabs=${supervisorTabs(this.hass)}
|
.tabs=${atLeastVersion(this.hass.config.version, 2022, 5)
|
||||||
|
? [
|
||||||
|
{
|
||||||
|
translationKey: "panel.backups",
|
||||||
|
path: `/hassio/backups`,
|
||||||
|
iconPath: mdiBackupRestore,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
: supervisorTabs(this.hass)}
|
||||||
.hass=${this.hass}
|
.hass=${this.hass}
|
||||||
.localizeFunc=${this.supervisor.localize}
|
.localizeFunc=${this.supervisor.localize}
|
||||||
.searchLabel=${this.supervisor.localize("search")}
|
.searchLabel=${this.supervisor.localize("search")}
|
||||||
@@ -182,7 +189,9 @@ export class HassioBackups extends LitElement {
|
|||||||
selectable
|
selectable
|
||||||
hasFab
|
hasFab
|
||||||
.mainPage=${!atLeastVersion(this.hass.config.version, 2021, 12)}
|
.mainPage=${!atLeastVersion(this.hass.config.version, 2021, 12)}
|
||||||
back-path="/config"
|
back-path=${atLeastVersion(this.hass.config.version, 2022, 5)
|
||||||
|
? "/config/system"
|
||||||
|
: "/config"}
|
||||||
supervisor
|
supervisor
|
||||||
>
|
>
|
||||||
<ha-button-menu
|
<ha-button-menu
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
import Fuse from "fuse.js";
|
import Fuse from "fuse.js";
|
||||||
import { HassioAddonInfo } from "../../../src/data/hassio/addon";
|
import { StoreAddon } from "../../../src/data/supervisor/store";
|
||||||
|
|
||||||
export function filterAndSort(addons: HassioAddonInfo[], filter: string) {
|
export function filterAndSort(addons: StoreAddon[], filter: string) {
|
||||||
const options: Fuse.IFuseOptions<HassioAddonInfo> = {
|
const options: Fuse.IFuseOptions<StoreAddon> = {
|
||||||
keys: ["name", "description", "slug"],
|
keys: ["name", "description", "slug"],
|
||||||
isCaseSensitive: false,
|
isCaseSensitive: false,
|
||||||
minMatchCharLength: 2,
|
minMatchCharLength: 2,
|
||||||
|
@@ -32,13 +32,6 @@ interface AddonCheckboxItem extends CheckboxItem {
|
|||||||
|
|
||||||
const _computeFolders = (folders): CheckboxItem[] => {
|
const _computeFolders = (folders): CheckboxItem[] => {
|
||||||
const list: CheckboxItem[] = [];
|
const list: CheckboxItem[] = [];
|
||||||
if (folders.includes("homeassistant")) {
|
|
||||||
list.push({
|
|
||||||
slug: "homeassistant",
|
|
||||||
name: "Home Assistant configuration",
|
|
||||||
checked: false,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (folders.includes("ssl")) {
|
if (folders.includes("ssl")) {
|
||||||
list.push({ slug: "ssl", name: "SSL", checked: false });
|
list.push({ slug: "ssl", name: "SSL", checked: false });
|
||||||
}
|
}
|
||||||
@@ -100,10 +93,10 @@ export class SupervisorBackupContent extends LitElement {
|
|||||||
this.folders = _computeFolders(
|
this.folders = _computeFolders(
|
||||||
this.backup
|
this.backup
|
||||||
? this.backup.folders
|
? this.backup.folders
|
||||||
: ["homeassistant", "ssl", "share", "media", "addons/local"]
|
: ["ssl", "share", "media", "addons/local"]
|
||||||
);
|
);
|
||||||
this.addons = _computeAddons(
|
this.addons = _computeAddons(
|
||||||
this.backup ? this.backup.addons : this.supervisor?.supervisor.addons
|
this.backup ? this.backup.addons : this.supervisor?.addon.addons
|
||||||
);
|
);
|
||||||
this.backupType = this.backup?.type || "full";
|
this.backupType = this.backup?.type || "full";
|
||||||
this.backupName = this.backup?.name || "";
|
this.backupName = this.backup?.name || "";
|
||||||
@@ -187,7 +180,7 @@ export class SupervisorBackupContent extends LitElement {
|
|||||||
>
|
>
|
||||||
<ha-checkbox
|
<ha-checkbox
|
||||||
.checked=${this.homeAssistant}
|
.checked=${this.homeAssistant}
|
||||||
@click=${this.toggleHomeAssistant}
|
@change=${this.toggleHomeAssistant}
|
||||||
>
|
>
|
||||||
</ha-checkbox>
|
</ha-checkbox>
|
||||||
</ha-formfield>
|
</ha-formfield>
|
||||||
|
@@ -24,9 +24,9 @@ class HassioAddons extends LitElement {
|
|||||||
? html` <h1>${this.supervisor.localize("dashboard.addons")}</h1> `
|
? html` <h1>${this.supervisor.localize("dashboard.addons")}</h1> `
|
||||||
: ""}
|
: ""}
|
||||||
<div class="card-group">
|
<div class="card-group">
|
||||||
${!this.supervisor.supervisor.addons?.length
|
${!this.supervisor.addon.addons.length
|
||||||
? html`
|
? html`
|
||||||
<ha-card>
|
<ha-card outlined>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<button class="link" @click=${this._openStore}>
|
<button class="link" @click=${this._openStore}>
|
||||||
${this.supervisor.localize("dashboard.no_addons")}
|
${this.supervisor.localize("dashboard.no_addons")}
|
||||||
@@ -34,11 +34,15 @@ class HassioAddons extends LitElement {
|
|||||||
</div>
|
</div>
|
||||||
</ha-card>
|
</ha-card>
|
||||||
`
|
`
|
||||||
: this.supervisor.supervisor.addons
|
: this.supervisor.addon.addons
|
||||||
.sort((a, b) => caseInsensitiveStringCompare(a.name, b.name))
|
.sort((a, b) => caseInsensitiveStringCompare(a.name, b.name))
|
||||||
.map(
|
.map(
|
||||||
(addon) => html`
|
(addon) => html`
|
||||||
<ha-card .addon=${addon} @click=${this._addonTapped}>
|
<ha-card
|
||||||
|
outlined
|
||||||
|
.addon=${addon}
|
||||||
|
@click=${this._addonTapped}
|
||||||
|
>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<hassio-card-content
|
<hassio-card-content
|
||||||
.hass=${this.hass}
|
.hass=${this.hass}
|
||||||
|
@@ -10,6 +10,7 @@ import { HomeAssistant, Route } from "../../../src/types";
|
|||||||
import { supervisorTabs } from "../hassio-tabs";
|
import { supervisorTabs } from "../hassio-tabs";
|
||||||
import "./hassio-addons";
|
import "./hassio-addons";
|
||||||
import "./hassio-update";
|
import "./hassio-update";
|
||||||
|
import "../../../src/layouts/hass-subpage";
|
||||||
|
|
||||||
@customElement("hassio-dashboard")
|
@customElement("hassio-dashboard")
|
||||||
class HassioDashboard extends LitElement {
|
class HassioDashboard extends LitElement {
|
||||||
@@ -22,6 +23,31 @@ class HassioDashboard extends LitElement {
|
|||||||
@property({ attribute: false }) public route!: Route;
|
@property({ attribute: false }) public route!: Route;
|
||||||
|
|
||||||
protected render(): TemplateResult {
|
protected render(): TemplateResult {
|
||||||
|
if (atLeastVersion(this.hass.config.version, 2022, 5)) {
|
||||||
|
return html`<hass-subpage
|
||||||
|
.hass=${this.hass}
|
||||||
|
.narrow=${this.narrow}
|
||||||
|
.route=${this.route}
|
||||||
|
.header=${this.supervisor.localize("panel.addons")}
|
||||||
|
>
|
||||||
|
<hassio-addons
|
||||||
|
.hass=${this.hass}
|
||||||
|
.supervisor=${this.supervisor}
|
||||||
|
></hassio-addons>
|
||||||
|
<a href="/hassio/store">
|
||||||
|
<ha-fab
|
||||||
|
.label=${this.supervisor.localize("panel.store")}
|
||||||
|
extended
|
||||||
|
class="non-tabs"
|
||||||
|
>
|
||||||
|
<ha-svg-icon
|
||||||
|
slot="icon"
|
||||||
|
.path=${mdiStorePlus}
|
||||||
|
></ha-svg-icon> </ha-fab
|
||||||
|
></a>
|
||||||
|
</hass-subpage>`;
|
||||||
|
}
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<hass-tabs-subpage
|
<hass-tabs-subpage
|
||||||
.hass=${this.hass}
|
.hass=${this.hass}
|
||||||
@@ -74,6 +100,12 @@ class HassioDashboard extends LitElement {
|
|||||||
.content {
|
.content {
|
||||||
margin: 0 auto;
|
margin: 0 auto;
|
||||||
}
|
}
|
||||||
|
ha-fab.non-tabs {
|
||||||
|
position: fixed;
|
||||||
|
right: calc(16px + env(safe-area-inset-right));
|
||||||
|
bottom: calc(16px + env(safe-area-inset-bottom));
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
`,
|
`,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@@ -85,7 +85,7 @@ export class HassioUpdate extends LitElement {
|
|||||||
return html``;
|
return html``;
|
||||||
}
|
}
|
||||||
return html`
|
return html`
|
||||||
<ha-card>
|
<ha-card outlined>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<div class="icon">
|
<div class="icon">
|
||||||
<ha-svg-icon .path=${mdiHomeAssistant}></ha-svg-icon>
|
<ha-svg-icon .path=${mdiHomeAssistant}></ha-svg-icon>
|
||||||
|
@@ -15,15 +15,18 @@ import "../../../../src/components/ha-circular-progress";
|
|||||||
import { createCloseHeading } from "../../../../src/components/ha-dialog";
|
import { createCloseHeading } from "../../../../src/components/ha-dialog";
|
||||||
import "../../../../src/components/ha-icon-button";
|
import "../../../../src/components/ha-icon-button";
|
||||||
import {
|
import {
|
||||||
fetchHassioAddonsInfo,
|
|
||||||
HassioAddonInfo,
|
HassioAddonInfo,
|
||||||
HassioAddonRepository,
|
HassioAddonRepository,
|
||||||
} from "../../../../src/data/hassio/addon";
|
} from "../../../../src/data/hassio/addon";
|
||||||
import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
|
import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
|
||||||
import { setSupervisorOption } from "../../../../src/data/hassio/supervisor";
|
|
||||||
import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
|
import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
|
||||||
import type { HomeAssistant } from "../../../../src/types";
|
import type { HomeAssistant } from "../../../../src/types";
|
||||||
import { HassioRepositoryDialogParams } from "./show-dialog-repositories";
|
import { HassioRepositoryDialogParams } from "./show-dialog-repositories";
|
||||||
|
import {
|
||||||
|
addStoreRepository,
|
||||||
|
fetchStoreRepositories,
|
||||||
|
removeStoreRepository,
|
||||||
|
} from "../../../../src/data/supervisor/store";
|
||||||
|
|
||||||
@customElement("dialog-hassio-repositories")
|
@customElement("dialog-hassio-repositories")
|
||||||
class HassioRepositoriesDialog extends LitElement {
|
class HassioRepositoriesDialog extends LitElement {
|
||||||
@@ -58,7 +61,13 @@ class HassioRepositoriesDialog extends LitElement {
|
|||||||
|
|
||||||
private _filteredRepositories = memoizeOne((repos: HassioAddonRepository[]) =>
|
private _filteredRepositories = memoizeOne((repos: HassioAddonRepository[]) =>
|
||||||
repos
|
repos
|
||||||
.filter((repo) => repo.slug !== "core" && repo.slug !== "local")
|
.filter(
|
||||||
|
(repo) =>
|
||||||
|
repo.slug !== "core" && // The core add-ons repository
|
||||||
|
repo.slug !== "local" && // Locally managed add-ons
|
||||||
|
repo.slug !== "a0d7b954" && // Home Assistant Community Add-ons
|
||||||
|
repo.slug !== "5c53de3b" // The ESPHome repository
|
||||||
|
)
|
||||||
.sort((a, b) => caseInsensitiveStringCompare(a.name, b.name))
|
.sort((a, b) => caseInsensitiveStringCompare(a.name, b.name))
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -78,7 +87,7 @@ class HassioRepositoriesDialog extends LitElement {
|
|||||||
const repositories = this._filteredRepositories(this._repositories);
|
const repositories = this._filteredRepositories(this._repositories);
|
||||||
const usedRepositories = this._filteredUsedRepositories(
|
const usedRepositories = this._filteredUsedRepositories(
|
||||||
repositories,
|
repositories,
|
||||||
this._dialogParams.supervisor.supervisor.addons
|
this._dialogParams.supervisor.addon.addons
|
||||||
);
|
);
|
||||||
return html`
|
return html`
|
||||||
<ha-dialog
|
<ha-dialog
|
||||||
@@ -215,9 +224,7 @@ class HassioRepositoriesDialog extends LitElement {
|
|||||||
|
|
||||||
private async _loadData(): Promise<void> {
|
private async _loadData(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
const addonsinfo = await fetchHassioAddonsInfo(this.hass);
|
this._repositories = await fetchStoreRepositories(this.hass);
|
||||||
|
|
||||||
this._repositories = addonsinfo.repositories;
|
|
||||||
|
|
||||||
fireEvent(this, "supervisor-collection-refresh", { collection: "addon" });
|
fireEvent(this, "supervisor-collection-refresh", { collection: "addon" });
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
@@ -231,14 +238,9 @@ class HassioRepositoriesDialog extends LitElement {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
this._processing = true;
|
this._processing = true;
|
||||||
const repositories = this._filteredRepositories(this._repositories!);
|
|
||||||
const newRepositories = repositories.map((repo) => repo.source);
|
|
||||||
newRepositories.push(input.value);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await setSupervisorOption(this.hass, {
|
await addStoreRepository(this.hass, input.value);
|
||||||
addons_repositories: newRepositories,
|
|
||||||
});
|
|
||||||
await this._loadData();
|
await this._loadData();
|
||||||
|
|
||||||
input.value = "";
|
input.value = "";
|
||||||
@@ -250,19 +252,8 @@ class HassioRepositoriesDialog extends LitElement {
|
|||||||
|
|
||||||
private async _removeRepository(ev: Event) {
|
private async _removeRepository(ev: Event) {
|
||||||
const slug = (ev.currentTarget as any).slug;
|
const slug = (ev.currentTarget as any).slug;
|
||||||
const repositories = this._filteredRepositories(this._repositories!);
|
|
||||||
const repository = repositories.find((repo) => repo.slug === slug);
|
|
||||||
if (!repository) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const newRepositories = repositories
|
|
||||||
.map((repo) => repo.source)
|
|
||||||
.filter((repo) => repo !== repository.source);
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await setSupervisorOption(this.hass, {
|
await removeStoreRepository(this.hass, slug);
|
||||||
addons_repositories: newRepositories,
|
|
||||||
});
|
|
||||||
await this._loadData();
|
await this._loadData();
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
this._error = extractApiErrorMessage(err);
|
this._error = extractApiErrorMessage(err);
|
||||||
|
@@ -3,8 +3,8 @@ import { customElement, property } from "lit/decorators";
|
|||||||
import { atLeastVersion } from "../../src/common/config/version";
|
import { atLeastVersion } from "../../src/common/config/version";
|
||||||
import { applyThemesOnElement } from "../../src/common/dom/apply_themes_on_element";
|
import { applyThemesOnElement } from "../../src/common/dom/apply_themes_on_element";
|
||||||
import { fireEvent } from "../../src/common/dom/fire_event";
|
import { fireEvent } from "../../src/common/dom/fire_event";
|
||||||
import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
|
|
||||||
import { mainWindow } from "../../src/common/dom/get_main_window";
|
import { mainWindow } from "../../src/common/dom/get_main_window";
|
||||||
|
import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
|
||||||
import { navigate } from "../../src/common/navigate";
|
import { navigate } from "../../src/common/navigate";
|
||||||
import { HassioPanelInfo } from "../../src/data/hassio/supervisor";
|
import { HassioPanelInfo } from "../../src/data/hassio/supervisor";
|
||||||
import { Supervisor } from "../../src/data/supervisor/supervisor";
|
import { Supervisor } from "../../src/data/supervisor/supervisor";
|
||||||
@@ -73,6 +73,18 @@ export class HassioMain extends SupervisorBaseElement {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Forward keydown events to the main window for quickbar access
|
||||||
|
document.body.addEventListener("keydown", (ev: KeyboardEvent) => {
|
||||||
|
if (ev.altKey || ev.ctrlKey || ev.shiftKey || ev.metaKey) {
|
||||||
|
// Ignore if modifier keys are pressed
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// @ts-ignore
|
||||||
|
fireEvent(mainWindow, "hass-quick-bar-trigger", ev, {
|
||||||
|
bubbles: false,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
makeDialogManager(this, this.shadowRoot!);
|
makeDialogManager(this, this.shadowRoot!);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -15,7 +15,7 @@ import {
|
|||||||
} from "../../src/panels/my/ha-panel-my";
|
} from "../../src/panels/my/ha-panel-my";
|
||||||
import { HomeAssistant, Route } from "../../src/types";
|
import { HomeAssistant, Route } from "../../src/types";
|
||||||
|
|
||||||
const REDIRECTS: Redirects = {
|
export const REDIRECTS: Redirects = {
|
||||||
supervisor: {
|
supervisor: {
|
||||||
redirect: "/hassio/dashboard",
|
redirect: "/hassio/dashboard",
|
||||||
},
|
},
|
||||||
@@ -42,6 +42,9 @@ const REDIRECTS: Redirects = {
|
|||||||
params: {
|
params: {
|
||||||
addon: "string",
|
addon: "string",
|
||||||
},
|
},
|
||||||
|
optional_params: {
|
||||||
|
repository_url: "url",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
supervisor_ingress: {
|
supervisor_ingress: {
|
||||||
redirect: "/hassio/ingress",
|
redirect: "/hassio/ingress",
|
||||||
@@ -124,6 +127,14 @@ class HassioMyRedirect extends LitElement {
|
|||||||
}
|
}
|
||||||
resultParams[key] = params[key];
|
resultParams[key] = params[key];
|
||||||
});
|
});
|
||||||
|
Object.entries(redirect.optional_params || {}).forEach(([key, type]) => {
|
||||||
|
if (params[key]) {
|
||||||
|
if (!this._checkParamType(type, params[key])) {
|
||||||
|
throw Error();
|
||||||
|
}
|
||||||
|
resultParams[key] = params[key];
|
||||||
|
}
|
||||||
|
});
|
||||||
return `?${createSearchParam(resultParams)}`;
|
return `?${createSearchParam(resultParams)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -8,7 +8,10 @@ import { atLeastVersion } from "../../src/common/config/version";
|
|||||||
import type { PageNavigation } from "../../src/layouts/hass-tabs-subpage";
|
import type { PageNavigation } from "../../src/layouts/hass-tabs-subpage";
|
||||||
import { HomeAssistant } from "../../src/types";
|
import { HomeAssistant } from "../../src/types";
|
||||||
|
|
||||||
export const supervisorTabs = (hass: HomeAssistant): PageNavigation[] => [
|
export const supervisorTabs = (hass: HomeAssistant): PageNavigation[] =>
|
||||||
|
atLeastVersion(hass.config.version, 2022, 5)
|
||||||
|
? []
|
||||||
|
: [
|
||||||
{
|
{
|
||||||
translationKey: atLeastVersion(hass.config.version, 2021, 12)
|
translationKey: atLeastVersion(hass.config.version, 2021, 12)
|
||||||
? "panel.addons"
|
? "panel.addons"
|
||||||
|
@@ -48,7 +48,7 @@ class HassioCoreInfo extends LitElement {
|
|||||||
];
|
];
|
||||||
|
|
||||||
return html`
|
return html`
|
||||||
<ha-card header="Core">
|
<ha-card header="Core" outlined>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<div>
|
<div>
|
||||||
<ha-settings-row>
|
<ha-settings-row>
|
||||||
|
@@ -66,7 +66,7 @@ class HassioHostInfo extends LitElement {
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
return html`
|
return html`
|
||||||
<ha-card header="Host">
|
<ha-card header="Host" outlined>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<div>
|
<div>
|
||||||
${this.supervisor.host.features.includes("hostname")
|
${this.supervisor.host.features.includes("hostname")
|
||||||
|
@@ -23,6 +23,10 @@ import {
|
|||||||
showAlertDialog,
|
showAlertDialog,
|
||||||
showConfirmationDialog,
|
showConfirmationDialog,
|
||||||
} from "../../../src/dialogs/generic/show-dialog-box";
|
} from "../../../src/dialogs/generic/show-dialog-box";
|
||||||
|
import {
|
||||||
|
UNHEALTHY_REASON_URL,
|
||||||
|
UNSUPPORTED_REASON_URL,
|
||||||
|
} from "../../../src/panels/config/system-health/ha-config-system-health";
|
||||||
import { haStyle } from "../../../src/resources/styles";
|
import { haStyle } from "../../../src/resources/styles";
|
||||||
import { HomeAssistant } from "../../../src/types";
|
import { HomeAssistant } from "../../../src/types";
|
||||||
import { bytesToString } from "../../../src/util/bytes-to-string";
|
import { bytesToString } from "../../../src/util/bytes-to-string";
|
||||||
@@ -30,11 +34,6 @@ import { documentationUrl } from "../../../src/util/documentation-url";
|
|||||||
import "../components/supervisor-metric";
|
import "../components/supervisor-metric";
|
||||||
import { hassioStyle } from "../resources/hassio-style";
|
import { hassioStyle } from "../resources/hassio-style";
|
||||||
|
|
||||||
const UNSUPPORTED_REASON_URL = {};
|
|
||||||
const UNHEALTHY_REASON_URL = {
|
|
||||||
privileged: "/more-info/unsupported/privileged",
|
|
||||||
};
|
|
||||||
|
|
||||||
@customElement("hassio-supervisor-info")
|
@customElement("hassio-supervisor-info")
|
||||||
class HassioSupervisorInfo extends LitElement {
|
class HassioSupervisorInfo extends LitElement {
|
||||||
@property({ attribute: false }) public hass!: HomeAssistant;
|
@property({ attribute: false }) public hass!: HomeAssistant;
|
||||||
@@ -58,7 +57,7 @@ class HassioSupervisorInfo extends LitElement {
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
return html`
|
return html`
|
||||||
<ha-card header="Supervisor">
|
<ha-card header="Supervisor" outlined>
|
||||||
<div class="card-content">
|
<div class="card-content">
|
||||||
<div>
|
<div>
|
||||||
<ha-settings-row>
|
<ha-settings-row>
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
import "../../../src/components/ha-ansi-to-html";
|
||||||
import "@material/mwc-button";
|
import "@material/mwc-button";
|
||||||
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
|
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
|
||||||
import { customElement, property, state } from "lit/decorators";
|
import { customElement, property, state } from "lit/decorators";
|
||||||
@@ -11,7 +12,6 @@ import { Supervisor } from "../../../src/data/supervisor/supervisor";
|
|||||||
import "../../../src/layouts/hass-loading-screen";
|
import "../../../src/layouts/hass-loading-screen";
|
||||||
import { haStyle } from "../../../src/resources/styles";
|
import { haStyle } from "../../../src/resources/styles";
|
||||||
import { HomeAssistant } from "../../../src/types";
|
import { HomeAssistant } from "../../../src/types";
|
||||||
import "../components/hassio-ansi-to-html";
|
|
||||||
import { hassioStyle } from "../resources/hassio-style";
|
import { hassioStyle } from "../resources/hassio-style";
|
||||||
|
|
||||||
interface LogProvider {
|
interface LogProvider {
|
||||||
@@ -65,7 +65,7 @@ class HassioSupervisorLog extends LitElement {
|
|||||||
|
|
||||||
protected render(): TemplateResult | void {
|
protected render(): TemplateResult | void {
|
||||||
return html`
|
return html`
|
||||||
<ha-card>
|
<ha-card outlined>
|
||||||
${this._error
|
${this._error
|
||||||
? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
|
? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
|
||||||
: ""}
|
: ""}
|
||||||
@@ -89,8 +89,8 @@ class HassioSupervisorLog extends LitElement {
|
|||||||
|
|
||||||
<div class="card-content" id="content">
|
<div class="card-content" id="content">
|
||||||
${this._content
|
${this._content
|
||||||
? html`<hassio-ansi-to-html .content=${this._content}>
|
? html`<ha-ansi-to-html .content=${this._content}>
|
||||||
</hassio-ansi-to-html>`
|
</ha-ansi-to-html>`
|
||||||
: html`<hass-loading-screen no-toolbar></hass-loading-screen>`}
|
: html`<hass-loading-screen no-toolbar></hass-loading-screen>`}
|
||||||
</div>
|
</div>
|
||||||
<div class="card-actions">
|
<div class="card-actions">
|
||||||
|
@@ -128,6 +128,7 @@ class UpdateAvailableCard extends LitElement {
|
|||||||
|
|
||||||
return html`
|
return html`
|
||||||
<ha-card
|
<ha-card
|
||||||
|
outlined
|
||||||
.header=${this.supervisor.localize("update_available.update_name", {
|
.header=${this.supervisor.localize("update_available.update_name", {
|
||||||
name: this._name,
|
name: this._name,
|
||||||
})}
|
})}
|
||||||
|
10
package.json
@@ -72,8 +72,8 @@
|
|||||||
"@material/mwc-textfield": "0.25.3",
|
"@material/mwc-textfield": "0.25.3",
|
||||||
"@material/mwc-top-app-bar-fixed": "^0.25.3",
|
"@material/mwc-top-app-bar-fixed": "^0.25.3",
|
||||||
"@material/top-app-bar": "14.0.0-canary.261f2db59.0",
|
"@material/top-app-bar": "14.0.0-canary.261f2db59.0",
|
||||||
"@mdi/js": "6.6.95",
|
"@mdi/js": "6.7.96",
|
||||||
"@mdi/svg": "6.6.95",
|
"@mdi/svg": "6.7.96",
|
||||||
"@polymer/app-layout": "^3.1.0",
|
"@polymer/app-layout": "^3.1.0",
|
||||||
"@polymer/iron-flex-layout": "^3.0.1",
|
"@polymer/iron-flex-layout": "^3.0.1",
|
||||||
"@polymer/iron-icon": "^3.0.1",
|
"@polymer/iron-icon": "^3.0.1",
|
||||||
@@ -89,8 +89,8 @@
|
|||||||
"@polymer/paper-tooltip": "^3.0.1",
|
"@polymer/paper-tooltip": "^3.0.1",
|
||||||
"@polymer/polymer": "3.4.1",
|
"@polymer/polymer": "3.4.1",
|
||||||
"@thomasloven/round-slider": "0.5.4",
|
"@thomasloven/round-slider": "0.5.4",
|
||||||
"@vaadin/combo-box": "^22.0.4",
|
"@vaadin/combo-box": "^23.0.10",
|
||||||
"@vaadin/vaadin-themable-mixin": "^22.0.4",
|
"@vaadin/vaadin-themable-mixin": "^23.0.10",
|
||||||
"@vibrant/color": "^3.2.1-alpha.1",
|
"@vibrant/color": "^3.2.1-alpha.1",
|
||||||
"@vibrant/core": "^3.2.1-alpha.1",
|
"@vibrant/core": "^3.2.1-alpha.1",
|
||||||
"@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
|
"@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
|
||||||
@@ -108,7 +108,7 @@
|
|||||||
"fuse.js": "^6.0.0",
|
"fuse.js": "^6.0.0",
|
||||||
"google-timezones-json": "^1.0.2",
|
"google-timezones-json": "^1.0.2",
|
||||||
"hls.js": "^1.1.5",
|
"hls.js": "^1.1.5",
|
||||||
"home-assistant-js-websocket": "^7.0.1",
|
"home-assistant-js-websocket": "^7.1.0",
|
||||||
"idb-keyval": "^5.1.3",
|
"idb-keyval": "^5.1.3",
|
||||||
"intl-messageformat": "^9.9.1",
|
"intl-messageformat": "^9.9.1",
|
||||||
"js-yaml": "^4.1.0",
|
"js-yaml": "^4.1.0",
|
||||||
|
@@ -1,3 +1,30 @@
|
|||||||
[build-system]
|
[build-system]
|
||||||
requires = ["setuptools~=60.5", "wheel~=0.37.1"]
|
requires = ["setuptools~=62.3", "wheel~=0.37.1"]
|
||||||
build-backend = "setuptools.build_meta"
|
build-backend = "setuptools.build_meta"
|
||||||
|
|
||||||
|
[project]
|
||||||
|
name = "home-assistant-frontend"
|
||||||
|
version = "20220629.0"
|
||||||
|
license = {text = "Apache-2.0"}
|
||||||
|
description = "The Home Assistant frontend"
|
||||||
|
readme = "README.md"
|
||||||
|
authors = [
|
||||||
|
{name = "The Home Assistant Authors", email = "hello@home-assistant.io"}
|
||||||
|
]
|
||||||
|
requires-python = ">=3.4.0"
|
||||||
|
|
||||||
|
[project.urls]
|
||||||
|
"Homepage" = "https://github.com/home-assistant/frontend"
|
||||||
|
|
||||||
|
[tool.setuptools]
|
||||||
|
platforms = ["any"]
|
||||||
|
zip-safe = false
|
||||||
|
include-package-data = true
|
||||||
|
|
||||||
|
[tool.setuptools.packages.find]
|
||||||
|
include = ["hass_frontend*"]
|
||||||
|
|
||||||
|
[tool.mypy]
|
||||||
|
python_version = 3.4
|
||||||
|
show_error_codes = true
|
||||||
|
strict = true
|
||||||
|
@@ -15,7 +15,7 @@ if [ -z $(which hass) ]; then
|
|||||||
echo "Installing Home Asstant core from dev."
|
echo "Installing Home Asstant core from dev."
|
||||||
python3 -m pip install --upgrade \
|
python3 -m pip install --upgrade \
|
||||||
colorlog \
|
colorlog \
|
||||||
git+git://github.com/home-assistant/home-assistant.git@dev
|
git+https://github.com/home-assistant/home-assistant.git@dev
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -d "${WD}/config" ]; then
|
if [ ! -d "${WD}/config" ]; then
|
||||||
|
@@ -50,14 +50,14 @@ async function main(args) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const setup = fs.readFileSync("setup.cfg", "utf8");
|
const setup = fs.readFileSync("pyproject.toml", "utf8");
|
||||||
const version = setup.match(/\d{8}\.\d+/)[0];
|
const version = setup.match(/version\W+=\W"(\d{8}\.\d)"/)[1];
|
||||||
const newVersion = method(version);
|
const newVersion = method(version);
|
||||||
|
|
||||||
console.log("Current version:", version);
|
console.log("Current version:", version);
|
||||||
console.log("New version:", newVersion);
|
console.log("New version:", newVersion);
|
||||||
|
|
||||||
fs.writeFileSync("setup.cfg", setup.replace(version, newVersion), "utf-8");
|
fs.writeFileSync("pyproject.toml", setup.replace(version, newVersion), "utf-8");
|
||||||
|
|
||||||
if (!commit) {
|
if (!commit) {
|
||||||
return;
|
return;
|
||||||
|
28
setup.cfg
@@ -1,26 +1,2 @@
|
|||||||
[metadata]
|
# Setuptools v62.3 doesn't support editable installs with just 'pyproject.toml' (PEP 660).
|
||||||
name = home-assistant-frontend
|
# Keep this file until it does!
|
||||||
version = 20220322.0
|
|
||||||
author = The Home Assistant Authors
|
|
||||||
author_email = hello@home-assistant.io
|
|
||||||
license = Apache-2.0
|
|
||||||
platforms = any
|
|
||||||
description = The Home Assistant frontend
|
|
||||||
long_description = file: README.md
|
|
||||||
long_description_content_type = text/markdown
|
|
||||||
url = https://github.com/home-assistant/frontend
|
|
||||||
|
|
||||||
[options]
|
|
||||||
packages = find:
|
|
||||||
zip_safe = False
|
|
||||||
include_package_data = True
|
|
||||||
python_requires = >= 3.4.0
|
|
||||||
|
|
||||||
[options.packages.find]
|
|
||||||
include =
|
|
||||||
hass_frontend*
|
|
||||||
|
|
||||||
[mypy]
|
|
||||||
python_version = 3.4
|
|
||||||
show_error_codes = True
|
|
||||||
strict = True
|
|
||||||
|
16
src/common/datetime/duration.ts
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
import secondsToDuration from "./seconds_to_duration";
|
||||||
|
|
||||||
|
const DAY_IN_SECONDS = 86400;
|
||||||
|
const HOUR_IN_SECONDS = 3600;
|
||||||
|
const MINUTE_IN_SECONDS = 60;
|
||||||
|
|
||||||
|
export const UNIT_TO_SECOND_CONVERT = {
|
||||||
|
s: 1,
|
||||||
|
min: MINUTE_IN_SECONDS,
|
||||||
|
h: HOUR_IN_SECONDS,
|
||||||
|
d: DAY_IN_SECONDS,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const formatDuration = (duration: string, units: string): string =>
|
||||||
|
secondsToDuration(parseFloat(duration) * UNIT_TO_SECOND_CONVERT[units]) ||
|
||||||
|
"0";
|
41
src/common/dom/ancestors-with-property.ts
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
const DEFAULT_OWN = true;
|
||||||
|
|
||||||
|
// Finds the closest ancestor of an element that has a specific optionally owned property,
|
||||||
|
// traversing slot and shadow root boundaries until the body element is reached
|
||||||
|
export const closestWithProperty = (
|
||||||
|
element: Element | null,
|
||||||
|
property: string | symbol,
|
||||||
|
own = DEFAULT_OWN
|
||||||
|
) => {
|
||||||
|
if (!element || element === document.body) return null;
|
||||||
|
|
||||||
|
element = element.assignedSlot ?? element;
|
||||||
|
if (element.parentElement) {
|
||||||
|
element = element.parentElement;
|
||||||
|
} else {
|
||||||
|
const root = element.getRootNode();
|
||||||
|
element = root instanceof ShadowRoot ? root.host : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
own
|
||||||
|
? Object.prototype.hasOwnProperty.call(element, property)
|
||||||
|
: element && property in element
|
||||||
|
)
|
||||||
|
return element;
|
||||||
|
return closestWithProperty(element, property, own);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Finds the set of all such ancestors and includes starting element as first in the set
|
||||||
|
export const ancestorsWithProperty = (
|
||||||
|
element: Element | null,
|
||||||
|
property: string | symbol,
|
||||||
|
own = DEFAULT_OWN
|
||||||
|
) => {
|
||||||
|
const ancestors: Set<Element> = new Set();
|
||||||
|
while (element) {
|
||||||
|
ancestors.add(element);
|
||||||
|
element = closestWithProperty(element, property, own);
|
||||||
|
}
|
||||||
|
return ancestors;
|
||||||
|
};
|
@@ -12,7 +12,7 @@ export const isNavigationClick = (e: MouseEvent) => {
|
|||||||
|
|
||||||
const anchor = e
|
const anchor = e
|
||||||
.composedPath()
|
.composedPath()
|
||||||
.filter((n) => (n as HTMLElement).tagName === "A")[0] as
|
.find((n) => (n as HTMLElement).tagName === "A") as
|
||||||
| HTMLAnchorElement
|
| HTMLAnchorElement
|
||||||
| undefined;
|
| undefined;
|
||||||
if (
|
if (
|
||||||
|
@@ -29,8 +29,11 @@ import {
|
|||||||
mdiPowerPlug,
|
mdiPowerPlug,
|
||||||
mdiPowerPlugOff,
|
mdiPowerPlugOff,
|
||||||
mdiRadioboxBlank,
|
mdiRadioboxBlank,
|
||||||
mdiSmoke,
|
|
||||||
mdiSnowflake,
|
mdiSnowflake,
|
||||||
|
mdiSmokeDetector,
|
||||||
|
mdiSmokeDetectorAlert,
|
||||||
|
mdiSmokeDetectorVariant,
|
||||||
|
mdiSmokeDetectorVariantAlert,
|
||||||
mdiSquare,
|
mdiSquare,
|
||||||
mdiSquareOutline,
|
mdiSquareOutline,
|
||||||
mdiStop,
|
mdiStop,
|
||||||
@@ -52,6 +55,8 @@ export const binarySensorIcon = (state?: string, stateObj?: HassEntity) => {
|
|||||||
return is_off ? mdiBattery : mdiBatteryOutline;
|
return is_off ? mdiBattery : mdiBatteryOutline;
|
||||||
case "battery_charging":
|
case "battery_charging":
|
||||||
return is_off ? mdiBattery : mdiBatteryCharging;
|
return is_off ? mdiBattery : mdiBatteryCharging;
|
||||||
|
case "carbon_monoxide":
|
||||||
|
return is_off ? mdiSmokeDetector : mdiSmokeDetectorAlert;
|
||||||
case "cold":
|
case "cold":
|
||||||
return is_off ? mdiThermometer : mdiSnowflake;
|
return is_off ? mdiThermometer : mdiSnowflake;
|
||||||
case "connectivity":
|
case "connectivity":
|
||||||
@@ -68,7 +73,7 @@ export const binarySensorIcon = (state?: string, stateObj?: HassEntity) => {
|
|||||||
case "tamper":
|
case "tamper":
|
||||||
return is_off ? mdiCheckCircle : mdiAlertCircle;
|
return is_off ? mdiCheckCircle : mdiAlertCircle;
|
||||||
case "smoke":
|
case "smoke":
|
||||||
return is_off ? mdiCheckCircle : mdiSmoke;
|
return is_off ? mdiSmokeDetectorVariant : mdiSmokeDetectorVariantAlert;
|
||||||
case "heat":
|
case "heat":
|
||||||
return is_off ? mdiThermometer : mdiFire;
|
return is_off ? mdiThermometer : mdiFire;
|
||||||
case "light":
|
case "light":
|
||||||
|
@@ -1,6 +1,11 @@
|
|||||||
import { HassEntity } from "home-assistant-js-websocket";
|
import { HassEntity } from "home-assistant-js-websocket";
|
||||||
|
import { UNAVAILABLE_STATES } from "../../data/entity";
|
||||||
|
|
||||||
export const computeActiveState = (stateObj: HassEntity): string => {
|
export const computeActiveState = (stateObj: HassEntity): string => {
|
||||||
|
if (UNAVAILABLE_STATES.includes(stateObj.state)) {
|
||||||
|
return stateObj.state;
|
||||||
|
}
|
||||||
|
|
||||||
const domain = stateObj.entity_id.split(".")[0];
|
const domain = stateObj.entity_id.split(".")[0];
|
||||||
let state = stateObj.state;
|
let state = stateObj.state;
|
||||||
|
|
||||||
|
@@ -2,50 +2,74 @@ import { HassEntity } from "home-assistant-js-websocket";
|
|||||||
import { UNAVAILABLE, UNKNOWN } from "../../data/entity";
|
import { UNAVAILABLE, UNKNOWN } from "../../data/entity";
|
||||||
import { FrontendLocaleData } from "../../data/translation";
|
import { FrontendLocaleData } from "../../data/translation";
|
||||||
import {
|
import {
|
||||||
updateIsInstalling,
|
|
||||||
UpdateEntity,
|
|
||||||
UPDATE_SUPPORT_PROGRESS,
|
UPDATE_SUPPORT_PROGRESS,
|
||||||
|
updateIsInstallingFromAttributes,
|
||||||
} from "../../data/update";
|
} from "../../data/update";
|
||||||
import { formatDate } from "../datetime/format_date";
|
import { formatDate } from "../datetime/format_date";
|
||||||
import { formatDateTime } from "../datetime/format_date_time";
|
import { formatDateTime } from "../datetime/format_date_time";
|
||||||
import { formatTime } from "../datetime/format_time";
|
import { formatTime } from "../datetime/format_time";
|
||||||
import { formatNumber, isNumericState } from "../number/format_number";
|
import { formatNumber, isNumericFromAttributes } from "../number/format_number";
|
||||||
import { LocalizeFunc } from "../translations/localize";
|
import { LocalizeFunc } from "../translations/localize";
|
||||||
import { computeStateDomain } from "./compute_state_domain";
|
import { supportsFeatureFromAttributes } from "./supports-feature";
|
||||||
import { supportsFeature } from "./supports-feature";
|
import { formatDuration, UNIT_TO_SECOND_CONVERT } from "../datetime/duration";
|
||||||
|
import { computeDomain } from "./compute_domain";
|
||||||
|
|
||||||
export const computeStateDisplay = (
|
export const computeStateDisplay = (
|
||||||
localize: LocalizeFunc,
|
localize: LocalizeFunc,
|
||||||
stateObj: HassEntity,
|
stateObj: HassEntity,
|
||||||
locale: FrontendLocaleData,
|
locale: FrontendLocaleData,
|
||||||
state?: string
|
state?: string
|
||||||
): string => {
|
): string =>
|
||||||
const compareState = state !== undefined ? state : stateObj.state;
|
computeStateDisplayFromEntityAttributes(
|
||||||
|
localize,
|
||||||
|
locale,
|
||||||
|
stateObj.entity_id,
|
||||||
|
stateObj.attributes,
|
||||||
|
state !== undefined ? state : stateObj.state
|
||||||
|
);
|
||||||
|
|
||||||
if (compareState === UNKNOWN || compareState === UNAVAILABLE) {
|
export const computeStateDisplayFromEntityAttributes = (
|
||||||
return localize(`state.default.${compareState}`);
|
localize: LocalizeFunc,
|
||||||
|
locale: FrontendLocaleData,
|
||||||
|
entityId: string,
|
||||||
|
attributes: any,
|
||||||
|
state: string
|
||||||
|
): string => {
|
||||||
|
if (state === UNKNOWN || state === UNAVAILABLE) {
|
||||||
|
return localize(`state.default.${state}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Entities with a `unit_of_measurement` or `state_class` are numeric values and should use `formatNumber`
|
// Entities with a `unit_of_measurement` or `state_class` are numeric values and should use `formatNumber`
|
||||||
if (isNumericState(stateObj)) {
|
if (isNumericFromAttributes(attributes)) {
|
||||||
if (stateObj.attributes.device_class === "monetary") {
|
// state is duration
|
||||||
|
if (
|
||||||
|
attributes.device_class === "duration" &&
|
||||||
|
attributes.unit_of_measurement &&
|
||||||
|
UNIT_TO_SECOND_CONVERT[attributes.unit_of_measurement]
|
||||||
|
) {
|
||||||
try {
|
try {
|
||||||
return formatNumber(compareState, locale, {
|
return formatDuration(state, attributes.unit_of_measurement);
|
||||||
|
} catch (_err) {
|
||||||
|
// fallback to default
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (attributes.device_class === "monetary") {
|
||||||
|
try {
|
||||||
|
return formatNumber(state, locale, {
|
||||||
style: "currency",
|
style: "currency",
|
||||||
currency: stateObj.attributes.unit_of_measurement,
|
currency: attributes.unit_of_measurement,
|
||||||
|
minimumFractionDigits: 2,
|
||||||
});
|
});
|
||||||
} catch (_err) {
|
} catch (_err) {
|
||||||
// fallback to default
|
// fallback to default
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return `${formatNumber(compareState, locale)}${
|
return `${formatNumber(state, locale)}${
|
||||||
stateObj.attributes.unit_of_measurement
|
attributes.unit_of_measurement ? " " + attributes.unit_of_measurement : ""
|
||||||
? " " + stateObj.attributes.unit_of_measurement
|
|
||||||
: ""
|
|
||||||
}`;
|
}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const domain = computeStateDomain(stateObj);
|
const domain = computeDomain(entityId);
|
||||||
|
|
||||||
if (domain === "input_datetime") {
|
if (domain === "input_datetime") {
|
||||||
if (state !== undefined) {
|
if (state !== undefined) {
|
||||||
@@ -80,36 +104,32 @@ export const computeStateDisplay = (
|
|||||||
} else {
|
} else {
|
||||||
// If not trying to display an explicit state, create `Date` object from `stateObj`'s attributes then format.
|
// If not trying to display an explicit state, create `Date` object from `stateObj`'s attributes then format.
|
||||||
let date: Date;
|
let date: Date;
|
||||||
if (stateObj.attributes.has_date && stateObj.attributes.has_time) {
|
if (attributes.has_date && attributes.has_time) {
|
||||||
date = new Date(
|
date = new Date(
|
||||||
stateObj.attributes.year,
|
attributes.year,
|
||||||
stateObj.attributes.month - 1,
|
attributes.month - 1,
|
||||||
stateObj.attributes.day,
|
attributes.day,
|
||||||
stateObj.attributes.hour,
|
attributes.hour,
|
||||||
stateObj.attributes.minute
|
attributes.minute
|
||||||
);
|
);
|
||||||
return formatDateTime(date, locale);
|
return formatDateTime(date, locale);
|
||||||
}
|
}
|
||||||
if (stateObj.attributes.has_date) {
|
if (attributes.has_date) {
|
||||||
date = new Date(
|
date = new Date(attributes.year, attributes.month - 1, attributes.day);
|
||||||
stateObj.attributes.year,
|
|
||||||
stateObj.attributes.month - 1,
|
|
||||||
stateObj.attributes.day
|
|
||||||
);
|
|
||||||
return formatDate(date, locale);
|
return formatDate(date, locale);
|
||||||
}
|
}
|
||||||
if (stateObj.attributes.has_time) {
|
if (attributes.has_time) {
|
||||||
date = new Date();
|
date = new Date();
|
||||||
date.setHours(stateObj.attributes.hour, stateObj.attributes.minute);
|
date.setHours(attributes.hour, attributes.minute);
|
||||||
return formatTime(date, locale);
|
return formatTime(date, locale);
|
||||||
}
|
}
|
||||||
return stateObj.state;
|
return state;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (domain === "humidifier") {
|
if (domain === "humidifier") {
|
||||||
if (compareState === "on" && stateObj.attributes.humidity) {
|
if (state === "on" && attributes.humidity) {
|
||||||
return `${stateObj.attributes.humidity} %`;
|
return `${attributes.humidity} %`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,7 +139,7 @@ export const computeStateDisplay = (
|
|||||||
domain === "number" ||
|
domain === "number" ||
|
||||||
domain === "input_number"
|
domain === "input_number"
|
||||||
) {
|
) {
|
||||||
return formatNumber(compareState, locale);
|
return formatNumber(state, locale);
|
||||||
}
|
}
|
||||||
|
|
||||||
// state of button is a timestamp
|
// state of button is a timestamp
|
||||||
@@ -127,12 +147,12 @@ export const computeStateDisplay = (
|
|||||||
domain === "button" ||
|
domain === "button" ||
|
||||||
domain === "input_button" ||
|
domain === "input_button" ||
|
||||||
domain === "scene" ||
|
domain === "scene" ||
|
||||||
(domain === "sensor" && stateObj.attributes.device_class === "timestamp")
|
(domain === "sensor" && attributes.device_class === "timestamp")
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
return formatDateTime(new Date(compareState), locale);
|
return formatDateTime(new Date(state), locale);
|
||||||
} catch (_err) {
|
} catch (_err) {
|
||||||
return compareState;
|
return state;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -143,30 +163,28 @@ export const computeStateDisplay = (
|
|||||||
// When the latest version is skipped, show the latest version
|
// When the latest version is skipped, show the latest version
|
||||||
// When update is not available, show "Up-to-date"
|
// When update is not available, show "Up-to-date"
|
||||||
// When update is not available and there is no latest_version show "Unavailable"
|
// When update is not available and there is no latest_version show "Unavailable"
|
||||||
return compareState === "on"
|
return state === "on"
|
||||||
? updateIsInstalling(stateObj as UpdateEntity)
|
? updateIsInstallingFromAttributes(attributes)
|
||||||
? supportsFeature(stateObj, UPDATE_SUPPORT_PROGRESS)
|
? supportsFeatureFromAttributes(attributes, UPDATE_SUPPORT_PROGRESS)
|
||||||
? localize("ui.card.update.installing_with_progress", {
|
? localize("ui.card.update.installing_with_progress", {
|
||||||
progress: stateObj.attributes.in_progress,
|
progress: attributes.in_progress,
|
||||||
})
|
})
|
||||||
: localize("ui.card.update.installing")
|
: localize("ui.card.update.installing")
|
||||||
: stateObj.attributes.latest_version
|
: attributes.latest_version
|
||||||
: stateObj.attributes.skipped_version ===
|
: attributes.skipped_version === attributes.latest_version
|
||||||
stateObj.attributes.latest_version
|
? attributes.latest_version ?? localize("state.default.unavailable")
|
||||||
? stateObj.attributes.latest_version ??
|
|
||||||
localize("state.default.unavailable")
|
|
||||||
: localize("ui.card.update.up_to_date");
|
: localize("ui.card.update.up_to_date");
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
// Return device class translation
|
// Return device class translation
|
||||||
(stateObj.attributes.device_class &&
|
(attributes.device_class &&
|
||||||
localize(
|
localize(
|
||||||
`component.${domain}.state.${stateObj.attributes.device_class}.${compareState}`
|
`component.${domain}.state.${attributes.device_class}.${state}`
|
||||||
)) ||
|
)) ||
|
||||||
// Return default translation
|
// Return default translation
|
||||||
localize(`component.${domain}.state._.${compareState}`) ||
|
localize(`component.${domain}.state._.${state}`) ||
|
||||||
// We don't know! Return the raw state.
|
// We don't know! Return the raw state.
|
||||||
compareState
|
state
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
@@ -1,7 +1,13 @@
|
|||||||
import { HassEntity } from "home-assistant-js-websocket";
|
import { HassEntity } from "home-assistant-js-websocket";
|
||||||
import { computeObjectId } from "./compute_object_id";
|
import { computeObjectId } from "./compute_object_id";
|
||||||
|
|
||||||
|
export const computeStateNameFromEntityAttributes = (
|
||||||
|
entityId: string,
|
||||||
|
attributes: { [key: string]: any }
|
||||||
|
): string =>
|
||||||
|
attributes.friendly_name === undefined
|
||||||
|
? computeObjectId(entityId).replace(/_/g, " ")
|
||||||
|
: attributes.friendly_name || "";
|
||||||
|
|
||||||
export const computeStateName = (stateObj: HassEntity): string =>
|
export const computeStateName = (stateObj: HassEntity): string =>
|
||||||
stateObj.attributes.friendly_name === undefined
|
computeStateNameFromEntityAttributes(stateObj.entity_id, stateObj.attributes);
|
||||||
? computeObjectId(stateObj.entity_id).replace(/_/g, " ")
|
|
||||||
: stateObj.attributes.friendly_name || "";
|
|
||||||
|
@@ -8,29 +8,31 @@ import {
|
|||||||
mdiCalendar,
|
mdiCalendar,
|
||||||
mdiCast,
|
mdiCast,
|
||||||
mdiCastConnected,
|
mdiCastConnected,
|
||||||
|
mdiChartSankey,
|
||||||
|
mdiCheckCircleOutline,
|
||||||
mdiClock,
|
mdiClock,
|
||||||
|
mdiCloseCircleOutline,
|
||||||
mdiGestureTapButton,
|
mdiGestureTapButton,
|
||||||
mdiLanConnect,
|
mdiLanConnect,
|
||||||
mdiLanDisconnect,
|
mdiLanDisconnect,
|
||||||
mdiLightSwitch,
|
|
||||||
mdiLock,
|
mdiLock,
|
||||||
mdiLockAlert,
|
mdiLockAlert,
|
||||||
mdiLockClock,
|
mdiLockClock,
|
||||||
mdiLockOpen,
|
mdiLockOpen,
|
||||||
|
mdiPackage,
|
||||||
|
mdiPackageDown,
|
||||||
mdiPackageUp,
|
mdiPackageUp,
|
||||||
mdiPowerPlug,
|
mdiPowerPlug,
|
||||||
mdiPowerPlugOff,
|
mdiPowerPlugOff,
|
||||||
mdiRestart,
|
mdiRestart,
|
||||||
mdiToggleSwitch,
|
mdiSwapHorizontal,
|
||||||
mdiToggleSwitchOff,
|
mdiToggleSwitchVariant,
|
||||||
mdiCheckCircleOutline,
|
mdiToggleSwitchVariantOff,
|
||||||
mdiCloseCircleOutline,
|
|
||||||
mdiWeatherNight,
|
mdiWeatherNight,
|
||||||
mdiPackage,
|
|
||||||
mdiPackageDown,
|
|
||||||
} from "@mdi/js";
|
} from "@mdi/js";
|
||||||
import { HassEntity } from "home-assistant-js-websocket";
|
import { HassEntity } from "home-assistant-js-websocket";
|
||||||
import { updateIsInstalling, UpdateEntity } from "../../data/update";
|
import { UpdateEntity, updateIsInstalling } from "../../data/update";
|
||||||
|
import { weatherIcon } from "../../data/weather";
|
||||||
/**
|
/**
|
||||||
* Return the icon to be used for a domain.
|
* Return the icon to be used for a domain.
|
||||||
*
|
*
|
||||||
@@ -47,6 +49,20 @@ export const domainIcon = (
|
|||||||
stateObj?: HassEntity,
|
stateObj?: HassEntity,
|
||||||
state?: string
|
state?: string
|
||||||
): string => {
|
): string => {
|
||||||
|
const icon = domainIconWithoutDefault(domain, stateObj, state);
|
||||||
|
if (icon) {
|
||||||
|
return icon;
|
||||||
|
}
|
||||||
|
// eslint-disable-next-line
|
||||||
|
console.warn(`Unable to find icon for domain ${domain}`);
|
||||||
|
return DEFAULT_DOMAIN_ICON;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const domainIconWithoutDefault = (
|
||||||
|
domain: string,
|
||||||
|
stateObj?: HassEntity,
|
||||||
|
state?: string
|
||||||
|
): string | undefined => {
|
||||||
const compareState = state !== undefined ? state : stateObj?.state;
|
const compareState = state !== undefined ? state : stateObj?.state;
|
||||||
|
|
||||||
switch (domain) {
|
switch (domain) {
|
||||||
@@ -88,6 +104,15 @@ export const domainIcon = (
|
|||||||
? mdiCheckCircleOutline
|
? mdiCheckCircleOutline
|
||||||
: mdiCloseCircleOutline;
|
: mdiCloseCircleOutline;
|
||||||
|
|
||||||
|
case "input_datetime":
|
||||||
|
if (!stateObj?.attributes.has_date) {
|
||||||
|
return mdiClock;
|
||||||
|
}
|
||||||
|
if (!stateObj.attributes.has_time) {
|
||||||
|
return mdiCalendar;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case "lock":
|
case "lock":
|
||||||
switch (compareState) {
|
switch (compareState) {
|
||||||
case "unlocked":
|
case "unlocked":
|
||||||
@@ -109,9 +134,11 @@ export const domainIcon = (
|
|||||||
case "outlet":
|
case "outlet":
|
||||||
return compareState === "on" ? mdiPowerPlug : mdiPowerPlugOff;
|
return compareState === "on" ? mdiPowerPlug : mdiPowerPlugOff;
|
||||||
case "switch":
|
case "switch":
|
||||||
return compareState === "on" ? mdiToggleSwitch : mdiToggleSwitchOff;
|
return compareState === "on"
|
||||||
|
? mdiToggleSwitchVariant
|
||||||
|
: mdiToggleSwitchVariantOff;
|
||||||
default:
|
default:
|
||||||
return mdiLightSwitch;
|
return mdiToggleSwitchVariant;
|
||||||
}
|
}
|
||||||
|
|
||||||
case "sensor": {
|
case "sensor": {
|
||||||
@@ -123,33 +150,31 @@ export const domainIcon = (
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case "input_datetime":
|
|
||||||
if (!stateObj?.attributes.has_date) {
|
|
||||||
return mdiClock;
|
|
||||||
}
|
|
||||||
if (!stateObj.attributes.has_time) {
|
|
||||||
return mdiCalendar;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "sun":
|
case "sun":
|
||||||
return stateObj?.state === "above_horizon"
|
return stateObj?.state === "above_horizon"
|
||||||
? FIXED_DOMAIN_ICONS[domain]
|
? FIXED_DOMAIN_ICONS[domain]
|
||||||
: mdiWeatherNight;
|
: mdiWeatherNight;
|
||||||
|
|
||||||
|
case "switch_as_x":
|
||||||
|
return mdiSwapHorizontal;
|
||||||
|
|
||||||
|
case "threshold":
|
||||||
|
return mdiChartSankey;
|
||||||
|
|
||||||
case "update":
|
case "update":
|
||||||
return compareState === "on"
|
return compareState === "on"
|
||||||
? updateIsInstalling(stateObj as UpdateEntity)
|
? updateIsInstalling(stateObj as UpdateEntity)
|
||||||
? mdiPackageDown
|
? mdiPackageDown
|
||||||
: mdiPackageUp
|
: mdiPackageUp
|
||||||
: mdiPackage;
|
: mdiPackage;
|
||||||
|
|
||||||
|
case "weather":
|
||||||
|
return weatherIcon(stateObj?.state);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (domain in FIXED_DOMAIN_ICONS) {
|
if (domain in FIXED_DOMAIN_ICONS) {
|
||||||
return FIXED_DOMAIN_ICONS[domain];
|
return FIXED_DOMAIN_ICONS[domain];
|
||||||
}
|
}
|
||||||
|
|
||||||
// eslint-disable-next-line
|
return undefined;
|
||||||
console.warn(`Unable to find icon for domain ${domain}`);
|
|
||||||
return DEFAULT_DOMAIN_ICON;
|
|
||||||
};
|
};
|
||||||
|
@@ -3,6 +3,13 @@ import { HassEntity } from "home-assistant-js-websocket";
|
|||||||
export const supportsFeature = (
|
export const supportsFeature = (
|
||||||
stateObj: HassEntity,
|
stateObj: HassEntity,
|
||||||
feature: number
|
feature: number
|
||||||
|
): boolean => supportsFeatureFromAttributes(stateObj.attributes, feature);
|
||||||
|
|
||||||
|
export const supportsFeatureFromAttributes = (
|
||||||
|
attributes: {
|
||||||
|
[key: string]: any;
|
||||||
|
},
|
||||||
|
feature: number
|
||||||
): boolean =>
|
): boolean =>
|
||||||
// eslint-disable-next-line no-bitwise
|
// eslint-disable-next-line no-bitwise
|
||||||
(stateObj.attributes.supported_features! & feature) !== 0;
|
(attributes.supported_features! & feature) !== 0;
|
||||||
|
@@ -5,6 +5,6 @@ export const clamp = (value: number, min: number, max: number) =>
|
|||||||
export const conditionalClamp = (value: number, min?: number, max?: number) => {
|
export const conditionalClamp = (value: number, min?: number, max?: number) => {
|
||||||
let result: number;
|
let result: number;
|
||||||
result = min ? Math.max(value, min) : value;
|
result = min ? Math.max(value, min) : value;
|
||||||
result = max ? Math.min(value, max) : value;
|
result = max ? Math.min(result, max) : result;
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
@@ -7,8 +7,11 @@ import { round } from "./round";
|
|||||||
* @param stateObj The entity state object
|
* @param stateObj The entity state object
|
||||||
*/
|
*/
|
||||||
export const isNumericState = (stateObj: HassEntity): boolean =>
|
export const isNumericState = (stateObj: HassEntity): boolean =>
|
||||||
!!stateObj.attributes.unit_of_measurement ||
|
isNumericFromAttributes(stateObj.attributes);
|
||||||
!!stateObj.attributes.state_class;
|
|
||||||
|
export const isNumericFromAttributes = (attributes: {
|
||||||
|
[key: string]: any;
|
||||||
|
}): boolean => !!attributes.unit_of_measurement || !!attributes.state_class;
|
||||||
|
|
||||||
export const numberFormatToLocale = (
|
export const numberFormatToLocale = (
|
||||||
localeOptions: FrontendLocaleData
|
localeOptions: FrontendLocaleData
|
||||||
|
@@ -7,6 +7,7 @@ export const iconColorCSS = css`
|
|||||||
ha-state-icon[data-domain="calendar"][data-state="on"],
|
ha-state-icon[data-domain="calendar"][data-state="on"],
|
||||||
ha-state-icon[data-domain="camera"][data-state="streaming"],
|
ha-state-icon[data-domain="camera"][data-state="streaming"],
|
||||||
ha-state-icon[data-domain="cover"][data-state="open"],
|
ha-state-icon[data-domain="cover"][data-state="open"],
|
||||||
|
ha-state-icon[data-domain="device_tracker"][data-state="home"],
|
||||||
ha-state-icon[data-domain="fan"][data-state="on"],
|
ha-state-icon[data-domain="fan"][data-state="on"],
|
||||||
ha-state-icon[data-domain="humidifier"][data-state="on"],
|
ha-state-icon[data-domain="humidifier"][data-state="on"],
|
||||||
ha-state-icon[data-domain="light"][data-state="on"],
|
ha-state-icon[data-domain="light"][data-state="on"],
|
||||||
@@ -69,7 +70,9 @@ export const iconColorCSS = css`
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ha-state-icon[data-domain="plant"][data-state="problem"],
|
ha-state-icon[data-domain="plant"][data-state="problem"] {
|
||||||
|
color: var(--state-icon-error-color);
|
||||||
|
}
|
||||||
|
|
||||||
/* Color the icon if unavailable */
|
/* Color the icon if unavailable */
|
||||||
ha-state-icon[data-state="unavailable"] {
|
ha-state-icon[data-state="unavailable"] {
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
import { LitElement } from "lit";
|
||||||
import { HomeAssistant } from "../../types";
|
import { HomeAssistant } from "../../types";
|
||||||
|
|
||||||
export function computeRTL(hass: HomeAssistant) {
|
export function computeRTL(hass: HomeAssistant) {
|
||||||
@@ -15,3 +16,21 @@ export function computeRTLDirection(hass: HomeAssistant) {
|
|||||||
export function emitRTLDirection(rtl: boolean) {
|
export function emitRTLDirection(rtl: boolean) {
|
||||||
return rtl ? "rtl" : "ltr";
|
return rtl ? "rtl" : "ltr";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function computeDirectionStyles(isRTL: boolean, element: LitElement) {
|
||||||
|
const direction: string = emitRTLDirection(isRTL);
|
||||||
|
setDirectionStyles(direction, element);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setDirectionStyles(direction: string, element: LitElement) {
|
||||||
|
element.style.direction = direction;
|
||||||
|
element.style.setProperty("--direction", direction);
|
||||||
|
element.style.setProperty(
|
||||||
|
"--float-start",
|
||||||
|
direction === "ltr" ? "left" : "right"
|
||||||
|
);
|
||||||
|
element.style.setProperty(
|
||||||
|
"--float-end",
|
||||||
|
direction === "ltr" ? "right" : "left"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
export const promiseTimeout = (ms: number, promise: Promise<any>) => {
|
export const promiseTimeout = (ms: number, promise: Promise<any> | any) => {
|
||||||
const timeout = new Promise((_resolve, reject) => {
|
const timeout = new Promise((_resolve, reject) => {
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
reject(`Timed out in ${ms} ms.`);
|
reject(`Timed out in ${ms} ms.`);
|
||||||
|
18
src/common/util/subscribe-polling.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { HomeAssistant } from "../../types";
|
||||||
|
|
||||||
|
export const subscribePollingCollection = (
|
||||||
|
hass: HomeAssistant,
|
||||||
|
updateData: (hass: HomeAssistant) => void,
|
||||||
|
interval: number
|
||||||
|
) => {
|
||||||
|
let timeout;
|
||||||
|
const fetchData = async () => {
|
||||||
|
try {
|
||||||
|
await updateData(hass);
|
||||||
|
} finally {
|
||||||
|
timeout = setTimeout(() => fetchData(), interval);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
fetchData();
|
||||||
|
return () => clearTimeout(timeout);
|
||||||
|
};
|
@@ -13,7 +13,7 @@ export const throttle = <T extends any[]>(
|
|||||||
) => {
|
) => {
|
||||||
let timeout: number | undefined;
|
let timeout: number | undefined;
|
||||||
let previous = 0;
|
let previous = 0;
|
||||||
return (...args: T): void => {
|
const throttledFunc = (...args: T): void => {
|
||||||
const later = () => {
|
const later = () => {
|
||||||
previous = leading === false ? 0 : Date.now();
|
previous = leading === false ? 0 : Date.now();
|
||||||
timeout = undefined;
|
timeout = undefined;
|
||||||
@@ -35,4 +35,10 @@ export const throttle = <T extends any[]>(
|
|||||||
timeout = window.setTimeout(later, remaining);
|
timeout = window.setTimeout(later, remaining);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
throttledFunc.cancel = () => {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
timeout = undefined;
|
||||||
|
previous = 0;
|
||||||
|
};
|
||||||
|
return throttledFunc;
|
||||||
};
|
};
|
||||||
|
53
src/common/util/time-cache-entity-promise-func.ts
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
import { HomeAssistant } from "../../types";
|
||||||
|
|
||||||
|
interface ResultCache<T> {
|
||||||
|
[entityId: string]: Promise<T> | undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Call a function with result caching per entity.
|
||||||
|
* @param cacheKey key to store the cache on hass object
|
||||||
|
* @param cacheTime time to cache the results
|
||||||
|
* @param func function to fetch the data
|
||||||
|
* @param hass Home Assistant object
|
||||||
|
* @param entityId entity to fetch data for
|
||||||
|
* @param args extra arguments to pass to the function to fetch the data
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
|
export const timeCacheEntityPromiseFunc = async <T>(
|
||||||
|
cacheKey: string,
|
||||||
|
cacheTime: number,
|
||||||
|
func: (hass: HomeAssistant, entityId: string, ...args: any[]) => Promise<T>,
|
||||||
|
hass: HomeAssistant,
|
||||||
|
entityId: string,
|
||||||
|
...args: any[]
|
||||||
|
): Promise<T> => {
|
||||||
|
let cache: ResultCache<T> | undefined = (hass as any)[cacheKey];
|
||||||
|
|
||||||
|
if (!cache) {
|
||||||
|
cache = hass[cacheKey] = {};
|
||||||
|
}
|
||||||
|
|
||||||
|
const lastResult = cache[entityId];
|
||||||
|
|
||||||
|
if (lastResult) {
|
||||||
|
return lastResult;
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = func(hass, entityId, ...args);
|
||||||
|
cache[entityId] = result;
|
||||||
|
|
||||||
|
result.then(
|
||||||
|
// When successful, set timer to clear cache
|
||||||
|
() =>
|
||||||
|
setTimeout(() => {
|
||||||
|
cache![entityId] = undefined;
|
||||||
|
}, cacheTime),
|
||||||
|
// On failure, clear cache right away
|
||||||
|
() => {
|
||||||
|
cache![entityId] = undefined;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
};
|
@@ -1,43 +1,80 @@
|
|||||||
import { HomeAssistant } from "../../types";
|
import { HomeAssistant } from "../../types";
|
||||||
|
|
||||||
interface ResultCache<T> {
|
interface CacheResult<T> {
|
||||||
[entityId: string]: Promise<T> | undefined;
|
result: T;
|
||||||
|
cacheKey: any;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Caches a result of a promise for X time. Allows optional extra validation
|
||||||
|
* check to invalidate the cache.
|
||||||
|
* @param cacheKey the key to store the cache
|
||||||
|
* @param cacheTime the time to cache the result
|
||||||
|
* @param func the function to fetch the data
|
||||||
|
* @param generateCacheKey optional function to generate a cache key based on current hass + cached result. Cache is invalid if generates a different cache key.
|
||||||
|
* @param hass Home Assistant object
|
||||||
|
* @param args extra arguments to pass to the function to fetch the data
|
||||||
|
* @returns
|
||||||
|
*/
|
||||||
export const timeCachePromiseFunc = async <T>(
|
export const timeCachePromiseFunc = async <T>(
|
||||||
cacheKey: string,
|
cacheKey: string,
|
||||||
cacheTime: number,
|
cacheTime: number,
|
||||||
func: (hass: HomeAssistant, entityId: string, ...args: any[]) => Promise<T>,
|
func: (hass: HomeAssistant, ...args: any[]) => Promise<T>,
|
||||||
|
generateCacheKey:
|
||||||
|
| ((hass: HomeAssistant, lastResult: T) => unknown)
|
||||||
|
| undefined,
|
||||||
hass: HomeAssistant,
|
hass: HomeAssistant,
|
||||||
entityId: string,
|
|
||||||
...args: any[]
|
...args: any[]
|
||||||
): Promise<T> => {
|
): Promise<T> => {
|
||||||
let cache: ResultCache<T> | undefined = (hass as any)[cacheKey];
|
const anyHass = hass as any;
|
||||||
|
const lastResult: Promise<CacheResult<T>> | CacheResult<T> | undefined =
|
||||||
|
anyHass[cacheKey];
|
||||||
|
|
||||||
if (!cache) {
|
const checkCachedResult = (result: CacheResult<T>): T | Promise<T> => {
|
||||||
cache = hass[cacheKey] = {};
|
if (
|
||||||
|
!generateCacheKey ||
|
||||||
|
generateCacheKey(hass, result.result) === result.cacheKey
|
||||||
|
) {
|
||||||
|
return result.result;
|
||||||
}
|
}
|
||||||
|
|
||||||
const lastResult = cache[entityId];
|
anyHass[cacheKey] = undefined;
|
||||||
|
return timeCachePromiseFunc(
|
||||||
|
cacheKey,
|
||||||
|
cacheTime,
|
||||||
|
func,
|
||||||
|
generateCacheKey,
|
||||||
|
hass,
|
||||||
|
...args
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
// If we have a cached result, return it if it's still valid
|
||||||
if (lastResult) {
|
if (lastResult) {
|
||||||
return lastResult;
|
return lastResult instanceof Promise
|
||||||
|
? lastResult.then(checkCachedResult)
|
||||||
|
: checkCachedResult(lastResult);
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = func(hass, entityId, ...args);
|
const resultPromise = func(hass, ...args);
|
||||||
cache[entityId] = result;
|
anyHass[cacheKey] = resultPromise;
|
||||||
|
|
||||||
result.then(
|
resultPromise.then(
|
||||||
// When successful, set timer to clear cache
|
// When successful, set timer to clear cache
|
||||||
() =>
|
(result) => {
|
||||||
|
anyHass[cacheKey] = {
|
||||||
|
result,
|
||||||
|
cacheKey: generateCacheKey?.(hass, result),
|
||||||
|
};
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
cache![entityId] = undefined;
|
anyHass[cacheKey] = undefined;
|
||||||
}, cacheTime),
|
}, cacheTime);
|
||||||
|
},
|
||||||
// On failure, clear cache right away
|
// On failure, clear cache right away
|
||||||
() => {
|
() => {
|
||||||
cache![entityId] = undefined;
|
anyHass[cacheKey] = undefined;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
return result;
|
return resultPromise;
|
||||||
};
|
};
|
||||||
|
@@ -34,7 +34,7 @@ import {
|
|||||||
endOfMonth,
|
endOfMonth,
|
||||||
endOfQuarter,
|
endOfQuarter,
|
||||||
endOfYear,
|
endOfYear,
|
||||||
} from "date-fns";
|
} from "date-fns/esm";
|
||||||
import {
|
import {
|
||||||
formatDate,
|
formatDate,
|
||||||
formatDateMonth,
|
formatDateMonth,
|
||||||
|
@@ -11,6 +11,8 @@ import { classMap } from "lit/directives/class-map";
|
|||||||
import { styleMap } from "lit/directives/style-map";
|
import { styleMap } from "lit/directives/style-map";
|
||||||
import { clamp } from "../../common/number/clamp";
|
import { clamp } from "../../common/number/clamp";
|
||||||
|
|
||||||
|
export const MIN_TIME_BETWEEN_UPDATES = 60 * 5 * 1000;
|
||||||
|
|
||||||
interface Tooltip extends TooltipModel<any> {
|
interface Tooltip extends TooltipModel<any> {
|
||||||
top: string;
|
top: string;
|
||||||
left: string;
|
left: string;
|
||||||
@@ -37,6 +39,26 @@ export default class HaChartBase extends LitElement {
|
|||||||
|
|
||||||
@state() private _hiddenDatasets: Set<number> = new Set();
|
@state() private _hiddenDatasets: Set<number> = new Set();
|
||||||
|
|
||||||
|
private _releaseCanvas() {
|
||||||
|
// release the canvas memory to prevent
|
||||||
|
// safari from running out of memory.
|
||||||
|
if (this.chart) {
|
||||||
|
this.chart.destroy();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public disconnectedCallback() {
|
||||||
|
this._releaseCanvas();
|
||||||
|
super.disconnectedCallback();
|
||||||
|
}
|
||||||
|
|
||||||
|
public connectedCallback() {
|
||||||
|
super.connectedCallback();
|
||||||
|
if (this.hasUpdated) {
|
||||||
|
this._setupChart();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected firstUpdated() {
|
protected firstUpdated() {
|
||||||
this._setupChart();
|
this._setupChart();
|
||||||
this.data.datasets.forEach((dataset, index) => {
|
this.data.datasets.forEach((dataset, index) => {
|
||||||
@@ -304,6 +326,9 @@ export default class HaChartBase extends LitElement {
|
|||||||
width: 16px;
|
width: 16px;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
margin-inline-end: 6px;
|
||||||
|
margin-inline-start: initial;
|
||||||
|
direction: var(--direction);
|
||||||
}
|
}
|
||||||
.chartTooltip .bullet {
|
.chartTooltip .bullet {
|
||||||
align-self: baseline;
|
align-self: baseline;
|
||||||
@@ -312,6 +337,9 @@ export default class HaChartBase extends LitElement {
|
|||||||
:host([rtl]) .chartTooltip .bullet {
|
:host([rtl]) .chartTooltip .bullet {
|
||||||
margin-right: inherit;
|
margin-right: inherit;
|
||||||
margin-left: 6px;
|
margin-left: 6px;
|
||||||
|
margin-inline-end: inherit;
|
||||||
|
margin-inline-start: 6px;
|
||||||
|
direction: var(--direction);
|
||||||
}
|
}
|
||||||
.chartTooltip {
|
.chartTooltip {
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
|
@@ -8,7 +8,7 @@ import {
|
|||||||
} from "../../common/number/format_number";
|
} from "../../common/number/format_number";
|
||||||
import { LineChartEntity, LineChartState } from "../../data/history";
|
import { LineChartEntity, LineChartState } from "../../data/history";
|
||||||
import { HomeAssistant } from "../../types";
|
import { HomeAssistant } from "../../types";
|
||||||
import "./ha-chart-base";
|
import { MIN_TIME_BETWEEN_UPDATES } from "./ha-chart-base";
|
||||||
|
|
||||||
const safeParseFloat = (value) => {
|
const safeParseFloat = (value) => {
|
||||||
const parsed = parseFloat(value);
|
const parsed = parseFloat(value);
|
||||||
@@ -28,11 +28,13 @@ class StateHistoryChartLine extends LitElement {
|
|||||||
|
|
||||||
@property({ type: Boolean }) public isSingleDevice = false;
|
@property({ type: Boolean }) public isSingleDevice = false;
|
||||||
|
|
||||||
@property({ attribute: false }) public endTime?: Date;
|
@property({ attribute: false }) public endTime!: Date;
|
||||||
|
|
||||||
@state() private _chartData?: ChartData<"line">;
|
@state() private _chartData?: ChartData<"line">;
|
||||||
|
|
||||||
@state() private _chartOptions?: ChartOptions<"line">;
|
@state() private _chartOptions?: ChartOptions;
|
||||||
|
|
||||||
|
private _chartTime: Date = new Date();
|
||||||
|
|
||||||
protected render() {
|
protected render() {
|
||||||
return html`
|
return html`
|
||||||
@@ -57,6 +59,7 @@ class StateHistoryChartLine extends LitElement {
|
|||||||
locale: this.hass.locale,
|
locale: this.hass.locale,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
suggestedMax: this.endTime,
|
||||||
ticks: {
|
ticks: {
|
||||||
maxRotation: 0,
|
maxRotation: 0,
|
||||||
sampleSize: 5,
|
sampleSize: 5,
|
||||||
@@ -120,7 +123,13 @@ class StateHistoryChartLine extends LitElement {
|
|||||||
locale: numberFormatToLocale(this.hass.locale),
|
locale: numberFormatToLocale(this.hass.locale),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (changedProps.has("data")) {
|
if (
|
||||||
|
changedProps.has("data") ||
|
||||||
|
this._chartTime <
|
||||||
|
new Date(this.endTime.getTime() - MIN_TIME_BETWEEN_UPDATES)
|
||||||
|
) {
|
||||||
|
// If the line is more than 5 minutes old, re-gen it
|
||||||
|
// so the X axis grows even if there is no new data
|
||||||
this._generateData();
|
this._generateData();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -130,28 +139,12 @@ class StateHistoryChartLine extends LitElement {
|
|||||||
const computedStyles = getComputedStyle(this);
|
const computedStyles = getComputedStyle(this);
|
||||||
const entityStates = this.data;
|
const entityStates = this.data;
|
||||||
const datasets: ChartDataset<"line">[] = [];
|
const datasets: ChartDataset<"line">[] = [];
|
||||||
let endTime: Date;
|
|
||||||
|
|
||||||
if (entityStates.length === 0) {
|
if (entityStates.length === 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
endTime =
|
this._chartTime = new Date();
|
||||||
this.endTime ||
|
const endTime = this.endTime;
|
||||||
// Get the highest date from the last date of each device
|
|
||||||
new Date(
|
|
||||||
Math.max(
|
|
||||||
...entityStates.map((devSts) =>
|
|
||||||
new Date(
|
|
||||||
devSts.states[devSts.states.length - 1].last_changed
|
|
||||||
).getTime()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
);
|
|
||||||
if (endTime > new Date()) {
|
|
||||||
endTime = new Date();
|
|
||||||
}
|
|
||||||
|
|
||||||
const names = this.names || {};
|
const names = this.names || {};
|
||||||
entityStates.forEach((states) => {
|
entityStates.forEach((states) => {
|
||||||
const domain = states.domain;
|
const domain = states.domain;
|
||||||
|
@@ -9,7 +9,7 @@ import { numberFormatToLocale } from "../../common/number/format_number";
|
|||||||
import { computeRTL } from "../../common/util/compute_rtl";
|
import { computeRTL } from "../../common/util/compute_rtl";
|
||||||
import { TimelineEntity } from "../../data/history";
|
import { TimelineEntity } from "../../data/history";
|
||||||
import { HomeAssistant } from "../../types";
|
import { HomeAssistant } from "../../types";
|
||||||
import "./ha-chart-base";
|
import { MIN_TIME_BETWEEN_UPDATES } from "./ha-chart-base";
|
||||||
import type { TimeLineData } from "./timeline-chart/const";
|
import type { TimeLineData } from "./timeline-chart/const";
|
||||||
|
|
||||||
/** Binary sensor device classes for which the static colors for on/off are NOT inverted.
|
/** Binary sensor device classes for which the static colors for on/off are NOT inverted.
|
||||||
@@ -83,6 +83,8 @@ export class StateHistoryChartTimeline extends LitElement {
|
|||||||
|
|
||||||
@property({ attribute: false }) public data: TimelineEntity[] = [];
|
@property({ attribute: false }) public data: TimelineEntity[] = [];
|
||||||
|
|
||||||
|
@property() public narrow!: boolean;
|
||||||
|
|
||||||
@property() public names: boolean | Record<string, string> = false;
|
@property() public names: boolean | Record<string, string> = false;
|
||||||
|
|
||||||
@property() public unit?: string;
|
@property() public unit?: string;
|
||||||
@@ -91,12 +93,18 @@ export class StateHistoryChartTimeline extends LitElement {
|
|||||||
|
|
||||||
@property({ type: Boolean }) public isSingleDevice = false;
|
@property({ type: Boolean }) public isSingleDevice = false;
|
||||||
|
|
||||||
@property({ attribute: false }) public endTime?: Date;
|
@property({ type: Boolean }) public chunked = false;
|
||||||
|
|
||||||
|
@property({ attribute: false }) public startTime!: Date;
|
||||||
|
|
||||||
|
@property({ attribute: false }) public endTime!: Date;
|
||||||
|
|
||||||
@state() private _chartData?: ChartData<"timeline">;
|
@state() private _chartData?: ChartData<"timeline">;
|
||||||
|
|
||||||
@state() private _chartOptions?: ChartOptions<"timeline">;
|
@state() private _chartOptions?: ChartOptions<"timeline">;
|
||||||
|
|
||||||
|
private _chartTime: Date = new Date();
|
||||||
|
|
||||||
protected render() {
|
protected render() {
|
||||||
return html`
|
return html`
|
||||||
<ha-chart-base
|
<ha-chart-base
|
||||||
@@ -110,6 +118,7 @@ export class StateHistoryChartTimeline extends LitElement {
|
|||||||
|
|
||||||
public willUpdate(changedProps: PropertyValues) {
|
public willUpdate(changedProps: PropertyValues) {
|
||||||
if (!this.hasUpdated) {
|
if (!this.hasUpdated) {
|
||||||
|
const narrow = this.narrow;
|
||||||
this._chartOptions = {
|
this._chartOptions = {
|
||||||
maintainAspectRatio: false,
|
maintainAspectRatio: false,
|
||||||
parsing: false,
|
parsing: false,
|
||||||
@@ -123,6 +132,8 @@ export class StateHistoryChartTimeline extends LitElement {
|
|||||||
locale: this.hass.locale,
|
locale: this.hass.locale,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
suggestedMin: this.startTime,
|
||||||
|
suggestedMax: this.endTime,
|
||||||
ticks: {
|
ticks: {
|
||||||
autoSkip: true,
|
autoSkip: true,
|
||||||
maxRotation: 0,
|
maxRotation: 0,
|
||||||
@@ -153,11 +164,18 @@ export class StateHistoryChartTimeline extends LitElement {
|
|||||||
drawTicks: false,
|
drawTicks: false,
|
||||||
},
|
},
|
||||||
ticks: {
|
ticks: {
|
||||||
display: this.data.length !== 1,
|
display:
|
||||||
|
this.chunked || !this.isSingleDevice || this.data.length !== 1,
|
||||||
},
|
},
|
||||||
afterSetDimensions: (y) => {
|
afterSetDimensions: (y) => {
|
||||||
y.maxWidth = y.chart.width * 0.18;
|
y.maxWidth = y.chart.width * 0.18;
|
||||||
},
|
},
|
||||||
|
afterFit: (scaleInstance) => {
|
||||||
|
if (this.chunked) {
|
||||||
|
// ensure all the chart labels are the same width
|
||||||
|
scaleInstance.width = narrow ? 105 : 185;
|
||||||
|
}
|
||||||
|
},
|
||||||
position: computeRTL(this.hass) ? "right" : "left",
|
position: computeRTL(this.hass) ? "right" : "left",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@@ -195,7 +213,13 @@ export class StateHistoryChartTimeline extends LitElement {
|
|||||||
locale: numberFormatToLocale(this.hass.locale),
|
locale: numberFormatToLocale(this.hass.locale),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
if (changedProps.has("data")) {
|
if (
|
||||||
|
changedProps.has("data") ||
|
||||||
|
this._chartTime <
|
||||||
|
new Date(this.endTime.getTime() - MIN_TIME_BETWEEN_UPDATES)
|
||||||
|
) {
|
||||||
|
// If the line is more than 5 minutes old, re-gen it
|
||||||
|
// so the X axis grows even if there is no new data
|
||||||
this._generateData();
|
this._generateData();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -208,34 +232,9 @@ export class StateHistoryChartTimeline extends LitElement {
|
|||||||
stateHistory = [];
|
stateHistory = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
const startTime = new Date(
|
this._chartTime = new Date();
|
||||||
stateHistory.reduce(
|
const startTime = this.startTime;
|
||||||
(minTime, stateInfo) =>
|
const endTime = this.endTime;
|
||||||
Math.min(minTime, new Date(stateInfo.data[0].last_changed).getTime()),
|
|
||||||
new Date().getTime()
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
// end time is Math.max(startTime, last_event)
|
|
||||||
let endTime =
|
|
||||||
this.endTime ||
|
|
||||||
new Date(
|
|
||||||
stateHistory.reduce(
|
|
||||||
(maxTime, stateInfo) =>
|
|
||||||
Math.max(
|
|
||||||
maxTime,
|
|
||||||
new Date(
|
|
||||||
stateInfo.data[stateInfo.data.length - 1].last_changed
|
|
||||||
).getTime()
|
|
||||||
),
|
|
||||||
startTime.getTime()
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
if (endTime > new Date()) {
|
|
||||||
endTime = new Date();
|
|
||||||
}
|
|
||||||
|
|
||||||
const labels: string[] = [];
|
const labels: string[] = [];
|
||||||
const datasets: ChartDataset<"timeline">[] = [];
|
const datasets: ChartDataset<"timeline">[] = [];
|
||||||
const names = this.names || {};
|
const names = this.names || {};
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
import "@lit-labs/virtualizer";
|
||||||
import {
|
import {
|
||||||
css,
|
css,
|
||||||
CSSResultGroup,
|
CSSResultGroup,
|
||||||
@@ -6,12 +7,29 @@ import {
|
|||||||
PropertyValues,
|
PropertyValues,
|
||||||
TemplateResult,
|
TemplateResult,
|
||||||
} from "lit";
|
} from "lit";
|
||||||
import { customElement, property } from "lit/decorators";
|
import { customElement, property, state, eventOptions } from "lit/decorators";
|
||||||
import { isComponentLoaded } from "../../common/config/is_component_loaded";
|
import { isComponentLoaded } from "../../common/config/is_component_loaded";
|
||||||
import { HistoryResult } from "../../data/history";
|
import {
|
||||||
|
HistoryResult,
|
||||||
|
LineChartUnit,
|
||||||
|
TimelineEntity,
|
||||||
|
} from "../../data/history";
|
||||||
import type { HomeAssistant } from "../../types";
|
import type { HomeAssistant } from "../../types";
|
||||||
import "./state-history-chart-line";
|
import "./state-history-chart-line";
|
||||||
import "./state-history-chart-timeline";
|
import "./state-history-chart-timeline";
|
||||||
|
import { restoreScroll } from "../../common/decorators/restore-scroll";
|
||||||
|
|
||||||
|
const CANVAS_TIMELINE_ROWS_CHUNK = 10; // Split up the canvases to avoid hitting the render limit
|
||||||
|
|
||||||
|
const chunkData = (inputArray: any[], chunks: number) =>
|
||||||
|
inputArray.reduce((results, item, idx) => {
|
||||||
|
const chunkIdx = Math.floor(idx / chunks);
|
||||||
|
if (!results[chunkIdx]) {
|
||||||
|
results[chunkIdx] = [];
|
||||||
|
}
|
||||||
|
results[chunkIdx].push(item);
|
||||||
|
return results;
|
||||||
|
}, []);
|
||||||
|
|
||||||
@customElement("state-history-charts")
|
@customElement("state-history-charts")
|
||||||
class StateHistoryCharts extends LitElement {
|
class StateHistoryCharts extends LitElement {
|
||||||
@@ -19,8 +37,13 @@ class StateHistoryCharts extends LitElement {
|
|||||||
|
|
||||||
@property({ attribute: false }) public historyData!: HistoryResult;
|
@property({ attribute: false }) public historyData!: HistoryResult;
|
||||||
|
|
||||||
|
@property() public narrow!: boolean;
|
||||||
|
|
||||||
@property({ type: Boolean }) public names = false;
|
@property({ type: Boolean }) public names = false;
|
||||||
|
|
||||||
|
@property({ type: Boolean, attribute: "virtualize", reflect: true })
|
||||||
|
public virtualize = false;
|
||||||
|
|
||||||
@property({ attribute: false }) public endTime?: Date;
|
@property({ attribute: false }) public endTime?: Date;
|
||||||
|
|
||||||
@property({ type: Boolean, attribute: "up-to-now" }) public upToNow = false;
|
@property({ type: Boolean, attribute: "up-to-now" }) public upToNow = false;
|
||||||
@@ -29,6 +52,14 @@ class StateHistoryCharts extends LitElement {
|
|||||||
|
|
||||||
@property({ type: Boolean }) public isLoadingData = false;
|
@property({ type: Boolean }) public isLoadingData = false;
|
||||||
|
|
||||||
|
@state() private _computedStartTime!: Date;
|
||||||
|
|
||||||
|
@state() private _computedEndTime!: Date;
|
||||||
|
|
||||||
|
// @ts-ignore
|
||||||
|
@restoreScroll(".container") private _savedScrollPos?: number;
|
||||||
|
|
||||||
|
@eventOptions({ passive: true })
|
||||||
protected render(): TemplateResult {
|
protected render(): TemplateResult {
|
||||||
if (!isComponentLoaded(this.hass, "history")) {
|
if (!isComponentLoaded(this.hass, "history")) {
|
||||||
return html`<div class="info">
|
return html`<div class="info">
|
||||||
@@ -48,39 +79,76 @@ class StateHistoryCharts extends LitElement {
|
|||||||
</div>`;
|
</div>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
const computedEndTime = this.upToNow
|
const now = new Date();
|
||||||
? new Date()
|
|
||||||
: this.endTime || new Date();
|
|
||||||
|
|
||||||
return html`
|
this._computedEndTime =
|
||||||
${this.historyData.timeline.length
|
this.upToNow || !this.endTime || this.endTime > now ? now : this.endTime;
|
||||||
? html`
|
|
||||||
<state-history-chart-timeline
|
this._computedStartTime = new Date(
|
||||||
.hass=${this.hass}
|
this.historyData.timeline.reduce(
|
||||||
.data=${this.historyData.timeline}
|
(minTime, stateInfo) =>
|
||||||
.endTime=${computedEndTime}
|
Math.min(minTime, new Date(stateInfo.data[0].last_changed).getTime()),
|
||||||
.noSingle=${this.noSingle}
|
new Date().getTime()
|
||||||
.names=${this.names}
|
)
|
||||||
></state-history-chart-timeline>
|
);
|
||||||
`
|
|
||||||
: html``}
|
const combinedItems = this.historyData.timeline.length
|
||||||
${this.historyData.line.map(
|
? (this.virtualize
|
||||||
(line) => html`
|
? chunkData(this.historyData.timeline, CANVAS_TIMELINE_ROWS_CHUNK)
|
||||||
|
: [this.historyData.timeline]
|
||||||
|
).concat(this.historyData.line)
|
||||||
|
: this.historyData.line;
|
||||||
|
|
||||||
|
return this.virtualize
|
||||||
|
? html`<div class="container ha-scrollbar" @scroll=${this._saveScrollPos}>
|
||||||
|
<lit-virtualizer
|
||||||
|
scroller
|
||||||
|
class="ha-scrollbar"
|
||||||
|
.items=${combinedItems}
|
||||||
|
.renderItem=${this._renderHistoryItem}
|
||||||
|
>
|
||||||
|
</lit-virtualizer>
|
||||||
|
</div>`
|
||||||
|
: html`${combinedItems.map((item, index) =>
|
||||||
|
this._renderHistoryItem(item, index)
|
||||||
|
)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private _renderHistoryItem = (
|
||||||
|
item: TimelineEntity[] | LineChartUnit,
|
||||||
|
index: number
|
||||||
|
): TemplateResult => {
|
||||||
|
if (!item || index === undefined) {
|
||||||
|
return html``;
|
||||||
|
}
|
||||||
|
if (!Array.isArray(item)) {
|
||||||
|
return html`<div class="entry-container">
|
||||||
<state-history-chart-line
|
<state-history-chart-line
|
||||||
.hass=${this.hass}
|
.hass=${this.hass}
|
||||||
.unit=${line.unit}
|
.unit=${item.unit}
|
||||||
.data=${line.data}
|
.data=${item.data}
|
||||||
.identifier=${line.identifier}
|
.identifier=${item.identifier}
|
||||||
.isSingleDevice=${!this.noSingle &&
|
.isSingleDevice=${!this.noSingle &&
|
||||||
line.data &&
|
this.historyData.line?.length === 1}
|
||||||
line.data.length === 1}
|
.endTime=${this._computedEndTime}
|
||||||
.endTime=${computedEndTime}
|
|
||||||
.names=${this.names}
|
.names=${this.names}
|
||||||
></state-history-chart-line>
|
></state-history-chart-line>
|
||||||
`
|
</div> `;
|
||||||
)}
|
|
||||||
`;
|
|
||||||
}
|
}
|
||||||
|
return html`<div class="entry-container">
|
||||||
|
<state-history-chart-timeline
|
||||||
|
.hass=${this.hass}
|
||||||
|
.data=${item}
|
||||||
|
.startTime=${this._computedStartTime}
|
||||||
|
.endTime=${this._computedEndTime}
|
||||||
|
.isSingleDevice=${!this.noSingle &&
|
||||||
|
this.historyData.timeline?.length === 1}
|
||||||
|
.names=${this.names}
|
||||||
|
.narrow=${this.narrow}
|
||||||
|
.chunked=${this.virtualize}
|
||||||
|
></state-history-chart-timeline>
|
||||||
|
</div> `;
|
||||||
|
};
|
||||||
|
|
||||||
protected shouldUpdate(changedProps: PropertyValues): boolean {
|
protected shouldUpdate(changedProps: PropertyValues): boolean {
|
||||||
return !(changedProps.size === 1 && changedProps.has("hass"));
|
return !(changedProps.size === 1 && changedProps.has("hass"));
|
||||||
@@ -96,6 +164,11 @@ class StateHistoryCharts extends LitElement {
|
|||||||
return !this.isLoadingData && historyDataEmpty;
|
return !this.isLoadingData && historyDataEmpty;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@eventOptions({ passive: true })
|
||||||
|
private _saveScrollPos(e: Event) {
|
||||||
|
this._savedScrollPos = (e.target as HTMLDivElement).scrollTop;
|
||||||
|
}
|
||||||
|
|
||||||
static get styles(): CSSResultGroup {
|
static get styles(): CSSResultGroup {
|
||||||
return css`
|
return css`
|
||||||
:host {
|
:host {
|
||||||
@@ -103,11 +176,48 @@ class StateHistoryCharts extends LitElement {
|
|||||||
/* height of single timeline chart = 60px */
|
/* height of single timeline chart = 60px */
|
||||||
min-height: 60px;
|
min-height: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:host([virtualize]) {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.info {
|
.info {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
line-height: 60px;
|
line-height: 60px;
|
||||||
color: var(--secondary-text-color);
|
color: var(--secondary-text-color);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.container {
|
||||||
|
max-height: var(--history-max-height);
|
||||||
|
}
|
||||||
|
|
||||||
|
.entry-container {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.entry-container:hover {
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
:host([virtualize]) .entry-container {
|
||||||
|
padding-left: 1px;
|
||||||
|
padding-right: 1px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.container,
|
||||||
|
lit-virtualizer {
|
||||||
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
lit-virtualizer {
|
||||||
|
contain: size layout !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
state-history-chart-timeline,
|
||||||
|
state-history-chart-line {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -347,8 +347,8 @@ class StatisticsChart extends LitElement {
|
|||||||
statTypes.forEach((type) => {
|
statTypes.forEach((type) => {
|
||||||
let val: number | null;
|
let val: number | null;
|
||||||
if (type === "sum") {
|
if (type === "sum") {
|
||||||
if (!initVal) {
|
if (initVal === null) {
|
||||||
initVal = val = stat.state;
|
initVal = val = stat.state || 0;
|
||||||
prevSum = stat.sum;
|
prevSum = stat.sum;
|
||||||
} else {
|
} else {
|
||||||
val = initVal + ((stat.sum || 0) - prevSum!);
|
val = initVal + ((stat.sum || 0) - prevSum!);
|
||||||
|
@@ -1,7 +1,4 @@
|
|||||||
export const createCurrencyListEl = () => {
|
export const currencies = [
|
||||||
const list = document.createElement("datalist");
|
|
||||||
list.id = "currencies";
|
|
||||||
for (const currency of [
|
|
||||||
"AED",
|
"AED",
|
||||||
"AFN",
|
"AFN",
|
||||||
"ALL",
|
"ALL",
|
||||||
@@ -159,7 +156,12 @@ export const createCurrencyListEl = () => {
|
|||||||
"ZAR",
|
"ZAR",
|
||||||
"ZMK",
|
"ZMK",
|
||||||
"ZWL",
|
"ZWL",
|
||||||
]) {
|
];
|
||||||
|
|
||||||
|
export const createCurrencyListEl = () => {
|
||||||
|
const list = document.createElement("datalist");
|
||||||
|
list.id = "currencies";
|
||||||
|
for (const currency of currencies) {
|
||||||
const option = document.createElement("option");
|
const option = document.createElement("option");
|
||||||
option.value = currency;
|
option.value = currency;
|
||||||
option.innerHTML = currency;
|
option.innerHTML = currency;
|
||||||
|
@@ -269,8 +269,8 @@ export class HaDataTable extends LitElement {
|
|||||||
@change=${this._handleHeaderRowCheckboxClick}
|
@change=${this._handleHeaderRowCheckboxClick}
|
||||||
.indeterminate=${this._checkedRows.length &&
|
.indeterminate=${this._checkedRows.length &&
|
||||||
this._checkedRows.length !== this._checkableRowsCount}
|
this._checkedRows.length !== this._checkableRowsCount}
|
||||||
.checked=${this._checkedRows.length ===
|
.checked=${this._checkedRows.length &&
|
||||||
this._checkableRowsCount}
|
this._checkedRows.length === this._checkableRowsCount}
|
||||||
>
|
>
|
||||||
</ha-checkbox>
|
</ha-checkbox>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -5,6 +5,7 @@ import { fireEvent } from "../../common/dom/fire_event";
|
|||||||
import {
|
import {
|
||||||
DeviceAutomation,
|
DeviceAutomation,
|
||||||
deviceAutomationsEqual,
|
deviceAutomationsEqual,
|
||||||
|
sortDeviceAutomations,
|
||||||
} from "../../data/device_automation";
|
} from "../../data/device_automation";
|
||||||
import { HomeAssistant } from "../../types";
|
import { HomeAssistant } from "../../types";
|
||||||
import "../ha-select";
|
import "../ha-select";
|
||||||
@@ -127,7 +128,9 @@ export abstract class HaDeviceAutomationPicker<
|
|||||||
|
|
||||||
private async _updateDeviceInfo() {
|
private async _updateDeviceInfo() {
|
||||||
this._automations = this.deviceId
|
this._automations = this.deviceId
|
||||||
? await this._fetchDeviceAutomations(this.hass, this.deviceId)
|
? (await this._fetchDeviceAutomations(this.hass, this.deviceId)).sort(
|
||||||
|
sortDeviceAutomations
|
||||||
|
)
|
||||||
: // No device, clear the list of automations
|
: // No device, clear the list of automations
|
||||||
[];
|
[];
|
||||||
|
|
||||||
@@ -161,8 +164,9 @@ export abstract class HaDeviceAutomationPicker<
|
|||||||
if (this.value && deviceAutomationsEqual(automation, this.value)) {
|
if (this.value && deviceAutomationsEqual(automation, this.value)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
fireEvent(this, "change");
|
const value = { ...automation };
|
||||||
fireEvent(this, "value-changed", { value: automation });
|
delete value.metadata;
|
||||||
|
fireEvent(this, "value-changed", { value });
|
||||||
}
|
}
|
||||||
|
|
||||||
static get styles(): CSSResultGroup {
|
static get styles(): CSSResultGroup {
|
||||||
|
@@ -52,6 +52,8 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
|
|||||||
|
|
||||||
@property() public value?: string;
|
@property() public value?: string;
|
||||||
|
|
||||||
|
@property() public helper?: string;
|
||||||
|
|
||||||
@property() public devices?: DeviceRegistryEntry[];
|
@property() public devices?: DeviceRegistryEntry[];
|
||||||
|
|
||||||
@property() public areas?: AreaRegistryEntry[];
|
@property() public areas?: AreaRegistryEntry[];
|
||||||
@@ -86,6 +88,8 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
|
|||||||
|
|
||||||
@property({ type: Boolean }) public disabled?: boolean;
|
@property({ type: Boolean }) public disabled?: boolean;
|
||||||
|
|
||||||
|
@property({ type: Boolean }) public required?: boolean;
|
||||||
|
|
||||||
@state() private _opened?: boolean;
|
@state() private _opened?: boolean;
|
||||||
|
|
||||||
@query("ha-combo-box", true) public comboBox!: HaComboBox;
|
@query("ha-combo-box", true) public comboBox!: HaComboBox;
|
||||||
@@ -194,7 +198,8 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
|
|||||||
this.hass,
|
this.hass,
|
||||||
deviceEntityLookup[device.id]
|
deviceEntityLookup[device.id]
|
||||||
),
|
),
|
||||||
area: device.area_id
|
area:
|
||||||
|
device.area_id && areaLookup[device.area_id]
|
||||||
? areaLookup[device.area_id].name
|
? areaLookup[device.area_id].name
|
||||||
: this.hass.localize("ui.components.device-picker.no_area"),
|
: this.hass.localize("ui.components.device-picker.no_area"),
|
||||||
}));
|
}));
|
||||||
@@ -267,8 +272,10 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
|
|||||||
? this.hass.localize("ui.components.device-picker.device")
|
? this.hass.localize("ui.components.device-picker.device")
|
||||||
: this.label}
|
: this.label}
|
||||||
.value=${this._value}
|
.value=${this._value}
|
||||||
|
.helper=${this.helper}
|
||||||
.renderer=${rowRenderer}
|
.renderer=${rowRenderer}
|
||||||
.disabled=${this.disabled}
|
.disabled=${this.disabled}
|
||||||
|
.required=${this.required}
|
||||||
item-value-path="id"
|
item-value-path="id"
|
||||||
item-label-path="name"
|
item-label-path="name"
|
||||||
@opened-changed=${this._openedChanged}
|
@opened-changed=${this._openedChanged}
|
||||||
|