mirror of
https://github.com/home-assistant/frontend.git
synced 2025-09-09 21:19:34 +00:00
Compare commits
71 Commits
ai-task-ge
...
rc
Author | SHA1 | Date | |
---|---|---|---|
![]() |
1c1c0d70c5 | ||
![]() |
a66f5fb573 | ||
![]() |
9affeab755 | ||
![]() |
2bfaf77908 | ||
![]() |
bc4caae796 | ||
![]() |
8746acd329 | ||
![]() |
96ecf16da2 | ||
![]() |
1e95a0f3ef | ||
![]() |
a164d793b1 | ||
![]() |
2a6a3edb77 | ||
![]() |
c7a8796a47 | ||
![]() |
8f2a023775 | ||
![]() |
989b0b34fe | ||
![]() |
49896f3fa6 | ||
![]() |
fc4b7674b1 | ||
![]() |
04c9f32539 | ||
![]() |
21e3fc9bb9 | ||
![]() |
4b78eb7656 | ||
![]() |
8f99f86c8b | ||
![]() |
b7eff547c7 | ||
![]() |
d253041376 | ||
![]() |
cb0aa81f89 | ||
![]() |
42061b2f8c | ||
![]() |
69bfb89a65 | ||
![]() |
e0307f9688 | ||
![]() |
1cf353461f | ||
![]() |
1786235c86 | ||
![]() |
645ba3f9c1 | ||
![]() |
b65f6f46e1 | ||
![]() |
84ad521b3d | ||
![]() |
dfb9c662e7 | ||
![]() |
5ac42e17b0 | ||
![]() |
be2f19637e | ||
![]() |
b7a6ee3792 | ||
![]() |
1fb2f0c989 | ||
![]() |
b4ad411e6f | ||
![]() |
5d76a92f73 | ||
![]() |
beee09491a | ||
![]() |
ee5aabdddf | ||
![]() |
ec80f6a6f1 | ||
![]() |
9845f0b47c | ||
![]() |
cd294ba619 | ||
![]() |
61e27cb1ea | ||
![]() |
8d6295e8e8 | ||
![]() |
b0e95699f7 | ||
![]() |
c8e1e7b8a8 | ||
![]() |
d2cea159af | ||
![]() |
eb5d1c79c8 | ||
![]() |
65ab6848ab | ||
![]() |
7a1d934e8d | ||
![]() |
cbacde12fa | ||
![]() |
3837b3e630 | ||
![]() |
7c15633f6d | ||
![]() |
f7ec8650eb | ||
![]() |
7674eee0fb | ||
![]() |
f494a6453a | ||
![]() |
37f3682ffa | ||
![]() |
8055286a1f | ||
![]() |
810b43760e | ||
![]() |
424d71c55a | ||
![]() |
176924241c | ||
![]() |
da08aa7fb0 | ||
![]() |
6047227648 | ||
![]() |
fc71fd6bc3 | ||
![]() |
90a1b135e1 | ||
![]() |
e19413b6ca | ||
![]() |
0dfc10af5f | ||
![]() |
bbbc419bea | ||
![]() |
50ad5e376f | ||
![]() |
a9f2254bbc | ||
![]() |
a8836404d4 |
4
.github/workflows/cast_deployment.yaml
vendored
4
.github/workflows/cast_deployment.yaml
vendored
@@ -26,7 +26,7 @@ jobs:
|
||||
ref: dev
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
@@ -61,7 +61,7 @@ jobs:
|
||||
ref: master
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
8
.github/workflows/ci.yaml
vendored
8
.github/workflows/ci.yaml
vendored
@@ -26,7 +26,7 @@ jobs:
|
||||
- name: Check out files from GitHub
|
||||
uses: actions/checkout@v5.0.0
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
@@ -60,7 +60,7 @@ jobs:
|
||||
- name: Check out files from GitHub
|
||||
uses: actions/checkout@v5.0.0
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
@@ -78,7 +78,7 @@ jobs:
|
||||
- name: Check out files from GitHub
|
||||
uses: actions/checkout@v5.0.0
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
@@ -102,7 +102,7 @@ jobs:
|
||||
- name: Check out files from GitHub
|
||||
uses: actions/checkout@v5.0.0
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
4
.github/workflows/demo_deployment.yaml
vendored
4
.github/workflows/demo_deployment.yaml
vendored
@@ -27,7 +27,7 @@ jobs:
|
||||
ref: dev
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
@@ -62,7 +62,7 @@ jobs:
|
||||
ref: master
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
2
.github/workflows/design_deployment.yaml
vendored
2
.github/workflows/design_deployment.yaml
vendored
@@ -19,7 +19,7 @@ jobs:
|
||||
uses: actions/checkout@v5.0.0
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
2
.github/workflows/design_preview.yaml
vendored
2
.github/workflows/design_preview.yaml
vendored
@@ -24,7 +24,7 @@ jobs:
|
||||
uses: actions/checkout@v5.0.0
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
2
.github/workflows/labeler.yaml
vendored
2
.github/workflows/labeler.yaml
vendored
@@ -10,6 +10,6 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Apply labels
|
||||
uses: actions/labeler@v6.0.1
|
||||
uses: actions/labeler@v5.0.0
|
||||
with:
|
||||
sync-labels: true
|
||||
|
4
.github/workflows/nightly.yaml
vendored
4
.github/workflows/nightly.yaml
vendored
@@ -23,12 +23,12 @@ jobs:
|
||||
uses: actions/checkout@v5.0.0
|
||||
|
||||
- name: Set up Python ${{ env.PYTHON_VERSION }}
|
||||
uses: actions/setup-python@v6
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: ${{ env.PYTHON_VERSION }}
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
|
14
.github/workflows/release.yaml
vendored
14
.github/workflows/release.yaml
vendored
@@ -26,7 +26,7 @@ jobs:
|
||||
uses: actions/checkout@v5.0.0
|
||||
|
||||
- name: Set up Python ${{ env.PYTHON_VERSION }}
|
||||
uses: actions/setup-python@v6
|
||||
uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: ${{ env.PYTHON_VERSION }}
|
||||
|
||||
@@ -34,7 +34,7 @@ jobs:
|
||||
uses: home-assistant/actions/helpers/verify-version@master
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
@@ -55,7 +55,7 @@ jobs:
|
||||
script/release
|
||||
|
||||
- name: Upload release assets
|
||||
uses: softprops/action-gh-release@v2.3.3
|
||||
uses: softprops/action-gh-release@v2.3.2
|
||||
with:
|
||||
files: |
|
||||
dist/*.whl
|
||||
@@ -92,7 +92,7 @@ jobs:
|
||||
- name: Checkout the repository
|
||||
uses: actions/checkout@v5.0.0
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
@@ -107,7 +107,7 @@ jobs:
|
||||
- name: Tar folder
|
||||
run: tar -czf landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz -C landing-page/dist .
|
||||
- name: Upload release asset
|
||||
uses: softprops/action-gh-release@v2.3.3
|
||||
uses: softprops/action-gh-release@v2.3.2
|
||||
with:
|
||||
files: landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz
|
||||
|
||||
@@ -121,7 +121,7 @@ jobs:
|
||||
- name: Checkout the repository
|
||||
uses: actions/checkout@v5.0.0
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v5.0.0
|
||||
uses: actions/setup-node@v4.4.0
|
||||
with:
|
||||
node-version-file: ".nvmrc"
|
||||
cache: yarn
|
||||
@@ -136,6 +136,6 @@ jobs:
|
||||
- name: Tar folder
|
||||
run: tar -czf hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz -C hassio/build .
|
||||
- name: Upload release asset
|
||||
uses: softprops/action-gh-release@v2.3.3
|
||||
uses: softprops/action-gh-release@v2.3.2
|
||||
with:
|
||||
files: hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz
|
||||
|
2
.github/workflows/restrict-task-creation.yml
vendored
2
.github/workflows/restrict-task-creation.yml
vendored
@@ -12,7 +12,7 @@ jobs:
|
||||
if: github.event.issue.type.name == 'Task'
|
||||
steps:
|
||||
- name: Check if user is authorized
|
||||
uses: actions/github-script@v8
|
||||
uses: actions/github-script@v7
|
||||
with:
|
||||
script: |
|
||||
const issueAuthor = context.payload.issue.user.login;
|
||||
|
2
.github/workflows/stale.yml
vendored
2
.github/workflows/stale.yml
vendored
@@ -10,7 +10,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: 90 days stale policy
|
||||
uses: actions/stale@v10.0.0
|
||||
uses: actions/stale@v9.1.0
|
||||
with:
|
||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
||||
days-before-stale: 90
|
||||
|
File diff suppressed because one or more lines are too long
@@ -6,4 +6,4 @@ enableGlobalCache: false
|
||||
|
||||
nodeLinker: node-modules
|
||||
|
||||
yarnPath: .yarn/releases/yarn-4.9.4.cjs
|
||||
yarnPath: .yarn/releases/yarn-4.9.3.cjs
|
||||
|
@@ -5,17 +5,17 @@ const castContext = framework.CastReceiverContext.getInstance();
|
||||
const playerManager = castContext.getPlayerManager();
|
||||
|
||||
playerManager.setMessageInterceptor(
|
||||
"LOAD" as framework.messages.MessageType.LOAD,
|
||||
framework.messages.MessageType.LOAD,
|
||||
(loadRequestData) => {
|
||||
const media = loadRequestData.media;
|
||||
// Special handling if it came from Google Assistant
|
||||
if (media.entity) {
|
||||
media.contentId = media.entity;
|
||||
media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
|
||||
media.streamType = framework.messages.StreamType.LIVE;
|
||||
media.contentType = "application/vnd.apple.mpegurl";
|
||||
// @ts-ignore
|
||||
media.hlsVideoSegmentFormat =
|
||||
"fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4;
|
||||
framework.messages.HlsVideoSegmentFormat.FMP4;
|
||||
}
|
||||
return loadRequestData;
|
||||
}
|
||||
|
@@ -40,8 +40,7 @@ const playDummyMedia = (viewTitle?: string) => {
|
||||
loadRequestData.media.contentId =
|
||||
"https://cast.home-assistant.io/images/google-nest-hub.png";
|
||||
loadRequestData.media.contentType = "image/jpeg";
|
||||
loadRequestData.media.streamType =
|
||||
"NONE" as framework.messages.StreamType.NONE;
|
||||
loadRequestData.media.streamType = framework.messages.StreamType.NONE;
|
||||
const metadata = new framework.messages.GenericMediaMetadata();
|
||||
metadata.title = viewTitle;
|
||||
loadRequestData.media.metadata = metadata;
|
||||
@@ -90,7 +89,7 @@ const showMediaPlayer = () => {
|
||||
const options = new framework.CastReceiverOptions();
|
||||
options.disableIdleTimeout = true;
|
||||
options.customNamespaces = {
|
||||
[CAST_NS]: "json" as framework.system.MessageType.JSON,
|
||||
[CAST_NS]: framework.system.MessageType.JSON,
|
||||
};
|
||||
|
||||
castContext.addCustomMessageListener(
|
||||
@@ -98,7 +97,9 @@ castContext.addCustomMessageListener(
|
||||
// @ts-ignore
|
||||
(ev: ReceivedMessage<HassMessage>) => {
|
||||
// We received a show Lovelace command, stop media from playing, hide media player and show Lovelace controller
|
||||
if (playerManager.getPlayerState() !== "IDLE") {
|
||||
if (
|
||||
playerManager.getPlayerState() !== framework.messages.PlayerState.IDLE
|
||||
) {
|
||||
playerManager.stop();
|
||||
} else {
|
||||
showLovelaceController();
|
||||
@@ -112,7 +113,7 @@ castContext.addCustomMessageListener(
|
||||
const playerManager = castContext.getPlayerManager();
|
||||
|
||||
playerManager.setMessageInterceptor(
|
||||
"LOAD" as framework.messages.MessageType.LOAD,
|
||||
framework.messages.MessageType.LOAD,
|
||||
(loadRequestData) => {
|
||||
if (
|
||||
loadRequestData.media.contentId ===
|
||||
@@ -126,23 +127,24 @@ playerManager.setMessageInterceptor(
|
||||
// Special handling if it came from Google Assistant
|
||||
if (media.entity) {
|
||||
media.contentId = media.entity;
|
||||
media.streamType = "LIVE" as framework.messages.StreamType.LIVE;
|
||||
media.streamType = framework.messages.StreamType.LIVE;
|
||||
media.contentType = "application/vnd.apple.mpegurl";
|
||||
// @ts-ignore
|
||||
media.hlsVideoSegmentFormat =
|
||||
"fmp4" as framework.messages.HlsVideoSegmentFormat.FMP4;
|
||||
framework.messages.HlsVideoSegmentFormat.FMP4;
|
||||
}
|
||||
return loadRequestData;
|
||||
}
|
||||
);
|
||||
|
||||
playerManager.addEventListener(
|
||||
"MEDIA_STATUS" as framework.events.EventType.MEDIA_STATUS,
|
||||
framework.events.EventType.MEDIA_STATUS,
|
||||
(event) => {
|
||||
if (
|
||||
event.mediaStatus?.playerState === "IDLE" &&
|
||||
event.mediaStatus?.playerState === framework.messages.PlayerState.IDLE &&
|
||||
event.mediaStatus?.idleReason &&
|
||||
event.mediaStatus?.idleReason !== "INTERRUPTED"
|
||||
event.mediaStatus?.idleReason !==
|
||||
framework.messages.IdleReason.INTERRUPTED
|
||||
) {
|
||||
// media finished or stopped, return to default Lovelace
|
||||
showLovelaceController();
|
||||
|
@@ -68,7 +68,7 @@
|
||||
}
|
||||
#ha-launch-screen .ha-launch-screen-spacer-top {
|
||||
flex: 1;
|
||||
margin-top: calc( 2 * max(var(--safe-area-inset-top, 0px), 48px) + 46px );
|
||||
margin-top: calc( 2 * max(var(--safe-area-inset-bottom, 0px), 48px) + 46px );
|
||||
padding-top: 48px;
|
||||
}
|
||||
#ha-launch-screen .ha-launch-screen-spacer-bottom {
|
||||
|
@@ -1,11 +1,10 @@
|
||||
import { LitElement, css, html, nothing } from "lit";
|
||||
import { LitElement, css, html } from "lit";
|
||||
import { customElement, property } from "lit/decorators";
|
||||
import "../../../src/components/ha-card";
|
||||
import "../../../src/dialogs/more-info/more-info-content";
|
||||
import "../../../src/state-summary/state-card-content";
|
||||
import "../ha-demo-options";
|
||||
import type { HomeAssistant } from "../../../src/types";
|
||||
import { computeShowNewMoreInfo } from "../../../src/dialogs/more-info/const";
|
||||
|
||||
@customElement("demo-more-info")
|
||||
class DemoMoreInfo extends LitElement {
|
||||
@@ -22,13 +21,11 @@ class DemoMoreInfo extends LitElement {
|
||||
<div class="root">
|
||||
<div id="card">
|
||||
<ha-card>
|
||||
${!computeShowNewMoreInfo(state)
|
||||
? html`<state-card-content
|
||||
.stateObj=${state}
|
||||
.hass=${this.hass}
|
||||
in-dialog
|
||||
></state-card-content>`
|
||||
: nothing}
|
||||
<state-card-content
|
||||
.stateObj=${state}
|
||||
.hass=${this.hass}
|
||||
in-dialog
|
||||
></state-card-content>
|
||||
|
||||
<more-info-content
|
||||
.hass=${this.hass}
|
||||
|
@@ -1106,7 +1106,7 @@ export default {
|
||||
friendly_name: "Philips Hue",
|
||||
entity_picture: null,
|
||||
description:
|
||||
"Press the button on the bridge to register Philips Hue with Home Assistant.",
|
||||
"Press the button on the bridge to register Philips Hue with Home Assistant.\n\n",
|
||||
submit_caption: "I have pressed the button",
|
||||
},
|
||||
last_changed: "2018-07-19T10:44:46.515160+00:00",
|
||||
|
@@ -781,7 +781,7 @@ class HassioAddonInfo extends LitElement {
|
||||
|
||||
${this.addon.long_description
|
||||
? html`
|
||||
<ha-card class="long-description" outlined>
|
||||
<ha-card outlined>
|
||||
<div class="card-content">
|
||||
<ha-markdown
|
||||
.content=${this.addon.long_description}
|
||||
@@ -1333,9 +1333,6 @@ class HassioAddonInfo extends LitElement {
|
||||
.description a {
|
||||
color: var(--primary-color);
|
||||
}
|
||||
.long-description {
|
||||
direction: ltr;
|
||||
}
|
||||
ha-assist-chip {
|
||||
--md-sys-color-primary: var(--text-primary-color);
|
||||
--md-sys-color-on-surface: var(--text-primary-color);
|
||||
|
@@ -19,9 +19,8 @@
|
||||
height: auto;
|
||||
padding: 32px 0;
|
||||
}
|
||||
|
||||
.content {
|
||||
max-width: min(560px, calc(100vw - var(--safe-area-inset-right, 0px) - var(--safe-area-inset-left, 0px)));
|
||||
max-width: 560px;
|
||||
margin: 0 auto;
|
||||
padding: 0 16px;
|
||||
box-sizing: content-box;
|
||||
|
43
package.json
43
package.json
@@ -26,15 +26,16 @@
|
||||
"license": "Apache-2.0",
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "7.28.4",
|
||||
"@awesome.me/webawesome": "3.0.0-beta.4",
|
||||
"@babel/runtime": "7.28.3",
|
||||
"@braintree/sanitize-url": "7.1.1",
|
||||
"@codemirror/autocomplete": "6.18.7",
|
||||
"@codemirror/autocomplete": "6.18.6",
|
||||
"@codemirror/commands": "6.8.1",
|
||||
"@codemirror/language": "6.11.3",
|
||||
"@codemirror/legacy-modes": "6.5.1",
|
||||
"@codemirror/search": "6.5.11",
|
||||
"@codemirror/state": "6.5.2",
|
||||
"@codemirror/view": "6.38.2",
|
||||
"@codemirror/view": "6.38.1",
|
||||
"@egjs/hammerjs": "2.0.17",
|
||||
"@formatjs/intl-datetimeformat": "6.18.0",
|
||||
"@formatjs/intl-displaynames": "6.8.11",
|
||||
@@ -51,7 +52,6 @@
|
||||
"@fullcalendar/list": "6.1.19",
|
||||
"@fullcalendar/luxon3": "6.1.19",
|
||||
"@fullcalendar/timegrid": "6.1.19",
|
||||
"@home-assistant/webawesome": "3.0.0-beta.4.ha.1",
|
||||
"@lezer/highlight": "1.2.1",
|
||||
"@lit-labs/motion": "1.0.9",
|
||||
"@lit-labs/observers": "2.0.6",
|
||||
@@ -89,8 +89,8 @@
|
||||
"@thomasloven/round-slider": "0.6.0",
|
||||
"@tsparticles/engine": "3.9.1",
|
||||
"@tsparticles/preset-links": "3.2.0",
|
||||
"@vaadin/combo-box": "24.8.7",
|
||||
"@vaadin/vaadin-themable-mixin": "24.8.7",
|
||||
"@vaadin/combo-box": "24.8.5",
|
||||
"@vaadin/vaadin-themable-mixin": "24.8.5",
|
||||
"@vibrant/color": "4.0.0",
|
||||
"@vue/web-component-wrapper": "1.3.0",
|
||||
"@webcomponents/scoped-custom-element-registry": "0.0.10",
|
||||
@@ -112,7 +112,7 @@
|
||||
"fuse.js": "7.1.0",
|
||||
"google-timezones-json": "1.2.0",
|
||||
"gulp-zopfli-green": "6.0.2",
|
||||
"hls.js": "1.6.11",
|
||||
"hls.js": "1.6.10",
|
||||
"home-assistant-js-websocket": "9.5.0",
|
||||
"idb-keyval": "6.2.2",
|
||||
"intl-messageformat": "10.7.16",
|
||||
@@ -122,8 +122,8 @@
|
||||
"leaflet.markercluster": "1.5.3",
|
||||
"lit": "3.3.1",
|
||||
"lit-html": "3.3.1",
|
||||
"luxon": "3.7.2",
|
||||
"marked": "16.2.1",
|
||||
"luxon": "3.7.1",
|
||||
"marked": "16.2.0",
|
||||
"memoize-one": "6.0.0",
|
||||
"node-vibrant": "4.0.3",
|
||||
"object-hash": "3.0.0",
|
||||
@@ -149,7 +149,7 @@
|
||||
"xss": "1.0.15"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/core": "7.28.4",
|
||||
"@babel/core": "7.28.3",
|
||||
"@babel/helper-define-polyfill-provider": "0.6.5",
|
||||
"@babel/plugin-transform-runtime": "7.28.3",
|
||||
"@babel/preset-env": "7.28.3",
|
||||
@@ -159,18 +159,18 @@
|
||||
"@octokit/plugin-retry": "8.0.1",
|
||||
"@octokit/rest": "22.0.0",
|
||||
"@rsdoctor/rspack-plugin": "1.2.3",
|
||||
"@rspack/core": "1.5.2",
|
||||
"@rspack/core": "1.4.11",
|
||||
"@rspack/dev-server": "1.1.4",
|
||||
"@types/babel__plugin-transform-runtime": "7.9.5",
|
||||
"@types/chromecast-caf-receiver": "6.0.24",
|
||||
"@types/chromecast-caf-receiver": "6.0.22",
|
||||
"@types/chromecast-caf-sender": "1.0.11",
|
||||
"@types/color-name": "2.0.0",
|
||||
"@types/culori": "4.0.1",
|
||||
"@types/culori": "4.0.0",
|
||||
"@types/html-minifier-terser": "7.0.2",
|
||||
"@types/js-yaml": "4.0.9",
|
||||
"@types/leaflet": "1.9.20",
|
||||
"@types/leaflet-draw": "1.0.13",
|
||||
"@types/leaflet.markercluster": "1.5.6",
|
||||
"@types/leaflet-draw": "1.0.12",
|
||||
"@types/leaflet.markercluster": "1.5.5",
|
||||
"@types/lodash.merge": "4.6.9",
|
||||
"@types/luxon": "3.7.1",
|
||||
"@types/mocha": "10.0.10",
|
||||
@@ -184,7 +184,7 @@
|
||||
"babel-plugin-template-html-minifier": "4.1.0",
|
||||
"browserslist-useragent-regexp": "4.1.3",
|
||||
"del": "8.0.0",
|
||||
"eslint": "9.35.0",
|
||||
"eslint": "9.34.0",
|
||||
"eslint-config-airbnb-base": "15.0.0",
|
||||
"eslint-config-prettier": "10.1.8",
|
||||
"eslint-import-resolver-webpack": "0.13.10",
|
||||
@@ -204,7 +204,7 @@
|
||||
"husky": "9.1.7",
|
||||
"jsdom": "26.1.0",
|
||||
"jszip": "3.10.1",
|
||||
"lint-staged": "16.1.6",
|
||||
"lint-staged": "16.1.5",
|
||||
"lit-analyzer": "2.0.3",
|
||||
"lodash.merge": "4.6.2",
|
||||
"lodash.template": "4.5.0",
|
||||
@@ -212,13 +212,13 @@
|
||||
"pinst": "3.0.0",
|
||||
"prettier": "3.6.2",
|
||||
"rspack-manifest-plugin": "5.0.3",
|
||||
"serve": "14.2.5",
|
||||
"serve": "14.2.4",
|
||||
"sinon": "21.0.0",
|
||||
"tar": "7.4.3",
|
||||
"terser-webpack-plugin": "5.3.14",
|
||||
"ts-lit-plugin": "2.0.2",
|
||||
"typescript": "5.9.2",
|
||||
"typescript-eslint": "8.42.0",
|
||||
"typescript-eslint": "8.40.0",
|
||||
"vite-tsconfig-paths": "5.1.4",
|
||||
"vitest": "3.2.4",
|
||||
"webpack-stats-plugin": "1.1.3",
|
||||
@@ -234,7 +234,8 @@
|
||||
"@fullcalendar/daygrid": "6.1.19",
|
||||
"globals": "16.3.0",
|
||||
"tslib": "2.8.1",
|
||||
"@material/mwc-list@^0.27.0": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch"
|
||||
"@material/mwc-list@^0.27.0": "patch:@material/mwc-list@npm%3A0.27.0#~/.yarn/patches/@material-mwc-list-npm-0.27.0-5344fc9de4.patch",
|
||||
"@vaadin/vaadin-themable-mixin": "24.8.5"
|
||||
},
|
||||
"packageManager": "yarn@4.9.4"
|
||||
"packageManager": "yarn@4.9.3"
|
||||
}
|
||||
|
BIN
public/static/images/config_philips_hue.jpg
Normal file
BIN
public/static/images/config_philips_hue.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.4 KiB |
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "home-assistant-frontend"
|
||||
version = "20250903.0"
|
||||
version = "20250903.3"
|
||||
license = "Apache-2.0"
|
||||
license-files = ["LICENSE*"]
|
||||
description = "The Home Assistant frontend"
|
||||
|
@@ -67,7 +67,10 @@ export const generateEntityFilter = (
|
||||
}
|
||||
|
||||
if (floors) {
|
||||
if (!floor || !floors.has(floor.floor_id)) {
|
||||
if (!floor) {
|
||||
return false;
|
||||
}
|
||||
if (!floors) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
82
src/components/ha-button-group.ts
Normal file
82
src/components/ha-button-group.ts
Normal file
@@ -0,0 +1,82 @@
|
||||
import ButtonGroup from "@awesome.me/webawesome/dist/components/button-group/button-group";
|
||||
import { customElement } from "lit/decorators";
|
||||
import type { HaButton } from "./ha-button";
|
||||
import { StateSet } from "../resources/polyfills/stateset";
|
||||
|
||||
export type Appearance = "accent" | "filled" | "outlined" | "plain";
|
||||
|
||||
/**
|
||||
* Finds an ha-button element either as the current element or within its descendants.
|
||||
* @param el - The HTML element to search from
|
||||
* @returns The found HaButton element, or null if not found
|
||||
*/
|
||||
function findButton(el: HTMLElement) {
|
||||
const selector = "ha-button";
|
||||
return (el.closest(selector) ?? el.querySelector(selector)) as HaButton;
|
||||
}
|
||||
|
||||
/**
|
||||
* @element ha-button-group
|
||||
* @extends {ButtonGroup}
|
||||
* @summary
|
||||
* Group buttons. Extend Webawesome to be able to work with ha-button tags
|
||||
*
|
||||
* @documentation https://webawesome.com/components/button-group
|
||||
*/
|
||||
@customElement("ha-button-group") // @ts-expect-error Intentionally overriding private methods
|
||||
export class HaButtonGroup extends ButtonGroup {
|
||||
attachInternals() {
|
||||
const internals = super.attachInternals();
|
||||
Object.defineProperty(internals, "states", {
|
||||
value: new StateSet(this, internals.states),
|
||||
});
|
||||
return internals;
|
||||
}
|
||||
|
||||
// @ts-expect-error updateClassNames is used in super class
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
private override updateClassNames() {
|
||||
const slottedElements = [
|
||||
...this.defaultSlot.assignedElements({ flatten: true }),
|
||||
] as HTMLElement[];
|
||||
this.hasOutlined = false;
|
||||
|
||||
slottedElements.forEach((el) => {
|
||||
const index = slottedElements.indexOf(el);
|
||||
const button = findButton(el);
|
||||
|
||||
if (button) {
|
||||
if ((button as HaButton).appearance === "outlined")
|
||||
this.hasOutlined = true;
|
||||
if (this.size) button.setAttribute("size", this.size);
|
||||
button.classList.add("wa-button-group__button");
|
||||
button.classList.toggle(
|
||||
"wa-button-group__horizontal",
|
||||
this.orientation === "horizontal"
|
||||
);
|
||||
button.classList.toggle(
|
||||
"wa-button-group__vertical",
|
||||
this.orientation === "vertical"
|
||||
);
|
||||
button.classList.toggle("wa-button-group__button-first", index === 0);
|
||||
button.classList.toggle(
|
||||
"wa-button-group__button-inner",
|
||||
index > 0 && index < slottedElements.length - 1
|
||||
);
|
||||
button.classList.toggle(
|
||||
"wa-button-group__button-last",
|
||||
index === slottedElements.length - 1
|
||||
);
|
||||
|
||||
// use button-group variant
|
||||
button.setAttribute("variant", this.variant);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
declare global {
|
||||
interface HTMLElementTagNameMap {
|
||||
"ha-button-group": HaButtonGroup;
|
||||
}
|
||||
}
|
@@ -1,11 +1,11 @@
|
||||
import "@home-assistant/webawesome/dist/components/button-group/button-group";
|
||||
import type { TemplateResult } from "lit";
|
||||
import { css, html, LitElement } from "lit";
|
||||
import { customElement, property } from "lit/decorators";
|
||||
import { fireEvent } from "../common/dom/fire_event";
|
||||
import type { ToggleButton } from "../types";
|
||||
import "./ha-button";
|
||||
import "./ha-svg-icon";
|
||||
import "./ha-button";
|
||||
import "./ha-button-group";
|
||||
|
||||
/**
|
||||
* @element ha-button-toggle-group
|
||||
@@ -37,14 +37,11 @@ export class HaButtonToggleGroup extends LitElement {
|
||||
|
||||
protected render(): TemplateResult {
|
||||
return html`
|
||||
<wa-button-group childSelector="ha-button">
|
||||
<ha-button-group .variant=${this.variant} .size=${this.size}>
|
||||
${this.buttons.map(
|
||||
(button) =>
|
||||
html`<ha-button
|
||||
iconTag="ha-svg-icon"
|
||||
class="icon"
|
||||
.variant=${this.variant}
|
||||
.size=${this.size}
|
||||
.value=${button.value}
|
||||
@click=${this._handleClick}
|
||||
.title=${button.label}
|
||||
@@ -58,7 +55,7 @@ export class HaButtonToggleGroup extends LitElement {
|
||||
: button.label}
|
||||
</ha-button>`
|
||||
)}
|
||||
</wa-button-group>
|
||||
</ha-button-group>
|
||||
`;
|
||||
}
|
||||
|
||||
|
@@ -1,7 +1,9 @@
|
||||
import Button from "@home-assistant/webawesome/dist/components/button/button";
|
||||
import Button from "@awesome.me/webawesome/dist/components/button/button";
|
||||
import { css, type CSSResultGroup } from "lit";
|
||||
import { customElement } from "lit/decorators";
|
||||
|
||||
import { StateSet } from "../resources/polyfills/stateset";
|
||||
|
||||
export type Appearance = "accent" | "filled" | "outlined" | "plain";
|
||||
|
||||
/**
|
||||
@@ -33,10 +35,54 @@ export type Appearance = "accent" | "filled" | "outlined" | "plain";
|
||||
* @attr {boolean} loading - shows a loading indicator instead of the buttons label and disable buttons click.
|
||||
* @attr {boolean} disabled - Disables the button and prevents user interaction.
|
||||
*/
|
||||
@customElement("ha-button")
|
||||
@customElement("ha-button") // @ts-expect-error Intentionally overriding private methods
|
||||
export class HaButton extends Button {
|
||||
variant: "brand" | "neutral" | "success" | "warning" | "danger" = "brand";
|
||||
|
||||
attachInternals() {
|
||||
const internals = super.attachInternals();
|
||||
Object.defineProperty(internals, "states", {
|
||||
value: new StateSet(this, internals.states),
|
||||
});
|
||||
return internals;
|
||||
}
|
||||
|
||||
// @ts-expect-error handleLabelSlotChange is used in super class
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
private override handleLabelSlotChange() {
|
||||
const nodes = this.labelSlot.assignedNodes({ flatten: true });
|
||||
let hasIconLabel = false;
|
||||
let hasIcon = false;
|
||||
let text = "";
|
||||
|
||||
// If there's only an icon and no text, it's an icon button
|
||||
[...nodes].forEach((node) => {
|
||||
if (
|
||||
node.nodeType === Node.ELEMENT_NODE &&
|
||||
(node as HTMLElement).localName === "ha-svg-icon"
|
||||
) {
|
||||
hasIcon = true;
|
||||
if (!hasIconLabel)
|
||||
hasIconLabel = (node as HTMLElement).hasAttribute("aria-label");
|
||||
}
|
||||
|
||||
// Concatenate text nodes
|
||||
if (node.nodeType === Node.TEXT_NODE) {
|
||||
text += node.textContent;
|
||||
}
|
||||
});
|
||||
|
||||
this.isIconButton = text.trim() === "" && hasIcon;
|
||||
|
||||
if (__DEV__ && this.isIconButton && !hasIconLabel) {
|
||||
// eslint-disable-next-line no-console
|
||||
console.warn(
|
||||
'Icon buttons must have a label for screen readers. Add <ha-svg-icon aria-label="..."> to remove this warning.',
|
||||
this
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
static get styles(): CSSResultGroup {
|
||||
return [
|
||||
Button.styles,
|
||||
@@ -216,10 +262,10 @@ export class HaButton extends Button {
|
||||
}
|
||||
|
||||
.button.has-start {
|
||||
padding-inline-start: 8px;
|
||||
padding-left: 8px;
|
||||
}
|
||||
.button.has-end {
|
||||
padding-inline-end: 8px;
|
||||
padding-right: 8px;
|
||||
}
|
||||
`,
|
||||
];
|
||||
|
@@ -90,7 +90,7 @@ export class HaDialog extends DialogBase {
|
||||
}
|
||||
.mdc-dialog__actions {
|
||||
justify-content: var(--justify-action-buttons, flex-end);
|
||||
padding: 12px 16px 16px 16px;
|
||||
padding: 12px 16px max(var(--safe-area-inset-bottom), 16px) 16px;
|
||||
}
|
||||
.mdc-dialog__actions span:nth-child(1) {
|
||||
flex: var(--secondary-action-button-flex, unset);
|
||||
@@ -100,8 +100,6 @@ export class HaDialog extends DialogBase {
|
||||
}
|
||||
.mdc-dialog__container {
|
||||
align-items: var(--vertical-align-dialog, center);
|
||||
padding-top: var(--safe-area-inset-top);
|
||||
padding-bottom: var(--safe-area-inset-bottom);
|
||||
}
|
||||
.mdc-dialog__title {
|
||||
padding: 16px 16px 0 16px;
|
||||
@@ -117,17 +115,15 @@ export class HaDialog extends DialogBase {
|
||||
padding: var(--dialog-content-padding, 24px);
|
||||
}
|
||||
:host([hideactions]) .mdc-dialog .mdc-dialog__content {
|
||||
padding-bottom: var(--dialog-content-padding, 24px);
|
||||
padding-bottom: max(
|
||||
var(--dialog-content-padding, 24px),
|
||||
var(--safe-area-inset-bottom)
|
||||
);
|
||||
}
|
||||
.mdc-dialog .mdc-dialog__surface {
|
||||
position: var(--dialog-surface-position, relative);
|
||||
top: var(--dialog-surface-top);
|
||||
margin-top: var(--dialog-surface-margin-top);
|
||||
min-width: calc(
|
||||
var(--mdc-dialog-min-width, 100vw) - var(
|
||||
--safe-area-inset-left
|
||||
) - var(--safe-area-inset-right)
|
||||
);
|
||||
min-height: var(--mdc-dialog-min-height, auto);
|
||||
border-radius: var(--ha-dialog-border-radius, 24px);
|
||||
-webkit-backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none);
|
||||
@@ -141,24 +137,6 @@ export class HaDialog extends DialogBase {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
@media all and (max-width: 450px), all and (max-height: 500px) {
|
||||
.mdc-dialog .mdc-dialog__surface {
|
||||
min-height: calc(
|
||||
100vh - var(--safe-area-inset-top, 0px) - var(
|
||||
--safe-area-inset-bottom,
|
||||
0px
|
||||
)
|
||||
);
|
||||
max-height: calc(
|
||||
100vh - var(--safe-area-inset-top, 0px) - var(
|
||||
--safe-area-inset-bottom,
|
||||
0px
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
.header_title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import WaAnimation from "@home-assistant/webawesome/dist/components/animation/animation";
|
||||
import WaAnimation from "@awesome.me/webawesome/dist/components/animation/animation";
|
||||
import { customElement, property } from "lit/decorators";
|
||||
|
||||
@customElement("ha-fade-in")
|
||||
|
@@ -1,12 +1,21 @@
|
||||
import ProgressRing from "@home-assistant/webawesome/dist/components/progress-ring/progress-ring";
|
||||
import ProgressRing from "@awesome.me/webawesome/dist/components/progress-ring/progress-ring";
|
||||
import { css } from "lit";
|
||||
import type { CSSResultGroup } from "lit";
|
||||
import { customElement, property } from "lit/decorators";
|
||||
import { StateSet } from "../resources/polyfills/stateset";
|
||||
|
||||
@customElement("ha-progress-ring")
|
||||
export class HaProgressRing extends ProgressRing {
|
||||
@property() public size?: "tiny" | "small" | "medium" | "large";
|
||||
|
||||
attachInternals() {
|
||||
const internals = super.attachInternals();
|
||||
Object.defineProperty(internals, "states", {
|
||||
value: new StateSet(this, internals.states),
|
||||
});
|
||||
return internals;
|
||||
}
|
||||
|
||||
public updated(changedProps) {
|
||||
super.updated(changedProps);
|
||||
|
||||
|
@@ -1,8 +1,10 @@
|
||||
import Spinner from "@home-assistant/webawesome/dist/components/spinner/spinner";
|
||||
import Spinner from "@awesome.me/webawesome/dist/components/spinner/spinner";
|
||||
import type { CSSResultGroup, PropertyValues } from "lit";
|
||||
import { css } from "lit";
|
||||
import { customElement, property } from "lit/decorators";
|
||||
|
||||
import { StateSet } from "../resources/polyfills/stateset";
|
||||
|
||||
@customElement("ha-spinner")
|
||||
export class HaSpinner extends Spinner {
|
||||
@property() public size?: "tiny" | "small" | "medium" | "large";
|
||||
@@ -31,6 +33,14 @@ export class HaSpinner extends Spinner {
|
||||
}
|
||||
}
|
||||
|
||||
attachInternals() {
|
||||
const internals = super.attachInternals();
|
||||
Object.defineProperty(internals, "states", {
|
||||
value: new StateSet(this, internals.states),
|
||||
});
|
||||
return internals;
|
||||
}
|
||||
|
||||
static get styles(): CSSResultGroup {
|
||||
return [
|
||||
Spinner.styles,
|
||||
|
@@ -1,14 +1,8 @@
|
||||
import type { HomeAssistant } from "../types";
|
||||
import type { Selector } from "./selector";
|
||||
|
||||
export const enum AITaskEntityFeature {
|
||||
GENERATE_DATA = 1,
|
||||
SUPPORT_ATTACHMENTS = 2,
|
||||
GENERATE_IMAGE = 4,
|
||||
}
|
||||
export interface AITaskPreferences {
|
||||
gen_data_entity_id: string | null;
|
||||
gen_image_entity_id: string | null;
|
||||
}
|
||||
|
||||
export interface GenDataTask {
|
||||
|
@@ -24,14 +24,11 @@ export interface BluetoothConnectionData extends DataTableRowData {
|
||||
source: string;
|
||||
}
|
||||
|
||||
export type HaScannerType = "usb" | "uart" | "remote" | "unknown";
|
||||
|
||||
export interface BluetoothScannerDetails {
|
||||
source: string;
|
||||
connectable: boolean;
|
||||
name: string;
|
||||
adapter: string;
|
||||
scanner_type?: HaScannerType;
|
||||
}
|
||||
|
||||
export type BluetoothScannersDetails = Record<string, BluetoothScannerDetails>;
|
||||
@@ -58,13 +55,6 @@ export interface BluetoothAllocationsData {
|
||||
allocated: string[];
|
||||
}
|
||||
|
||||
export interface BluetoothScannerState {
|
||||
source: string;
|
||||
adapter: string;
|
||||
current_mode: "active" | "passive" | null;
|
||||
requested_mode: "active" | "passive" | null;
|
||||
}
|
||||
|
||||
export const subscribeBluetoothScannersDetailsUpdates = (
|
||||
conn: Connection,
|
||||
store: Store<BluetoothScannersDetails>
|
||||
@@ -180,20 +170,3 @@ export const subscribeBluetoothConnectionAllocations = (
|
||||
params
|
||||
);
|
||||
};
|
||||
|
||||
export const subscribeBluetoothScannerState = (
|
||||
conn: Connection,
|
||||
callbackFunction: (scannerState: BluetoothScannerState) => void,
|
||||
configEntryId?: string
|
||||
): Promise<() => Promise<void>> => {
|
||||
const params: { type: string; config_entry_id?: string } = {
|
||||
type: "bluetooth/subscribe_scanner_state",
|
||||
};
|
||||
if (configEntryId) {
|
||||
params.config_entry_id = configEntryId;
|
||||
}
|
||||
return conn.subscribeMessage<BluetoothScannerState>(
|
||||
(scannerState) => callbackFunction(scannerState),
|
||||
params
|
||||
);
|
||||
};
|
||||
|
@@ -97,7 +97,6 @@ export interface DataEntryFlowStepMenu {
|
||||
step_id: string;
|
||||
/** If array, use value to lookup translations in strings.json */
|
||||
menu_options: string[] | Record<string, string>;
|
||||
sort?: boolean;
|
||||
description_placeholders?: Record<string, string>;
|
||||
translation_domain?: string;
|
||||
}
|
||||
|
@@ -2,7 +2,6 @@ import type { Connection } from "home-assistant-js-websocket";
|
||||
import { computeStateName } from "../common/entity/compute_state_name";
|
||||
import type { HaDurationData } from "../components/ha-duration-input";
|
||||
import type { HomeAssistant } from "../types";
|
||||
import { firstWeekday } from "../common/datetime/first_weekday";
|
||||
|
||||
export interface RecorderInfo {
|
||||
backlog: number | null;
|
||||
@@ -109,7 +108,7 @@ export interface StatisticsValidationResultMeanTypeChanged {
|
||||
};
|
||||
}
|
||||
|
||||
export const VOLUME_UNITS = ["L", "gal", "ft³", "m³", "CCF", "MCF"] as const;
|
||||
export const VOLUME_UNITS = ["L", "gal", "ft³", "m³", "CCF"] as const;
|
||||
|
||||
export interface StatisticsUnitConfiguration {
|
||||
energy?: "Wh" | "kWh" | "MWh" | "GJ";
|
||||
@@ -212,14 +211,7 @@ export const fetchStatistic = (
|
||||
: period.fixed_period.end,
|
||||
}
|
||||
: undefined,
|
||||
calendar: period.calendar
|
||||
? {
|
||||
...(period.calendar.period === "week"
|
||||
? { first_weekday: firstWeekday(hass.locale).substring(0, 3) }
|
||||
: {}),
|
||||
...period.calendar,
|
||||
}
|
||||
: undefined,
|
||||
calendar: period.calendar,
|
||||
rolling_window: period.rolling_window,
|
||||
});
|
||||
|
||||
|
@@ -256,13 +256,6 @@ export const showConfigFlowDialog = (
|
||||
);
|
||||
},
|
||||
|
||||
renderMenuOptionDescription(hass, step, option) {
|
||||
return hass.localize(
|
||||
`component.${step.translation_domain || step.handler}.config.step.${step.step_id}.menu_option_descriptions.${option}`,
|
||||
step.description_placeholders
|
||||
);
|
||||
},
|
||||
|
||||
renderLoadingDescription(hass, reason, handler, step) {
|
||||
if (reason !== "loading_flow" && reason !== "loading_step") {
|
||||
return "";
|
||||
|
@@ -137,12 +137,6 @@ export interface FlowConfig {
|
||||
option: string
|
||||
): string;
|
||||
|
||||
renderMenuOptionDescription(
|
||||
hass: HomeAssistant,
|
||||
step: DataEntryFlowStepMenu,
|
||||
option: string
|
||||
): string;
|
||||
|
||||
renderLoadingDescription(
|
||||
hass: HomeAssistant,
|
||||
loadingReason: LoadingReason,
|
||||
|
@@ -225,13 +225,6 @@ export const showOptionsFlowDialog = (
|
||||
);
|
||||
},
|
||||
|
||||
renderMenuOptionDescription(hass, step, option) {
|
||||
return hass.localize(
|
||||
`component.${step.translation_domain || configEntry.domain}.options.step.${step.step_id}.menu_option_descriptions.${option}`,
|
||||
step.description_placeholders
|
||||
);
|
||||
},
|
||||
|
||||
renderLoadingDescription(hass, reason) {
|
||||
return (
|
||||
hass.localize(`component.${configEntry.domain}.options.loading`) ||
|
||||
|
@@ -252,13 +252,6 @@ export const showSubConfigFlowDialog = (
|
||||
);
|
||||
},
|
||||
|
||||
renderMenuOptionDescription(hass, step, option) {
|
||||
return hass.localize(
|
||||
`component.${step.translation_domain || configEntry.domain}.config_subentries.${flowType}.step.${step.step_id}.menu_option_descriptions.${option}`,
|
||||
step.description_placeholders
|
||||
);
|
||||
},
|
||||
|
||||
renderLoadingDescription(hass, reason, handler, step) {
|
||||
if (reason !== "loading_flow" && reason !== "loading_step") {
|
||||
return "";
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import type { PropertyValues, TemplateResult } from "lit";
|
||||
import { css, html, LitElement, nothing } from "lit";
|
||||
import type { TemplateResult } from "lit";
|
||||
import { css, html, LitElement } from "lit";
|
||||
import { customElement, property } from "lit/decorators";
|
||||
import { fireEvent } from "../../common/dom/fire_event";
|
||||
import "../../components/ha-icon-next";
|
||||
@@ -8,7 +8,6 @@ import type { DataEntryFlowStepMenu } from "../../data/data_entry_flow";
|
||||
import type { HomeAssistant } from "../../types";
|
||||
import type { FlowConfig } from "./show-dialog-data-entry-flow";
|
||||
import { configFlowContentStyles } from "./styles";
|
||||
import { stringCompare } from "../../common/string/compare";
|
||||
|
||||
@customElement("step-flow-menu")
|
||||
class StepFlowMenu extends LitElement {
|
||||
@@ -18,18 +17,9 @@ class StepFlowMenu extends LitElement {
|
||||
|
||||
@property({ attribute: false }) public step!: DataEntryFlowStepMenu;
|
||||
|
||||
protected shouldUpdate(changedProps: PropertyValues): boolean {
|
||||
return (
|
||||
changedProps.size > 1 ||
|
||||
!changedProps.has("hass") ||
|
||||
this.hass.localize !== changedProps.get("hass")?.localize
|
||||
);
|
||||
}
|
||||
|
||||
protected render(): TemplateResult {
|
||||
let options: string[];
|
||||
let translations: Record<string, string>;
|
||||
let optionDescriptions: Record<string, string> = {};
|
||||
|
||||
if (Array.isArray(this.step.menu_options)) {
|
||||
options = this.step.menu_options;
|
||||
@@ -40,36 +30,10 @@ class StepFlowMenu extends LitElement {
|
||||
this.step,
|
||||
option
|
||||
);
|
||||
optionDescriptions[option] =
|
||||
this.flowConfig.renderMenuOptionDescription(
|
||||
this.hass,
|
||||
this.step,
|
||||
option
|
||||
);
|
||||
}
|
||||
} else {
|
||||
options = Object.keys(this.step.menu_options);
|
||||
translations = this.step.menu_options;
|
||||
optionDescriptions = Object.fromEntries(
|
||||
options.map((key) => [
|
||||
key,
|
||||
this.flowConfig.renderMenuOptionDescription(
|
||||
this.hass,
|
||||
this.step,
|
||||
key
|
||||
),
|
||||
])
|
||||
);
|
||||
}
|
||||
|
||||
if (this.step.sort) {
|
||||
options = options.sort((a, b) =>
|
||||
stringCompare(
|
||||
translations[a]!,
|
||||
translations[b]!,
|
||||
this.hass.locale.language
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
const description = this.flowConfig.renderMenuDescription(
|
||||
@@ -82,18 +46,8 @@ class StepFlowMenu extends LitElement {
|
||||
<div class="options">
|
||||
${options.map(
|
||||
(option) => html`
|
||||
<ha-list-item
|
||||
hasMeta
|
||||
.step=${option}
|
||||
@click=${this._handleStep}
|
||||
?twoline=${optionDescriptions[option]}
|
||||
>
|
||||
<ha-list-item hasMeta .step=${option} @click=${this._handleStep}>
|
||||
<span>${translations[option]}</span>
|
||||
${optionDescriptions[option]
|
||||
? html`<span slot="secondary">
|
||||
${optionDescriptions[option]}
|
||||
</span>`
|
||||
: nothing}
|
||||
<ha-icon-next slot="meta"></ha-icon-next>
|
||||
</ha-list-item>
|
||||
`
|
||||
@@ -119,10 +73,11 @@ class StepFlowMenu extends LitElement {
|
||||
css`
|
||||
.options {
|
||||
margin-top: 20px;
|
||||
margin-bottom: 16px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.content {
|
||||
padding-bottom: 16px;
|
||||
border-bottom: 1px solid var(--divider-color);
|
||||
}
|
||||
.content + .options {
|
||||
margin-top: 8px;
|
||||
|
@@ -475,6 +475,7 @@ class MoreInfoUpdate extends LitElement {
|
||||
bottom: 0;
|
||||
margin: 0 -24px 0 -24px;
|
||||
margin-bottom: calc(-1 * max(var(--safe-area-inset-bottom), 24px));
|
||||
padding-bottom: var(--safe-area-inset-bottom);
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
@@ -6,9 +6,7 @@ import memoizeOne from "memoize-one";
|
||||
import { formatDateWeekdayShort } from "../../../common/datetime/format_date";
|
||||
import { formatTime } from "../../../common/datetime/format_time";
|
||||
import { formatNumber } from "../../../common/number/format_number";
|
||||
import "../../../components/ha-alert";
|
||||
import "../../../components/ha-relative-time";
|
||||
import "../../../components/ha-spinner";
|
||||
import "../../../components/ha-state-icon";
|
||||
import "../../../components/ha-svg-icon";
|
||||
import "../../../components/ha-tooltip";
|
||||
@@ -294,101 +292,106 @@ class MoreInfoWeather extends LitElement {
|
||||
</div>
|
||||
`
|
||||
: nothing}
|
||||
|
||||
<div class="section">
|
||||
${this.hass.localize("ui.card.weather.forecast")}:
|
||||
</div>
|
||||
${supportedForecasts?.length > 1
|
||||
? html`<sl-tab-group @sl-tab-show=${this._handleForecastTypeChanged}>
|
||||
${supportedForecasts.map(
|
||||
(forecastType) =>
|
||||
html`<sl-tab
|
||||
slot="nav"
|
||||
.panel=${forecastType}
|
||||
.active=${this._forecastType === forecastType}
|
||||
${forecast
|
||||
? html`
|
||||
<div class="section">
|
||||
${this.hass.localize("ui.card.weather.forecast")}:
|
||||
</div>
|
||||
${supportedForecasts.length > 1
|
||||
? html`<sl-tab-group
|
||||
@sl-tab-show=${this._handleForecastTypeChanged}
|
||||
>
|
||||
${this.hass!.localize(`ui.card.weather.${forecastType}`)}
|
||||
</sl-tab>`
|
||||
)}
|
||||
</sl-tab-group>`
|
||||
: nothing}
|
||||
<div class="forecast">
|
||||
${forecast?.length
|
||||
? forecast.map((item) =>
|
||||
this._showValue(item.templow) || this._showValue(item.temperature)
|
||||
? html`
|
||||
<div>
|
||||
${supportedForecasts.map(
|
||||
(forecastType) =>
|
||||
html`<sl-tab
|
||||
slot="nav"
|
||||
.panel=${forecastType}
|
||||
.active=${this._forecastType === forecastType}
|
||||
>
|
||||
${this.hass!.localize(
|
||||
`ui.card.weather.${forecastType}`
|
||||
)}
|
||||
</sl-tab>`
|
||||
)}
|
||||
</sl-tab-group>`
|
||||
: nothing}
|
||||
<div class="forecast">
|
||||
${forecast.map((item) =>
|
||||
this._showValue(item.templow) ||
|
||||
this._showValue(item.temperature)
|
||||
? html`
|
||||
<div>
|
||||
${dayNight
|
||||
? html`
|
||||
${formatDateWeekdayShort(
|
||||
new Date(item.datetime),
|
||||
this.hass!.locale,
|
||||
this.hass!.config
|
||||
)}
|
||||
<div class="daynight">
|
||||
${item.is_daytime !== false
|
||||
? this.hass!.localize("ui.card.weather.day")
|
||||
: this.hass!.localize(
|
||||
"ui.card.weather.night"
|
||||
)}<br />
|
||||
</div>
|
||||
`
|
||||
: hourly
|
||||
<div>
|
||||
${dayNight
|
||||
? html`
|
||||
${formatTime(
|
||||
new Date(item.datetime),
|
||||
this.hass!.locale,
|
||||
this.hass!.config
|
||||
)}
|
||||
`
|
||||
: html`
|
||||
${formatDateWeekdayShort(
|
||||
new Date(item.datetime),
|
||||
this.hass!.locale,
|
||||
this.hass!.config
|
||||
)}
|
||||
`}
|
||||
</div>
|
||||
${this._showValue(item.condition)
|
||||
? html`
|
||||
<div class="forecast-image-icon">
|
||||
${getWeatherStateIcon(
|
||||
item.condition!,
|
||||
this,
|
||||
!(
|
||||
item.is_daytime ||
|
||||
item.is_daytime === undefined
|
||||
)
|
||||
)}
|
||||
</div>
|
||||
`
|
||||
: nothing}
|
||||
<div class="temp">
|
||||
${this._showValue(item.temperature)
|
||||
? html`${formatNumber(
|
||||
item.temperature,
|
||||
this.hass!.locale
|
||||
)}°`
|
||||
: "—"}
|
||||
</div>
|
||||
<div class="templow">
|
||||
${this._showValue(item.templow)
|
||||
? html`${formatNumber(
|
||||
item.templow!,
|
||||
this.hass!.locale
|
||||
)}°`
|
||||
: hourly
|
||||
? nothing
|
||||
<div class="daynight">
|
||||
${item.is_daytime !== false
|
||||
? this.hass!.localize("ui.card.weather.day")
|
||||
: this.hass!.localize(
|
||||
"ui.card.weather.night"
|
||||
)}<br />
|
||||
</div>
|
||||
`
|
||||
: hourly
|
||||
? html`
|
||||
${formatTime(
|
||||
new Date(item.datetime),
|
||||
this.hass!.locale,
|
||||
this.hass!.config
|
||||
)}
|
||||
`
|
||||
: html`
|
||||
${formatDateWeekdayShort(
|
||||
new Date(item.datetime),
|
||||
this.hass!.locale,
|
||||
this.hass!.config
|
||||
)}
|
||||
`}
|
||||
</div>
|
||||
${this._showValue(item.condition)
|
||||
? html`
|
||||
<div class="forecast-image-icon">
|
||||
${getWeatherStateIcon(
|
||||
item.condition!,
|
||||
this,
|
||||
!(
|
||||
item.is_daytime ||
|
||||
item.is_daytime === undefined
|
||||
)
|
||||
)}
|
||||
</div>
|
||||
`
|
||||
: nothing}
|
||||
<div class="temp">
|
||||
${this._showValue(item.temperature)
|
||||
? html`${formatNumber(
|
||||
item.temperature,
|
||||
this.hass!.locale
|
||||
)}°`
|
||||
: "—"}
|
||||
</div>
|
||||
<div class="templow">
|
||||
${this._showValue(item.templow)
|
||||
? html`${formatNumber(
|
||||
item.templow!,
|
||||
this.hass!.locale
|
||||
)}°`
|
||||
: hourly
|
||||
? nothing
|
||||
: "—"}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`
|
||||
: nothing
|
||||
)
|
||||
: html`<ha-spinner size="medium"></ha-spinner>`}
|
||||
</div>
|
||||
|
||||
`
|
||||
: nothing
|
||||
)}
|
||||
</div>
|
||||
`
|
||||
: nothing}
|
||||
${this.stateObj.attributes.attribution
|
||||
? html`
|
||||
<div class="attribution">
|
||||
@@ -586,10 +589,6 @@ class MoreInfoWeather extends LitElement {
|
||||
.forecast-icon {
|
||||
--mdc-icon-size: 40px;
|
||||
}
|
||||
|
||||
.forecast ha-spinner {
|
||||
height: 120px;
|
||||
}
|
||||
`,
|
||||
];
|
||||
}
|
||||
|
@@ -661,10 +661,7 @@ export class MoreInfoDialog extends LitElement {
|
||||
ha-dialog {
|
||||
/* Set the top top of the dialog to a fixed position, so it doesnt jump when the content changes size */
|
||||
--vertical-align-dialog: flex-start;
|
||||
--dialog-surface-margin-top: max(
|
||||
40px,
|
||||
var(--safe-area-inset-top, 0px)
|
||||
);
|
||||
--dialog-surface-margin-top: 40px;
|
||||
--dialog-content-padding: 0;
|
||||
}
|
||||
|
||||
|
@@ -281,11 +281,11 @@ export class QuickBar extends LitElement {
|
||||
class="ha-scrollbar"
|
||||
style=${styleMap({
|
||||
height: this._narrow
|
||||
? "calc(100vh - 56px - var(--safe-area-inset-top, 0px) - var(--safe-area-inset-bottom, 0px))"
|
||||
: `calc(${Math.min(
|
||||
? "calc(100vh - 56px)"
|
||||
: `${Math.min(
|
||||
items.length * (commandMode ? 56 : 72) + 26,
|
||||
500
|
||||
)}px - var(--safe-area-inset-top, 0px) - var(--safe-area-inset-bottom, 0px))`,
|
||||
)}px`,
|
||||
})}
|
||||
.items=${items}
|
||||
.renderItem=${this._renderItem}
|
||||
|
@@ -35,7 +35,6 @@
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-bottom: 32px;
|
||||
padding-top: var(--safe-area-inset-top);
|
||||
}
|
||||
|
||||
.header img {
|
||||
|
@@ -44,7 +44,7 @@
|
||||
}
|
||||
#ha-launch-screen .ha-launch-screen-spacer-top {
|
||||
flex: 1;
|
||||
margin-top: calc( 2 * max(var(--safe-area-inset-top, 0px), 48px) + 46px );
|
||||
margin-top: calc( 2 * max(var(--safe-area-inset-bottom, 0px), 48px) + 46px );
|
||||
padding-top: 48px;
|
||||
}
|
||||
#ha-launch-screen .ha-launch-screen-spacer-bottom {
|
||||
|
@@ -19,9 +19,8 @@
|
||||
height: auto;
|
||||
padding: 32px 0;
|
||||
}
|
||||
|
||||
.content {
|
||||
max-width: min(560px, calc(100vw - var(--safe-area-inset-right, 0px) - var(--safe-area-inset-left, 0px)));
|
||||
max-width: 560px;
|
||||
margin: 0 auto;
|
||||
padding: 0 16px;
|
||||
box-sizing: content-box;
|
||||
@@ -33,7 +32,6 @@
|
||||
justify-content: flex-start;
|
||||
margin-bottom: 32px;
|
||||
margin-left: 32px;
|
||||
padding-top: var(--safe-area-inset-top);
|
||||
}
|
||||
|
||||
.header img {
|
||||
|
@@ -884,13 +884,7 @@ export class HaTabsSubpageDataTable extends KeyboardShortcutMixin(LitElement) {
|
||||
}
|
||||
|
||||
.filter-dialog-content {
|
||||
height: calc(
|
||||
100vh -
|
||||
70px - var(--header-height, 0px) - var(
|
||||
--safe-area-inset-top,
|
||||
0px
|
||||
) - var(--safe-area-inset-bottom, 0px)
|
||||
);
|
||||
height: calc(100vh - 1px - 61px - var(--header-height));
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
@@ -146,8 +146,6 @@ export class HomeAssistantMain extends LitElement {
|
||||
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
|
||||
--mdc-drawer-width: 56px;
|
||||
--mdc-top-app-bar-width: calc(100% - var(--mdc-drawer-width));
|
||||
--safe-area-content-inset-left: 0px;
|
||||
--safe-area-content-inset-right: var(--safe-area-inset-right);
|
||||
}
|
||||
:host([expanded]) {
|
||||
--mdc-drawer-width: calc(256px + var(--safe-area-inset-left));
|
||||
@@ -155,7 +153,6 @@ export class HomeAssistantMain extends LitElement {
|
||||
:host([modal]) {
|
||||
--mdc-drawer-width: unset;
|
||||
--mdc-top-app-bar-width: unset;
|
||||
--safe-area-content-inset-left: var(--safe-area-inset-left);
|
||||
}
|
||||
partial-panel-resolver,
|
||||
ha-sidebar {
|
||||
|
@@ -3,7 +3,6 @@ import { customElement, property, query } from "lit/decorators";
|
||||
import memoizeOne from "memoize-one";
|
||||
import { fireEvent } from "../../../../../common/dom/fire_event";
|
||||
import { stringCompare } from "../../../../../common/string/compare";
|
||||
import { stopPropagation } from "../../../../../common/dom/stop_propagation";
|
||||
import type { LocalizeFunc } from "../../../../../common/translations/localize";
|
||||
import "../../../../../components/ha-list-item";
|
||||
import "../../../../../components/ha-select";
|
||||
@@ -67,7 +66,6 @@ export class HaConditionAction extends LitElement implements ActionElement {
|
||||
.value=${this.action.condition}
|
||||
naturalMenuWidth
|
||||
@selected=${this._typeChanged}
|
||||
@closed=${stopPropagation}
|
||||
>
|
||||
${this._processedTypes(this.hass.localize).map(
|
||||
([opt, label, icon]) => html`
|
||||
|
@@ -292,7 +292,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) {
|
||||
extraTemplate: (automation) =>
|
||||
automation.labels.length
|
||||
? html`<ha-data-table-labels
|
||||
@label-clicked=${narrow ? undefined : this._labelClicked}
|
||||
@label-clicked=${this._labelClicked}
|
||||
.labels=${automation.labels}
|
||||
></ha-data-table-labels>`
|
||||
: nothing,
|
||||
|
@@ -317,7 +317,7 @@ export default class HaAutomationOption extends LitElement {
|
||||
automationRowsStyles,
|
||||
css`
|
||||
:host([root]) .rows {
|
||||
padding-inline-end: 8px;
|
||||
padding-right: 8px;
|
||||
}
|
||||
`,
|
||||
];
|
||||
|
@@ -62,15 +62,12 @@ export const indentStyle = css`
|
||||
.card-content.indent,
|
||||
.selector-row,
|
||||
:host([indent]) ha-form {
|
||||
margin-inline-start: 12px;
|
||||
padding-top: 12px;
|
||||
padding-bottom: 16px;
|
||||
padding-inline-start: 16px;
|
||||
padding-inline-end: 0px;
|
||||
border-inline-start: 2px solid var(--ha-color-border-neutral-quiet);
|
||||
margin-left: 12px;
|
||||
padding: 12px 0 16px 16px;
|
||||
border-left: 2px solid var(--ha-color-border-neutral-quiet);
|
||||
border-bottom: 2px solid var(--ha-color-border-neutral-quiet);
|
||||
border-radius: 0;
|
||||
border-end-start-radius: var(--ha-border-radius-lg);
|
||||
border-bottom-left-radius: var(--ha-border-radius-lg);
|
||||
}
|
||||
.card-content.indent.selected,
|
||||
:host([selected]) .card-content.indent,
|
||||
@@ -178,7 +175,7 @@ export const automationRowsStyles = css`
|
||||
gap: 16px;
|
||||
}
|
||||
.rows.no-sidebar {
|
||||
margin-inline-end: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
.sortable-ghost {
|
||||
background: none;
|
||||
|
@@ -1,6 +1,5 @@
|
||||
import { mdiHelpCircle, mdiStarFourPoints } from "@mdi/js";
|
||||
import { css, html, LitElement } from "lit";
|
||||
import type { HassEntity } from "home-assistant-js-websocket";
|
||||
import { customElement, property, state } from "lit/decorators";
|
||||
import { isComponentLoaded } from "../../../common/config/is_component_loaded";
|
||||
import type { HaProgressButton } from "../../../components/buttons/ha-progress-button";
|
||||
@@ -9,7 +8,6 @@ import type { HaEntityPicker } from "../../../components/entity/ha-entity-picker
|
||||
import "../../../components/ha-card";
|
||||
import "../../../components/ha-settings-row";
|
||||
import {
|
||||
AITaskEntityFeature,
|
||||
fetchAITaskPreferences,
|
||||
saveAITaskPreferences,
|
||||
type AITaskPreferences,
|
||||
@@ -17,15 +15,6 @@ import {
|
||||
import type { HomeAssistant } from "../../../types";
|
||||
import { brandsUrl } from "../../../util/brands-url";
|
||||
import { documentationUrl } from "../../../util/documentation-url";
|
||||
import { computeDomain } from "../../../common/entity/compute_domain";
|
||||
import { supportsFeature } from "../../../common/entity/supports-feature";
|
||||
|
||||
const filterGenData = (entity: HassEntity) =>
|
||||
computeDomain(entity.entity_id) === "ai_task" &&
|
||||
supportsFeature(entity, AITaskEntityFeature.GENERATE_DATA);
|
||||
const filterGenImage = (entity: HassEntity) =>
|
||||
computeDomain(entity.entity_id) === "ai_task" &&
|
||||
supportsFeature(entity, AITaskEntityFeature.GENERATE_IMAGE);
|
||||
|
||||
@customElement("ai-task-pref")
|
||||
export class AITaskPref extends LitElement {
|
||||
@@ -37,8 +26,6 @@ export class AITaskPref extends LitElement {
|
||||
|
||||
private _gen_data_entity_id?: string | null;
|
||||
|
||||
private _gen_image_entity_id?: string | null;
|
||||
|
||||
protected firstUpdated(changedProps) {
|
||||
super.firstUpdated(changedProps);
|
||||
if (!this.hass || !isComponentLoaded(this.hass, "ai_task")) {
|
||||
@@ -103,27 +90,7 @@ export class AITaskPref extends LitElement {
|
||||
isComponentLoaded(this.hass, "ai_task")}
|
||||
.value=${this._gen_data_entity_id ||
|
||||
this._prefs?.gen_data_entity_id}
|
||||
.entityFilter=${filterGenData}
|
||||
@value-changed=${this._handlePrefChange}
|
||||
></ha-entity-picker>
|
||||
</ha-settings-row>
|
||||
<ha-settings-row .narrow=${this.narrow}>
|
||||
<span slot="heading">
|
||||
${this.hass!.localize("ui.panel.config.ai_task.gen_image_header")}
|
||||
</span>
|
||||
<span slot="description">
|
||||
${this.hass!.localize(
|
||||
"ui.panel.config.ai_task.gen_image_description"
|
||||
)}
|
||||
</span>
|
||||
<ha-entity-picker
|
||||
data-name="gen_image_entity_id"
|
||||
.hass=${this.hass}
|
||||
.disabled=${this._prefs === undefined &&
|
||||
isComponentLoaded(this.hass, "ai_task")}
|
||||
.value=${this._gen_image_entity_id ||
|
||||
this._prefs?.gen_image_entity_id}
|
||||
.entityFilter=${filterGenImage}
|
||||
.includeDomains=${["ai_task"]}
|
||||
@value-changed=${this._handlePrefChange}
|
||||
></ha-entity-picker>
|
||||
</ha-settings-row>
|
||||
@@ -154,7 +121,6 @@ export class AITaskPref extends LitElement {
|
||||
const oldPrefs = this._prefs;
|
||||
const update: Partial<AITaskPreferences> = {
|
||||
gen_data_entity_id: this._gen_data_entity_id,
|
||||
gen_image_entity_id: this._gen_image_entity_id,
|
||||
};
|
||||
this._prefs = { ...this._prefs!, ...update };
|
||||
try {
|
||||
|
@@ -239,8 +239,12 @@ class DialogMQTTDeviceDebugInfo extends LitElement {
|
||||
}
|
||||
@media all and (max-width: 450px), all and (max-height: 500px) {
|
||||
ha-dialog {
|
||||
--mdc-dialog-min-width: 100vw;
|
||||
--mdc-dialog-max-width: 100vw;
|
||||
--mdc-dialog-min-width: calc(
|
||||
100vw - var(--safe-area-inset-right) - var(--safe-area-inset-left)
|
||||
);
|
||||
--mdc-dialog-max-width: calc(
|
||||
100vw - var(--safe-area-inset-right) - var(--safe-area-inset-left)
|
||||
);
|
||||
}
|
||||
}
|
||||
ha-switch {
|
||||
|
@@ -6,14 +6,13 @@ import {
|
||||
mdiPlus,
|
||||
mdiTextureBox,
|
||||
mdiCancel,
|
||||
mdiDelete,
|
||||
} from "@mdi/js";
|
||||
import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
|
||||
import { LitElement, css, html, nothing } from "lit";
|
||||
|
||||
import { ResizeController } from "@lit-labs/observers/resize-controller";
|
||||
import type { UnsubscribeFunc } from "home-assistant-js-websocket";
|
||||
import { customElement, property, state, query } from "lit/decorators";
|
||||
import { customElement, property, state } from "lit/decorators";
|
||||
import memoizeOne from "memoize-one";
|
||||
import { computeCssColor } from "../../../common/color/compute-color";
|
||||
import { formatShortDateTime } from "../../../common/datetime/format_date_time";
|
||||
@@ -38,7 +37,6 @@ import type {
|
||||
SelectionChangedEvent,
|
||||
SortingChangedEvent,
|
||||
} from "../../../components/data-table/ha-data-table";
|
||||
|
||||
import "../../../components/data-table/ha-data-table-labels";
|
||||
import "../../../components/entity/ha-battery-icon";
|
||||
import "../../../components/ha-alert";
|
||||
@@ -67,10 +65,7 @@ import type {
|
||||
DeviceEntityLookup,
|
||||
DeviceRegistryEntry,
|
||||
} from "../../../data/device_registry";
|
||||
import {
|
||||
updateDeviceRegistryEntry,
|
||||
removeConfigEntryFromDevice,
|
||||
} from "../../../data/device_registry";
|
||||
import { updateDeviceRegistryEntry } from "../../../data/device_registry";
|
||||
import type { EntityRegistryEntry } from "../../../data/entity_registry";
|
||||
import {
|
||||
findBatteryChargingEntity,
|
||||
@@ -82,11 +77,7 @@ import {
|
||||
createLabelRegistryEntry,
|
||||
subscribeLabelRegistry,
|
||||
} from "../../../data/label_registry";
|
||||
import {
|
||||
showAlertDialog,
|
||||
showConfirmationDialog,
|
||||
} from "../../../dialogs/generic/show-dialog-box";
|
||||
import type { HaTabsSubpageDataTable } from "../../../layouts/hass-tabs-subpage-data-table";
|
||||
import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
|
||||
import "../../../layouts/hass-tabs-subpage-data-table";
|
||||
import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
|
||||
import { haStyle } from "../../../resources/styles";
|
||||
@@ -130,11 +121,6 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
|
||||
|
||||
@state() private _selected: string[] = [];
|
||||
|
||||
private _selectedCanDelete: string[] = [];
|
||||
|
||||
@query("hass-tabs-subpage-data-table", true)
|
||||
private _dataTable!: HaTabsSubpageDataTable;
|
||||
|
||||
@state()
|
||||
@storage({
|
||||
storage: "sessionStorage",
|
||||
@@ -231,17 +217,6 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
|
||||
if (!this.hasUpdated) {
|
||||
this._setFiltersFromUrl();
|
||||
}
|
||||
if (changedProps.has("_selected")) {
|
||||
this._selectedCanDelete = this._selected.filter((d) => {
|
||||
const device = this.hass.devices[d];
|
||||
const entries = device.config_entries;
|
||||
return entries.some(
|
||||
(entryId) =>
|
||||
this.entries.find((e) => e.entry_id === entryId)
|
||||
?.supports_remove_device
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private _setFiltersFromUrl() {
|
||||
@@ -934,32 +909,48 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
|
||||
${areaItems}
|
||||
</ha-md-button-menu>`}`
|
||||
: nothing}
|
||||
<ha-md-button-menu has-overflow slot="selection-bar">
|
||||
${this.narrow
|
||||
? html`<ha-assist-chip
|
||||
.label=${this.hass.localize(
|
||||
"ui.panel.config.automation.picker.bulk_action"
|
||||
)}
|
||||
slot="trigger"
|
||||
>
|
||||
<ha-svg-icon
|
||||
slot="trailing-icon"
|
||||
.path=${mdiMenuDown}
|
||||
></ha-svg-icon>
|
||||
</ha-assist-chip>`
|
||||
: html`<ha-icon-button
|
||||
.path=${mdiDotsVertical}
|
||||
.label=${this.hass.localize(
|
||||
"ui.panel.config.automation.picker.bulk_action"
|
||||
)}
|
||||
slot="trigger"
|
||||
></ha-icon-button>`}
|
||||
${this.narrow
|
||||
? html` <ha-sub-menu>
|
||||
${this.narrow || areasInOverflow
|
||||
? html`<ha-md-button-menu has-overflow slot="selection-bar">
|
||||
${this.narrow
|
||||
? html`<ha-assist-chip
|
||||
.label=${this.hass.localize(
|
||||
"ui.panel.config.automation.picker.bulk_action"
|
||||
)}
|
||||
slot="trigger"
|
||||
>
|
||||
<ha-svg-icon
|
||||
slot="trailing-icon"
|
||||
.path=${mdiMenuDown}
|
||||
></ha-svg-icon>
|
||||
</ha-assist-chip>`
|
||||
: html`<ha-icon-button
|
||||
.path=${mdiDotsVertical}
|
||||
.label=${this.hass.localize(
|
||||
"ui.panel.config.automation.picker.bulk_action"
|
||||
)}
|
||||
slot="trigger"
|
||||
></ha-icon-button>`}
|
||||
${this.narrow
|
||||
? html` <ha-sub-menu>
|
||||
<ha-md-menu-item slot="item">
|
||||
<div slot="headline">
|
||||
${this.hass.localize(
|
||||
"ui.panel.config.automation.picker.bulk_actions.add_label"
|
||||
)}
|
||||
</div>
|
||||
<ha-svg-icon
|
||||
slot="end"
|
||||
.path=${mdiChevronRight}
|
||||
></ha-svg-icon>
|
||||
</ha-md-menu-item>
|
||||
<ha-md-menu slot="menu">${labelItems}</ha-md-menu>
|
||||
</ha-sub-menu>`
|
||||
: nothing}
|
||||
<ha-sub-menu>
|
||||
<ha-md-menu-item slot="item">
|
||||
<div slot="headline">
|
||||
${this.hass.localize(
|
||||
"ui.panel.config.automation.picker.bulk_actions.add_label"
|
||||
"ui.panel.config.devices.picker.bulk_actions.move_area"
|
||||
)}
|
||||
</div>
|
||||
<ha-svg-icon
|
||||
@@ -967,39 +958,10 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) {
|
||||
.path=${mdiChevronRight}
|
||||
></ha-svg-icon>
|
||||
</ha-md-menu-item>
|
||||
<ha-md-menu slot="menu">${labelItems}</ha-md-menu>
|
||||
</ha-sub-menu>`
|
||||
: nothing}
|
||||
${areasInOverflow
|
||||
? html`<ha-sub-menu>
|
||||
<ha-md-menu-item slot="item">
|
||||
<div slot="headline">
|
||||
${this.hass.localize(
|
||||
"ui.panel.config.devices.picker.bulk_actions.move_area"
|
||||
)}
|
||||
</div>
|
||||
<ha-svg-icon
|
||||
slot="end"
|
||||
.path=${mdiChevronRight}
|
||||
></ha-svg-icon>
|
||||
</ha-md-menu-item>
|
||||
<ha-md-menu slot="menu">${areaItems}</ha-md-menu>
|
||||
</ha-sub-menu>
|
||||
<ha-md-divider role="separator" tabindex="-1"></ha-md-divider>`
|
||||
: nothing}
|
||||
<ha-md-menu-item
|
||||
.clickAction=${this._deleteSelected}
|
||||
.disabled=${!this._selectedCanDelete.length}
|
||||
class="warning"
|
||||
>
|
||||
<ha-svg-icon slot="start" .path=${mdiDelete}></ha-svg-icon>
|
||||
<div slot="headline">
|
||||
${this.hass.localize(
|
||||
"ui.panel.config.devices.picker.bulk_actions.delete_selected.button"
|
||||
)}
|
||||
</div>
|
||||
</ha-md-menu-item>
|
||||
</ha-md-button-menu>
|
||||
<ha-md-menu slot="menu">${areaItems}</ha-md-menu>
|
||||
</ha-sub-menu>
|
||||
</ha-md-button-menu>`
|
||||
: nothing}
|
||||
</hass-tabs-subpage-data-table>
|
||||
`;
|
||||
}
|
||||
@@ -1174,61 +1136,6 @@ ${rejected
|
||||
});
|
||||
};
|
||||
|
||||
private _deleteSelected = () => {
|
||||
showConfirmationDialog(this, {
|
||||
title: this.hass.localize(
|
||||
"ui.panel.config.devices.picker.bulk_actions.delete_selected.confirm_title"
|
||||
),
|
||||
text:
|
||||
this._selectedCanDelete.length === this._selected.length
|
||||
? this.hass.localize(
|
||||
"ui.panel.config.devices.picker.bulk_actions.delete_selected.confirm_text"
|
||||
)
|
||||
: this.hass.localize(
|
||||
"ui.panel.config.devices.picker.bulk_actions.delete_selected.confirm_partly_text",
|
||||
{
|
||||
deletable: this._selectedCanDelete.length,
|
||||
selected: this._selected.length,
|
||||
}
|
||||
),
|
||||
confirmText: this.hass.localize("ui.common.delete"),
|
||||
dismissText: this.hass.localize("ui.common.cancel"),
|
||||
destructive: true,
|
||||
confirm: async () => {
|
||||
const proms: Promise<DeviceRegistryEntry>[] = [];
|
||||
this._selectedCanDelete.forEach((deviceId) => {
|
||||
const entries = this.hass!.devices[deviceId]?.config_entries;
|
||||
entries.forEach((entryId) => {
|
||||
if (
|
||||
this.entries.find((entry) => entry.entry_id === entryId)
|
||||
?.supports_remove_device
|
||||
) {
|
||||
proms.push(
|
||||
removeConfigEntryFromDevice(this.hass!, deviceId, entryId)
|
||||
);
|
||||
}
|
||||
});
|
||||
});
|
||||
const results = await Promise.allSettled(proms);
|
||||
if (hasRejectedItems(results)) {
|
||||
showAlertDialog(this, {
|
||||
text: this.hass.localize(
|
||||
"ui.panel.config.devices.picker.bulk_actions.delete_selected.partial_failure"
|
||||
),
|
||||
title: this.hass.localize(
|
||||
"ui.panel.config.devices.picker.bulk_actions.delete_selected.partial_failure_title"
|
||||
),
|
||||
});
|
||||
}
|
||||
this._clearSelection();
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
private _clearSelection() {
|
||||
this._dataTable.clearSelection();
|
||||
}
|
||||
|
||||
private _handleSortingChanged(ev: CustomEvent) {
|
||||
this._activeSorting = ev.detail;
|
||||
}
|
||||
|
@@ -430,13 +430,7 @@ export class DialogHelperDetail extends LitElement {
|
||||
}
|
||||
@media all and (max-width: 450px), all and (max-height: 500px) {
|
||||
ha-list {
|
||||
height: calc(
|
||||
100vh -
|
||||
184px - var(--safe-area-inset-top, 0px) - var(
|
||||
--safe-area-inset-bottom,
|
||||
0px
|
||||
)
|
||||
);
|
||||
height: calc(100vh - 184px);
|
||||
}
|
||||
}
|
||||
`,
|
||||
|
@@ -461,9 +461,7 @@ class AddIntegrationDialog extends LitElement {
|
||||
class="ha-scrollbar"
|
||||
style=${styleMap({
|
||||
width: `${this._width}px`,
|
||||
height: this._narrow
|
||||
? "calc(100vh - 184px - var(--safe-area-inset-top, 0px) - var(--safe-area-inset-bottom, 0px))"
|
||||
: "500px",
|
||||
height: this._narrow ? "calc(100vh - 184px)" : "500px",
|
||||
})}
|
||||
@click=${this._integrationPicked}
|
||||
@keypress=${this._handleKeyPress}
|
||||
|
@@ -1,5 +1,5 @@
|
||||
import type { CSSResultGroup, TemplateResult } from "lit";
|
||||
import { css, html, LitElement, nothing } from "lit";
|
||||
import { css, html, LitElement } from "lit";
|
||||
import { customElement, property, state } from "lit/decorators";
|
||||
import "../../../../../components/ha-card";
|
||||
import "../../../../../components/ha-code-editor";
|
||||
@@ -11,22 +11,13 @@ import { showOptionsFlowDialog } from "../../../../../dialogs/config-flow/show-d
|
||||
import "../../../../../layouts/hass-subpage";
|
||||
import { haStyle } from "../../../../../resources/styles";
|
||||
import type { HomeAssistant } from "../../../../../types";
|
||||
import {
|
||||
subscribeBluetoothConnectionAllocations,
|
||||
subscribeBluetoothScannerState,
|
||||
subscribeBluetoothScannersDetails,
|
||||
} from "../../../../../data/bluetooth";
|
||||
import type {
|
||||
BluetoothAllocationsData,
|
||||
BluetoothScannerState,
|
||||
BluetoothScannersDetails,
|
||||
HaScannerType,
|
||||
} from "../../../../../data/bluetooth";
|
||||
import { subscribeBluetoothConnectionAllocations } from "../../../../../data/bluetooth";
|
||||
import {
|
||||
getValueInPercentage,
|
||||
roundWithOneDecimal,
|
||||
} from "../../../../../util/calculate";
|
||||
import "../../../../../components/ha-metric";
|
||||
import type { BluetoothAllocationsData } from "../../../../../data/bluetooth";
|
||||
|
||||
@customElement("bluetooth-config-dashboard")
|
||||
export class BluetoothConfigDashboard extends LitElement {
|
||||
@@ -38,26 +29,16 @@ export class BluetoothConfigDashboard extends LitElement {
|
||||
|
||||
@state() private _connectionAllocationsError?: string;
|
||||
|
||||
@state() private _scannerState?: BluetoothScannerState;
|
||||
|
||||
@state() private _scannerDetails?: BluetoothScannersDetails;
|
||||
|
||||
private _configEntry = new URLSearchParams(window.location.search).get(
|
||||
"config_entry"
|
||||
);
|
||||
|
||||
private _unsubConnectionAllocations?: (() => Promise<void>) | undefined;
|
||||
|
||||
private _unsubScannerState?: (() => Promise<void>) | undefined;
|
||||
|
||||
private _unsubScannerDetails?: (() => void) | undefined;
|
||||
|
||||
public connectedCallback(): void {
|
||||
super.connectedCallback();
|
||||
if (this.hass) {
|
||||
this._subscribeBluetoothConnectionAllocations();
|
||||
this._subscribeBluetoothScannerState();
|
||||
this._subscribeScannerDetails();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -80,45 +61,12 @@ export class BluetoothConfigDashboard extends LitElement {
|
||||
}
|
||||
}
|
||||
|
||||
private async _subscribeBluetoothScannerState(): Promise<void> {
|
||||
if (this._unsubScannerState || !this._configEntry) {
|
||||
return;
|
||||
}
|
||||
this._unsubScannerState = await subscribeBluetoothScannerState(
|
||||
this.hass.connection,
|
||||
(scannerState) => {
|
||||
this._scannerState = scannerState;
|
||||
},
|
||||
this._configEntry
|
||||
);
|
||||
}
|
||||
|
||||
private _subscribeScannerDetails(): void {
|
||||
if (this._unsubScannerDetails) {
|
||||
return;
|
||||
}
|
||||
this._unsubScannerDetails = subscribeBluetoothScannersDetails(
|
||||
this.hass.connection,
|
||||
(details) => {
|
||||
this._scannerDetails = details;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
public disconnectedCallback() {
|
||||
super.disconnectedCallback();
|
||||
if (this._unsubConnectionAllocations) {
|
||||
this._unsubConnectionAllocations();
|
||||
this._unsubConnectionAllocations = undefined;
|
||||
}
|
||||
if (this._unsubScannerState) {
|
||||
this._unsubScannerState();
|
||||
this._unsubScannerState = undefined;
|
||||
}
|
||||
if (this._unsubScannerDetails) {
|
||||
this._unsubScannerDetails();
|
||||
this._unsubScannerDetails = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
protected render(): TemplateResult {
|
||||
@@ -130,7 +78,6 @@ export class BluetoothConfigDashboard extends LitElement {
|
||||
"ui.panel.config.bluetooth.settings_title"
|
||||
)}
|
||||
>
|
||||
<div class="card-content">${this._renderScannerState()}</div>
|
||||
<div class="card-actions">
|
||||
<ha-button @click=${this._openOptionFlow}
|
||||
>${this.hass.localize(
|
||||
@@ -195,118 +142,6 @@ export class BluetoothConfigDashboard extends LitElement {
|
||||
private _getUsedAllocations = (used: number, total: number) =>
|
||||
roundWithOneDecimal(getValueInPercentage(used, 0, total));
|
||||
|
||||
private _renderScannerMismatchWarning(
|
||||
scannerState: BluetoothScannerState,
|
||||
scannerType: HaScannerType,
|
||||
formatMode: (mode: string | null) => string
|
||||
) {
|
||||
const instructions: string[] = [];
|
||||
|
||||
if (scannerType === "remote" || scannerType === "unknown") {
|
||||
instructions.push(
|
||||
this.hass.localize(
|
||||
"ui.panel.config.bluetooth.scanner_mode_mismatch_remote"
|
||||
)
|
||||
);
|
||||
}
|
||||
if (scannerType === "usb" || scannerType === "unknown") {
|
||||
instructions.push(
|
||||
this.hass.localize(
|
||||
"ui.panel.config.bluetooth.scanner_mode_mismatch_usb"
|
||||
)
|
||||
);
|
||||
}
|
||||
if (scannerType === "uart" || scannerType === "unknown") {
|
||||
instructions.push(
|
||||
this.hass.localize(
|
||||
"ui.panel.config.bluetooth.scanner_mode_mismatch_uart"
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
return html`<ha-alert alert-type="warning">
|
||||
<div>
|
||||
${this.hass.localize(
|
||||
"ui.panel.config.bluetooth.scanner_mode_mismatch",
|
||||
{
|
||||
requested: formatMode(scannerState.requested_mode),
|
||||
current: formatMode(scannerState.current_mode),
|
||||
}
|
||||
)}
|
||||
</div>
|
||||
<ul>
|
||||
${instructions.map((instruction) => html`<li>${instruction}</li>`)}
|
||||
</ul>
|
||||
</ha-alert>`;
|
||||
}
|
||||
|
||||
private _renderScannerState() {
|
||||
if (!this._configEntry || !this._scannerState) {
|
||||
return html`<div>
|
||||
${this.hass.localize(
|
||||
"ui.panel.config.bluetooth.no_scanner_state_available"
|
||||
)}
|
||||
</div>`;
|
||||
}
|
||||
|
||||
const scannerState = this._scannerState;
|
||||
// Find the scanner details for this source
|
||||
const scannerDetails = this._scannerDetails?.[scannerState.source];
|
||||
const scannerType: HaScannerType =
|
||||
scannerDetails?.scanner_type ?? "unknown";
|
||||
|
||||
const formatMode = (mode: string | null) => {
|
||||
switch (mode) {
|
||||
case null:
|
||||
return this.hass.localize(
|
||||
"ui.panel.config.bluetooth.scanning_mode_none"
|
||||
);
|
||||
case "active":
|
||||
return this.hass.localize(
|
||||
"ui.panel.config.bluetooth.scanning_mode_active"
|
||||
);
|
||||
case "passive":
|
||||
return this.hass.localize(
|
||||
"ui.panel.config.bluetooth.scanning_mode_passive"
|
||||
);
|
||||
default:
|
||||
return mode; // Fallback for unknown modes
|
||||
}
|
||||
};
|
||||
|
||||
return html`
|
||||
<div class="scanner-state">
|
||||
<div class="state-row">
|
||||
<span
|
||||
>${this.hass.localize(
|
||||
"ui.panel.config.bluetooth.current_scanning_mode"
|
||||
)}:</span
|
||||
>
|
||||
<span class="state-value"
|
||||
>${formatMode(scannerState.current_mode)}</span
|
||||
>
|
||||
</div>
|
||||
<div class="state-row">
|
||||
<span
|
||||
>${this.hass.localize(
|
||||
"ui.panel.config.bluetooth.requested_scanning_mode"
|
||||
)}:</span
|
||||
>
|
||||
<span class="state-value"
|
||||
>${formatMode(scannerState.requested_mode)}</span
|
||||
>
|
||||
</div>
|
||||
${scannerState.current_mode !== scannerState.requested_mode
|
||||
? this._renderScannerMismatchWarning(
|
||||
scannerState,
|
||||
scannerType,
|
||||
formatMode
|
||||
)
|
||||
: nothing}
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
|
||||
private _renderConnectionAllocations() {
|
||||
if (this._connectionAllocationsError) {
|
||||
return html`<ha-alert alert-type="error"
|
||||
@@ -385,18 +220,6 @@ export class BluetoothConfigDashboard extends LitElement {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.scanner-state {
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.state-row {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 4px 0;
|
||||
}
|
||||
.state-value {
|
||||
font-weight: 500;
|
||||
}
|
||||
`,
|
||||
];
|
||||
}
|
||||
|
@@ -34,16 +34,6 @@ const UPDATE_THROTTLE_TIME = 10000;
|
||||
const CORE_SOURCE_ID = "ha";
|
||||
const CORE_SOURCE_LABEL = "Home Assistant";
|
||||
|
||||
const RSSI_COLOR_THRESHOLDS: [number, string][] = [
|
||||
[-70, "--green-color"], // Excellent: > -70 dBm
|
||||
[-75, "--lime-color"], // Good: -70 to -75 dBm
|
||||
[-80, "--yellow-color"], // Okay: -75 to -80 dBm
|
||||
[-85, "--amber-color"], // Marginal: -80 to -85 dBm
|
||||
[-90, "--orange-color"], // Weak: -85 to -90 dBm
|
||||
[-95, "--deep-orange-color"], // Poor: -90 to -95 dBm
|
||||
[-Infinity, "--red-color"], // Very poor: < -95 dBm
|
||||
];
|
||||
|
||||
@customElement("bluetooth-network-visualization")
|
||||
export class BluetoothNetworkVisualization extends LitElement {
|
||||
@property({ attribute: false }) public hass!: HomeAssistant;
|
||||
@@ -135,16 +125,6 @@ export class BluetoothNetworkVisualization extends LitElement {
|
||||
`;
|
||||
}
|
||||
|
||||
private _getRssiColorVar = memoizeOne((rssi: number): string => {
|
||||
for (const [threshold, colorVar] of RSSI_COLOR_THRESHOLDS) {
|
||||
if (rssi > threshold) {
|
||||
return colorVar;
|
||||
}
|
||||
}
|
||||
// Fallback (should never reach here)
|
||||
return "--red-color";
|
||||
});
|
||||
|
||||
private _formatNetworkData = memoizeOne(
|
||||
(
|
||||
data: BluetoothDeviceData[],
|
||||
@@ -226,7 +206,7 @@ export class BluetoothNetworkVisualization extends LitElement {
|
||||
symbol: "none",
|
||||
lineStyle: {
|
||||
width: this._getLineWidth(node.rssi),
|
||||
color: style.getPropertyValue(this._getRssiColorVar(node.rssi)),
|
||||
color: style.getPropertyValue("--primary-color"),
|
||||
},
|
||||
});
|
||||
return;
|
||||
@@ -247,7 +227,7 @@ export class BluetoothNetworkVisualization extends LitElement {
|
||||
lineStyle: {
|
||||
width: this._getLineWidth(node.rssi),
|
||||
color: device
|
||||
? style.getPropertyValue(this._getRssiColorVar(node.rssi))
|
||||
? style.getPropertyValue("--primary-color")
|
||||
: style.getPropertyValue("--disabled-color"),
|
||||
},
|
||||
});
|
||||
|
@@ -1,11 +1,11 @@
|
||||
import "@home-assistant/webawesome/dist/components/animation/animation";
|
||||
import { mdiCheckCircleOutline } from "@mdi/js";
|
||||
import { css, html, LitElement } from "lit";
|
||||
import { customElement, property } from "lit/decorators";
|
||||
import "@awesome.me/webawesome/dist/components/animation/animation";
|
||||
import { css, html, LitElement } from "lit";
|
||||
import type { HomeAssistant } from "../../../../../../types";
|
||||
|
||||
import "../../../../../../components/ha-alert";
|
||||
import "../../../../../../components/ha-svg-icon";
|
||||
import "../../../../../../components/ha-alert";
|
||||
|
||||
@customElement("zwave-js-add-node-added-insecure")
|
||||
export class ZWaveJsAddNodeFinished extends LitElement {
|
||||
|
@@ -1,15 +1,15 @@
|
||||
import "@home-assistant/webawesome/dist/components/animation/animation";
|
||||
import "@awesome.me/webawesome/dist/components/animation/animation";
|
||||
import { mdiRestart } from "@mdi/js";
|
||||
|
||||
import { css, html, LitElement, nothing } from "lit";
|
||||
import { customElement, property } from "lit/decorators";
|
||||
import { css, html, LitElement, nothing } from "lit";
|
||||
import type { HomeAssistant } from "../../../../../../types";
|
||||
import { fireEvent } from "../../../../../../common/dom/fire_event";
|
||||
import { InclusionStrategy } from "../../../../../../data/zwave_js";
|
||||
import type { HomeAssistant } from "../../../../../../types";
|
||||
|
||||
import "../../../../../../components/ha-alert";
|
||||
import "../../../../../../components/ha-button";
|
||||
import "../../../../../../components/ha-spinner";
|
||||
import "../../../../../../components/ha-button";
|
||||
import "../../../../../../components/ha-alert";
|
||||
import { WakeLockMixin } from "../../../../../../mixins/wakelock-mixin";
|
||||
|
||||
@customElement("zwave-js-add-node-searching-devices")
|
||||
|
@@ -243,7 +243,7 @@ class ErrorLogCard extends LitElement {
|
||||
${!streaming || this._error
|
||||
? html`<ha-icon-button
|
||||
.path=${mdiRefresh}
|
||||
@click=${this._handleRefresh}
|
||||
@click=${this._loadLogs}
|
||||
.label=${localize("ui.common.refresh")}
|
||||
></ha-icon-button>`
|
||||
: nothing}
|
||||
@@ -715,10 +715,6 @@ class ErrorLogCard extends LitElement {
|
||||
this._wrapLines = !this._wrapLines;
|
||||
}
|
||||
|
||||
private _handleRefresh() {
|
||||
this._loadLogs();
|
||||
}
|
||||
|
||||
private _handleOverflowAction(ev: CustomEvent<ActionDetail>) {
|
||||
let index = ev.detail.index;
|
||||
if (this.provider === "core") {
|
||||
|
@@ -199,10 +199,8 @@ export class HaConfigLovelaceDashboards extends LitElement {
|
||||
"ui.panel.config.lovelace.dashboards.picker.headers.require_admin"
|
||||
),
|
||||
sortable: true,
|
||||
hidden: narrow,
|
||||
type: "icon",
|
||||
minWidth: "120px",
|
||||
maxWidth: "120px",
|
||||
hidden: narrow,
|
||||
template: (dashboard) =>
|
||||
dashboard.require_admin
|
||||
? html`<ha-svg-icon .path=${mdiCheck}></ha-svg-icon>`
|
||||
@@ -212,10 +210,8 @@ export class HaConfigLovelaceDashboards extends LitElement {
|
||||
title: localize(
|
||||
"ui.panel.config.lovelace.dashboards.picker.headers.sidebar"
|
||||
),
|
||||
hidden: narrow,
|
||||
type: "icon",
|
||||
minWidth: "120px",
|
||||
maxWidth: "120px",
|
||||
hidden: narrow,
|
||||
template: (dashboard) =>
|
||||
dashboard.show_in_sidebar
|
||||
? html`<ha-svg-icon .path=${mdiCheck}></ha-svg-icon>`
|
||||
|
@@ -289,15 +289,6 @@ export const showRepairsFlowDialog = (
|
||||
);
|
||||
},
|
||||
|
||||
renderMenuOptionDescription(hass, step, option) {
|
||||
return hass.localize(
|
||||
`component.${issue.domain}.issues.${
|
||||
issue.translation_key || issue.issue_id
|
||||
}.fix_flow.step.${step.step_id}.menu_option_descriptions.${option}`,
|
||||
mergePlaceholders(issue, step)
|
||||
);
|
||||
},
|
||||
|
||||
renderLoadingDescription(hass, reason) {
|
||||
return (
|
||||
hass.localize(
|
||||
|
@@ -335,10 +335,7 @@ export default class HaScriptFieldRow extends LitElement {
|
||||
border-bottom-color: var(--divider-color);
|
||||
}
|
||||
.selector-row {
|
||||
padding-top: 12px;
|
||||
padding-bottom: 16px;
|
||||
padding-inline-start: 16px;
|
||||
padding-inline-end: 0px;
|
||||
padding: 12px 0 16px 16px;
|
||||
}
|
||||
`,
|
||||
];
|
||||
|
@@ -242,21 +242,19 @@ class DialogExposeEntity extends LitElement {
|
||||
}
|
||||
@media all and (max-width: 500px), all and (max-height: 500px) {
|
||||
ha-dialog {
|
||||
--mdc-dialog-min-width: 100vw;
|
||||
--mdc-dialog-max-width: 100vw;
|
||||
--mdc-dialog-min-width: calc(
|
||||
100vw - var(--safe-area-inset-right) - var(--safe-area-inset-left)
|
||||
);
|
||||
--mdc-dialog-max-width: calc(
|
||||
100vw - var(--safe-area-inset-right) - var(--safe-area-inset-left)
|
||||
);
|
||||
--mdc-dialog-min-height: 100%;
|
||||
--mdc-dialog-max-height: 100%;
|
||||
--vertical-align-dialog: flex-end;
|
||||
--ha-dialog-border-radius: 0px;
|
||||
}
|
||||
lit-virtualizer {
|
||||
height: calc(
|
||||
100vh -
|
||||
210px - var(--safe-area-inset-top, 0px) - var(
|
||||
--safe-area-inset-bottom,
|
||||
0px
|
||||
)
|
||||
);
|
||||
height: calc(100vh - 198px);
|
||||
}
|
||||
search-input {
|
||||
--text-field-suffix-padding-left: unset;
|
||||
|
@@ -137,8 +137,9 @@ class DialogHomeZoneDetail extends LitElement {
|
||||
}
|
||||
@media all and (max-width: 450px), all and (max-height: 500px) {
|
||||
ha-dialog {
|
||||
--mdc-dialog-min-width: 100vw;
|
||||
--mdc-dialog-max-width: 100vw;
|
||||
--mdc-dialog-min-width: calc(
|
||||
100vw - var(--safe-area-inset-right) - var(--safe-area-inset-left)
|
||||
);
|
||||
}
|
||||
}
|
||||
`,
|
||||
|
@@ -224,8 +224,9 @@ class DialogZoneDetail extends LitElement {
|
||||
}
|
||||
@media all and (max-width: 450px), all and (max-height: 500px) {
|
||||
ha-dialog {
|
||||
--mdc-dialog-min-width: 100vw;
|
||||
--mdc-dialog-max-width: 100vw;
|
||||
--mdc-dialog-min-width: calc(
|
||||
100vw - var(--safe-area-inset-right) - var(--safe-area-inset-left)
|
||||
);
|
||||
}
|
||||
}
|
||||
ha-form.passive {
|
||||
|
@@ -568,10 +568,6 @@ class HaPanelDevState extends LitElement {
|
||||
margin: 0 8px 16px;
|
||||
}
|
||||
|
||||
ha-expansion-panel p {
|
||||
padding: 0 8px;
|
||||
}
|
||||
|
||||
.inputs {
|
||||
width: 100%;
|
||||
max-width: 800px;
|
||||
@@ -583,9 +579,8 @@ class HaPanelDevState extends LitElement {
|
||||
|
||||
.button-row {
|
||||
display: flex;
|
||||
margin: 8px 0;
|
||||
margin-top: 8px;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
:host([narrow]) .state-wrapper {
|
||||
|
@@ -36,12 +36,11 @@ export class HuiClockCardDigital extends LitElement {
|
||||
locale = { ...locale, time_format: this.config.time_format };
|
||||
}
|
||||
|
||||
const h12 = useAmPm(locale);
|
||||
this._dateTimeFormat = new Intl.DateTimeFormat(this.hass.locale.language, {
|
||||
hour: h12 ? "numeric" : "2-digit",
|
||||
hour: "2-digit",
|
||||
minute: "2-digit",
|
||||
second: "2-digit",
|
||||
hourCycle: h12 ? "h12" : "h23",
|
||||
hourCycle: useAmPm(locale) ? "h12" : "h23",
|
||||
timeZone:
|
||||
this.config?.time_zone ||
|
||||
resolveTimeZone(locale.time_zone, this.hass.config?.time_zone),
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,6 @@ import { DOMAINS_TOGGLE } from "../../../common/const";
|
||||
import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
|
||||
import { computeDomain } from "../../../common/entity/compute_domain";
|
||||
import { computeStateName } from "../../../common/entity/compute_state_name";
|
||||
import { stateActive } from "../../../common/entity/state_active";
|
||||
import "../../../components/ha-card";
|
||||
import "../../../components/ha-icon-button";
|
||||
import "../../../components/ha-state-icon";
|
||||
@@ -31,6 +30,15 @@ import type {
|
||||
} from "./types";
|
||||
import type { PersonEntity } from "../../../data/person";
|
||||
|
||||
const STATES_OFF = new Set([
|
||||
"closed",
|
||||
"locked",
|
||||
"not_home",
|
||||
"off",
|
||||
"unavailable",
|
||||
"unknown",
|
||||
]);
|
||||
|
||||
@customElement("hui-picture-glance-card")
|
||||
class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
|
||||
public static async getConfigElement(): Promise<LovelaceCardEditor> {
|
||||
@@ -295,7 +303,7 @@ class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
|
||||
.disabled=${!hasAction(entityConf.tap_action)}
|
||||
.config=${entityConf}
|
||||
class=${classMap({
|
||||
"state-on": stateActive(stateObj),
|
||||
"state-on": !STATES_OFF.has(stateObj.state),
|
||||
})}
|
||||
title=${`${computeStateName(
|
||||
stateObj
|
||||
|
57
src/resources/polyfills/stateset.ts
Normal file
57
src/resources/polyfills/stateset.ts
Normal file
@@ -0,0 +1,57 @@
|
||||
// A small polyfill for CSSStateSet
|
||||
export class StateSet extends Set<string> {
|
||||
private _el: Element;
|
||||
|
||||
private _existing: null | Set<string> = null;
|
||||
|
||||
constructor(el: Element, existing: Set<string> | null = null) {
|
||||
super();
|
||||
this._el = el;
|
||||
this._existing = existing;
|
||||
}
|
||||
|
||||
add(state: string) {
|
||||
super.add(state);
|
||||
const existing = this._existing;
|
||||
if (existing) {
|
||||
try {
|
||||
existing.add(state);
|
||||
} catch {
|
||||
existing.add(`--${state}`);
|
||||
}
|
||||
} else {
|
||||
this._el.setAttribute(`state-${state}`, "");
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
delete(state: string) {
|
||||
super.delete(state);
|
||||
const existing = this._existing;
|
||||
if (existing) {
|
||||
existing.delete(state);
|
||||
existing.delete(`--${state}`);
|
||||
} else {
|
||||
this._el.removeAttribute(`state-${state}`);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
has(state: string) {
|
||||
return super.has(state);
|
||||
}
|
||||
|
||||
clear() {
|
||||
for (const state of this) this.delete(state);
|
||||
}
|
||||
}
|
||||
const replaceSync = CSSStyleSheet.prototype.replaceSync;
|
||||
Object.defineProperty(CSSStyleSheet.prototype, "replaceSync", {
|
||||
value: function (text) {
|
||||
text = text.replace(
|
||||
/:state\(([^)]+)\)/g,
|
||||
":where(:state($1), :--$1, [state-$1])"
|
||||
);
|
||||
replaceSync.call(this, text);
|
||||
},
|
||||
});
|
@@ -11,11 +11,10 @@ export const coreStyles = css`
|
||||
--ha-border-radius-md: 8px;
|
||||
--ha-border-radius-lg: 12px;
|
||||
--ha-border-radius-xl: 16px;
|
||||
--ha-border-radius-2xl: 20px;
|
||||
--ha-border-radius-3xl: 24px;
|
||||
--ha-border-radius-4xl: 28px;
|
||||
--ha-border-radius-5xl: 32px;
|
||||
--ha-border-radius-6xl: 36px;
|
||||
--ha-border-radius-2xl: 24px;
|
||||
--ha-border-radius-3xl: 28px;
|
||||
--ha-border-radius-4xl: 32px;
|
||||
--ha-border-radius-5xl: 36px;
|
||||
--ha-border-radius-pill: 9999px;
|
||||
--ha-border-radius-circle: 50%;
|
||||
--ha-border-radius-square: 0;
|
||||
|
@@ -1383,6 +1383,7 @@
|
||||
"related": "Related",
|
||||
"history": "History",
|
||||
"logbook": "Logbook",
|
||||
"device_info": "Device info",
|
||||
"device_or_service_info": "[%key:ui::panel::config::devices::device_info%]",
|
||||
"device_type": {
|
||||
"device": "[%key:ui::panel::config::devices::type::device_heading%]",
|
||||
@@ -1618,7 +1619,7 @@
|
||||
"preload_stream": "Preload camera stream",
|
||||
"preload_stream_description": "This keeps the camera stream open in the background so it shows quicker. Warning! This is device intensive.",
|
||||
"stream_orientation": "Camera stream orientation",
|
||||
"stream_orientation_description": "The orientation transformation to use for the camera stream.\nWarning: Stream orientation processing occurs on the Home Assistant device and may impact system performance. When possible, configure this setting directly on your camera instead.",
|
||||
"stream_orientation_description": "The orientation transformation to use for the camera stream.",
|
||||
"stream_orientation_1": "No orientation transform",
|
||||
"stream_orientation_2": "Mirror",
|
||||
"stream_orientation_3": "Rotate 180",
|
||||
@@ -2312,9 +2313,7 @@
|
||||
"header": "AI suggestions",
|
||||
"description": "Home Assistant can use generative AI to help you with tasks. Look for the button with the {button} icon throughout Home Assistant to get suggestions. Select an AI task entity to use this feature.",
|
||||
"gen_data_header": "Data generation tasks",
|
||||
"gen_data_description": "Suggest automation names.",
|
||||
"gen_image_header": "Image generation tasks",
|
||||
"gen_image_description": "Generate images."
|
||||
"gen_data_description": "Suggest automation names."
|
||||
},
|
||||
"category": {
|
||||
"caption": "Categories",
|
||||
@@ -5147,7 +5146,7 @@
|
||||
"integration": "Integration",
|
||||
"config_entry": "Config entry"
|
||||
},
|
||||
"enabled_description": "Disabled devices and services will not be shown and entities belonging to them will be disabled, too.",
|
||||
"enabled_description": "Disabled devices will not be shown and entities belonging to the device will be disabled and not added to Home Assistant.",
|
||||
"open_configuration_url": "Visit",
|
||||
"set_up_voice_assistant": "Set up voice assistant",
|
||||
"download_diagnostics": "Download diagnostics",
|
||||
@@ -5262,15 +5261,7 @@
|
||||
"bulk_actions": {
|
||||
"move_area": "Move to area",
|
||||
"no_area": "No area",
|
||||
"add_area": "Add area",
|
||||
"delete_selected": {
|
||||
"button": "[%key:ui::panel::config::entities::picker::delete_selected::button%]",
|
||||
"confirm_title": "Delete selected devices?",
|
||||
"confirm_text": "Are you sure you want to delete the devices?",
|
||||
"confirm_partly_text": "You can only delete {deletable} of the {selected} devices. The others are provided by integrations that do not support deleting devices.",
|
||||
"partial_failure_title": "Delete failed",
|
||||
"partial_failure": "Some devices failed to delete successfully. Check system logs for more information."
|
||||
}
|
||||
"add_area": "Add area"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -5752,16 +5743,6 @@
|
||||
"no_advertisements_found": "No matching Bluetooth advertisements found",
|
||||
"no_connection_slot_allocations": "No connection slot allocations information available",
|
||||
"no_active_connection_support": "This adapter does not support making active (GATT) connections.",
|
||||
"no_scanner_state_available": "No scanner state available",
|
||||
"current_scanning_mode": "Current scanning mode",
|
||||
"requested_scanning_mode": "Requested scanning mode",
|
||||
"scanning_mode_none": "none",
|
||||
"scanning_mode_active": "active",
|
||||
"scanning_mode_passive": "passive",
|
||||
"scanner_mode_mismatch": "Scanner requested {requested} mode but is operating in {current} mode. The scanner is in a bad state and needs to be power cycled.",
|
||||
"scanner_mode_mismatch_remote": "For proxies: reboot the device",
|
||||
"scanner_mode_mismatch_usb": "For USB adapters: unplug and plug back in",
|
||||
"scanner_mode_mismatch_uart": "For UART/onboard adapters: power down the system completely and power it back up",
|
||||
"address": "Address",
|
||||
"name": "Name",
|
||||
"source": "Source",
|
||||
@@ -8774,7 +8755,7 @@
|
||||
"all_parameters": "All available parameters",
|
||||
"accepts_target": "This action accepts a target, for example: `entity_id: light.bed_light`",
|
||||
"no_template_ui_support": "The UI does not support templates, you can still use the YAML editor.",
|
||||
"copy_clipboard_template": "Copy to clipboard as template",
|
||||
"copy_clipboard_template": "Copy to clipboard (template)",
|
||||
"errors": {
|
||||
"ui": {
|
||||
"no_action": "No action selected, please select an action",
|
||||
|
@@ -1,124 +0,0 @@
|
||||
import type { HassEntity } from "home-assistant-js-websocket";
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { deviceTrackerIcon } from "../../../src/common/entity/device_tracker_icon";
|
||||
|
||||
describe("deviceTrackerIcon", () => {
|
||||
const createMockStateObj = (
|
||||
source_type: string,
|
||||
state = "home"
|
||||
): HassEntity => ({
|
||||
entity_id: "device_tracker.test",
|
||||
state,
|
||||
attributes: { source_type },
|
||||
context: { id: "test", parent_id: null, user_id: null },
|
||||
last_changed: "2023-01-01T00:00:00Z",
|
||||
last_updated: "2023-01-01T00:00:00Z",
|
||||
});
|
||||
|
||||
describe("router source type", () => {
|
||||
it("should return lan-connect icon when home", () => {
|
||||
const stateObj = createMockStateObj("router", "home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:lan-connect");
|
||||
});
|
||||
|
||||
it("should return lan-disconnect icon when not home", () => {
|
||||
const stateObj = createMockStateObj("router", "not_home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:lan-disconnect");
|
||||
});
|
||||
|
||||
it("should return lan-disconnect icon for any other state", () => {
|
||||
const stateObj = createMockStateObj("router", "office");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:lan-disconnect");
|
||||
});
|
||||
|
||||
it("should use explicit state parameter over state object state", () => {
|
||||
const stateObj = createMockStateObj("router", "not_home");
|
||||
expect(deviceTrackerIcon(stateObj, "home")).toBe("mdi:lan-connect");
|
||||
});
|
||||
});
|
||||
|
||||
describe("bluetooth source type", () => {
|
||||
it("should return bluetooth-connect icon when home for bluetooth", () => {
|
||||
const stateObj = createMockStateObj("bluetooth", "home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:bluetooth-connect");
|
||||
});
|
||||
|
||||
it("should return bluetooth icon when not home for bluetooth", () => {
|
||||
const stateObj = createMockStateObj("bluetooth", "not_home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:bluetooth");
|
||||
});
|
||||
|
||||
it("should return bluetooth-connect icon when home for bluetooth_le", () => {
|
||||
const stateObj = createMockStateObj("bluetooth_le", "home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:bluetooth-connect");
|
||||
});
|
||||
|
||||
it("should return bluetooth icon when not home for bluetooth_le", () => {
|
||||
const stateObj = createMockStateObj("bluetooth_le", "not_home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:bluetooth");
|
||||
});
|
||||
|
||||
it("should use explicit state parameter for bluetooth", () => {
|
||||
const stateObj = createMockStateObj("bluetooth", "not_home");
|
||||
expect(deviceTrackerIcon(stateObj, "home")).toBe("mdi:bluetooth-connect");
|
||||
});
|
||||
});
|
||||
|
||||
describe("other source types", () => {
|
||||
it("should return account icon when home for gps", () => {
|
||||
const stateObj = createMockStateObj("gps", "home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:account");
|
||||
});
|
||||
|
||||
it("should return account-arrow-right icon when not home for gps", () => {
|
||||
const stateObj = createMockStateObj("gps", "not_home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:account-arrow-right");
|
||||
});
|
||||
|
||||
it("should return account icon for unknown location with gps", () => {
|
||||
const stateObj = createMockStateObj("gps", "office");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:account");
|
||||
});
|
||||
|
||||
it("should handle unknown source type", () => {
|
||||
const stateObj = createMockStateObj("unknown", "home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:account");
|
||||
});
|
||||
|
||||
it("should handle unknown source type when not home", () => {
|
||||
const stateObj = createMockStateObj("unknown", "not_home");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:account-arrow-right");
|
||||
});
|
||||
});
|
||||
|
||||
describe("edge cases", () => {
|
||||
it("should handle missing source_type attribute", () => {
|
||||
const stateObj: HassEntity = {
|
||||
entity_id: "device_tracker.test",
|
||||
state: "home",
|
||||
attributes: {},
|
||||
context: { id: "test", parent_id: null, user_id: null },
|
||||
last_changed: "2023-01-01T00:00:00Z",
|
||||
last_updated: "2023-01-01T00:00:00Z",
|
||||
};
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:account");
|
||||
});
|
||||
|
||||
it("should handle undefined state object attributes", () => {
|
||||
const stateObj: HassEntity = {
|
||||
entity_id: "device_tracker.test",
|
||||
state: "not_home",
|
||||
attributes: {},
|
||||
context: { id: "test", parent_id: null, user_id: null },
|
||||
last_changed: "2023-01-01T00:00:00Z",
|
||||
last_updated: "2023-01-01T00:00:00Z",
|
||||
};
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:account-arrow-right");
|
||||
});
|
||||
|
||||
it("should handle empty string state", () => {
|
||||
const stateObj = createMockStateObj("router", "");
|
||||
expect(deviceTrackerIcon(stateObj)).toBe("mdi:lan-disconnect");
|
||||
});
|
||||
});
|
||||
});
|
@@ -1,391 +0,0 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { generateEntityFilter } from "../../../src/common/entity/entity_filter";
|
||||
import type { HomeAssistant } from "../../../src/types";
|
||||
|
||||
// Mock HomeAssistant with comprehensive data
|
||||
const mockHass: HomeAssistant = {
|
||||
states: {
|
||||
"light.living_room": {
|
||||
entity_id: "light.living_room",
|
||||
state: "on",
|
||||
attributes: { device_class: "light" },
|
||||
},
|
||||
"switch.kitchen": {
|
||||
entity_id: "switch.kitchen",
|
||||
state: "off",
|
||||
attributes: { device_class: "switch" },
|
||||
},
|
||||
"sensor.temperature": {
|
||||
entity_id: "sensor.temperature",
|
||||
state: "22.5",
|
||||
attributes: { device_class: "temperature" },
|
||||
},
|
||||
"binary_sensor.motion": {
|
||||
entity_id: "binary_sensor.motion",
|
||||
state: "off",
|
||||
attributes: { device_class: "motion" },
|
||||
},
|
||||
"climate.thermostat": {
|
||||
entity_id: "climate.thermostat",
|
||||
state: "heat",
|
||||
attributes: {},
|
||||
},
|
||||
"media_player.tv": {
|
||||
entity_id: "media_player.tv",
|
||||
state: "off",
|
||||
attributes: {},
|
||||
},
|
||||
"light.bedroom": {
|
||||
entity_id: "light.bedroom",
|
||||
state: "off",
|
||||
attributes: { device_class: "light" },
|
||||
},
|
||||
"switch.basement": {
|
||||
entity_id: "switch.basement",
|
||||
state: "on",
|
||||
attributes: { device_class: "switch" },
|
||||
},
|
||||
"sensor.humidity": {
|
||||
entity_id: "sensor.humidity",
|
||||
state: "45",
|
||||
attributes: { device_class: "humidity", entity_category: "diagnostic" },
|
||||
},
|
||||
"light.no_area": {
|
||||
entity_id: "light.no_area",
|
||||
state: "off",
|
||||
attributes: { device_class: "light" },
|
||||
},
|
||||
} as any,
|
||||
entities: {
|
||||
"light.living_room": {
|
||||
entity_id: "light.living_room",
|
||||
device_id: "device1",
|
||||
area_id: "living_room",
|
||||
labels: [],
|
||||
},
|
||||
"switch.kitchen": {
|
||||
entity_id: "switch.kitchen",
|
||||
device_id: "device2",
|
||||
area_id: "kitchen",
|
||||
labels: [],
|
||||
},
|
||||
"sensor.temperature": {
|
||||
entity_id: "sensor.temperature",
|
||||
device_id: "device3",
|
||||
area_id: "living_room",
|
||||
labels: [],
|
||||
},
|
||||
"binary_sensor.motion": {
|
||||
entity_id: "binary_sensor.motion",
|
||||
device_id: "device4",
|
||||
area_id: "hallway",
|
||||
labels: [],
|
||||
},
|
||||
"climate.thermostat": {
|
||||
entity_id: "climate.thermostat",
|
||||
device_id: "device5",
|
||||
area_id: "living_room",
|
||||
labels: [],
|
||||
},
|
||||
"media_player.tv": {
|
||||
entity_id: "media_player.tv",
|
||||
device_id: "device6",
|
||||
area_id: "living_room",
|
||||
labels: [],
|
||||
},
|
||||
"light.bedroom": {
|
||||
entity_id: "light.bedroom",
|
||||
device_id: "device7",
|
||||
area_id: "bedroom",
|
||||
labels: [],
|
||||
},
|
||||
"switch.basement": {
|
||||
entity_id: "switch.basement",
|
||||
device_id: "device8",
|
||||
area_id: "basement",
|
||||
labels: [],
|
||||
},
|
||||
"sensor.humidity": {
|
||||
entity_id: "sensor.humidity",
|
||||
device_id: "device9",
|
||||
area_id: "living_room",
|
||||
entity_category: "diagnostic",
|
||||
labels: ["climate", "monitoring"],
|
||||
},
|
||||
"light.no_area": {
|
||||
entity_id: "light.no_area",
|
||||
device_id: "device10",
|
||||
labels: [],
|
||||
},
|
||||
} as any,
|
||||
devices: {
|
||||
device1: { id: "device1", area_id: "living_room" },
|
||||
device2: { id: "device2", area_id: "kitchen" },
|
||||
device3: { id: "device3", area_id: "living_room" },
|
||||
device4: { id: "device4", area_id: "hallway" },
|
||||
device5: { id: "device5", area_id: "living_room" },
|
||||
device6: { id: "device6", area_id: "living_room" },
|
||||
device7: { id: "device7", area_id: "bedroom" },
|
||||
device8: { id: "device8", area_id: "basement" },
|
||||
device9: { id: "device9", area_id: "living_room" },
|
||||
device10: { id: "device10" }, // no area_id
|
||||
} as any,
|
||||
areas: {
|
||||
living_room: {
|
||||
area_id: "living_room",
|
||||
name: "Living Room",
|
||||
floor_id: "main_floor",
|
||||
},
|
||||
kitchen: { area_id: "kitchen", name: "Kitchen", floor_id: "main_floor" },
|
||||
bedroom: { area_id: "bedroom", name: "Bedroom", floor_id: "upper_floor" },
|
||||
basement: {
|
||||
area_id: "basement",
|
||||
name: "Basement",
|
||||
floor_id: "basement_floor",
|
||||
},
|
||||
hallway: { area_id: "hallway", name: "Hallway", floor_id: "main_floor" },
|
||||
} as any,
|
||||
floors: {
|
||||
main_floor: { floor_id: "main_floor", name: "Main Floor" },
|
||||
upper_floor: { floor_id: "upper_floor", name: "Upper Floor" },
|
||||
basement_floor: { floor_id: "basement_floor", name: "Basement Floor" },
|
||||
} as any,
|
||||
} as HomeAssistant;
|
||||
|
||||
describe("generateEntityFilter", () => {
|
||||
describe("domain filtering", () => {
|
||||
it("should filter entities by single domain", () => {
|
||||
const filter = generateEntityFilter(mockHass, { domain: "light" });
|
||||
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("switch.kitchen")).toBe(false);
|
||||
});
|
||||
|
||||
it("should filter entities by multiple domains", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
domain: ["light", "switch"],
|
||||
});
|
||||
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("switch.kitchen")).toBe(true);
|
||||
// Non-existent entities return false
|
||||
expect(filter("switch.fan")).toBe(false);
|
||||
expect(filter("sensor.temperature")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle domain as string vs array", () => {
|
||||
const singleFilter = generateEntityFilter(mockHass, { domain: "sensor" });
|
||||
const arrayFilter = generateEntityFilter(mockHass, {
|
||||
domain: ["sensor"],
|
||||
});
|
||||
|
||||
expect(singleFilter("sensor.temperature")).toBe(true);
|
||||
expect(arrayFilter("sensor.temperature")).toBe(true);
|
||||
expect(singleFilter("light.living_room")).toBe(false);
|
||||
expect(arrayFilter("light.living_room")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("device class filtering", () => {
|
||||
it("should filter entities by single device class", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
device_class: "temperature",
|
||||
});
|
||||
|
||||
expect(filter("sensor.temperature")).toBe(true);
|
||||
expect(filter("sensor.humidity")).toBe(false);
|
||||
});
|
||||
|
||||
it("should filter entities by multiple device classes", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
device_class: ["temperature", "humidity"],
|
||||
});
|
||||
|
||||
expect(filter("sensor.temperature")).toBe(true);
|
||||
expect(filter("sensor.humidity")).toBe(true);
|
||||
expect(filter("light.living_room")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle entities without device class", () => {
|
||||
const filter = generateEntityFilter(mockHass, { device_class: "test" });
|
||||
|
||||
expect(filter("climate.thermostat")).toBe(false);
|
||||
expect(filter("media_player.tv")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("area filtering", () => {
|
||||
it("should filter entities by single area", () => {
|
||||
const filter = generateEntityFilter(mockHass, { area: "living_room" });
|
||||
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("sensor.temperature")).toBe(true);
|
||||
expect(filter("switch.kitchen")).toBe(false);
|
||||
});
|
||||
|
||||
it("should filter entities by multiple areas", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
area: ["living_room", "kitchen"],
|
||||
});
|
||||
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("switch.kitchen")).toBe(true);
|
||||
expect(filter("light.bedroom")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("floor filtering", () => {
|
||||
// NOTE: The current implementation has a bug where it checks `if (!floors)` instead of `if (!floors.has(floor.floor_id))`
|
||||
// So floor filtering will never actually filter by floor - it only checks if the entity has a floor at all
|
||||
it("should filter entities by floor (tests current buggy behavior)", () => {
|
||||
const filter = generateEntityFilter(mockHass, { floor: "main_floor" });
|
||||
|
||||
// Due to bug, all entities with floors pass (not just main_floor)
|
||||
expect(filter("light.living_room")).toBe(true); // has floor
|
||||
expect(filter("switch.kitchen")).toBe(true); // has floor
|
||||
expect(filter("binary_sensor.motion")).toBe(true); // has floor
|
||||
expect(filter("light.bedroom")).toBe(false); // wrong floor
|
||||
expect(filter("switch.basement")).toBe(false); // wrong floor
|
||||
|
||||
// Entities without floors should fail
|
||||
expect(filter("light.no_area")).toBe(false); // no area = no floor
|
||||
});
|
||||
|
||||
it("should handle multiple floors (tests current buggy behavior)", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
floor: ["main_floor", "upper_floor"],
|
||||
});
|
||||
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("light.bedroom")).toBe(true);
|
||||
expect(filter("switch.basement")).toBe(false);
|
||||
|
||||
// Entities without floors should fail
|
||||
expect(filter("light.no_area")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("device filtering", () => {
|
||||
it("should filter entities by single device", () => {
|
||||
const filter = generateEntityFilter(mockHass, { device: "device1" });
|
||||
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("switch.kitchen")).toBe(false);
|
||||
});
|
||||
|
||||
it("should filter entities by multiple devices", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
device: ["device1", "device2"],
|
||||
});
|
||||
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("switch.kitchen")).toBe(true);
|
||||
expect(filter("sensor.temperature")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("entity category filtering", () => {
|
||||
it("should filter entities by entity category", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
entity_category: "diagnostic",
|
||||
});
|
||||
|
||||
expect(filter("sensor.humidity")).toBe(true);
|
||||
expect(filter("sensor.temperature")).toBe(false);
|
||||
});
|
||||
|
||||
it("should filter entities with no entity category", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
entity_category: "none",
|
||||
});
|
||||
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("sensor.humidity")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("label filtering", () => {
|
||||
it("should filter entities by single label", () => {
|
||||
const filter = generateEntityFilter(mockHass, { label: "climate" });
|
||||
|
||||
expect(filter("sensor.humidity")).toBe(true);
|
||||
expect(filter("sensor.temperature")).toBe(false);
|
||||
});
|
||||
|
||||
it("should filter entities by multiple labels", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
label: ["climate", "monitoring"],
|
||||
});
|
||||
|
||||
expect(filter("sensor.humidity")).toBe(true);
|
||||
expect(filter("light.living_room")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("combined filtering", () => {
|
||||
it("should combine multiple filter criteria with AND logic", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
domain: "light",
|
||||
area: "living_room",
|
||||
});
|
||||
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("light.bedroom")).toBe(false);
|
||||
expect(filter("sensor.temperature")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle complex combinations", () => {
|
||||
const filter = generateEntityFilter(mockHass, {
|
||||
domain: ["sensor", "light"],
|
||||
area: "living_room",
|
||||
device_class: ["temperature", "light"],
|
||||
});
|
||||
|
||||
expect(filter("sensor.temperature")).toBe(true);
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("sensor.humidity")).toBe(false); // wrong device class
|
||||
expect(filter("light.bedroom")).toBe(false); // wrong area
|
||||
});
|
||||
});
|
||||
|
||||
describe("empty filter criteria", () => {
|
||||
it("should handle empty filter criteria", () => {
|
||||
const filter = generateEntityFilter(mockHass, {});
|
||||
|
||||
// Empty filter should pass all entities that exist in hass.states
|
||||
expect(filter("light.living_room")).toBe(true);
|
||||
expect(filter("switch.kitchen")).toBe(true);
|
||||
expect(filter("nonexistent.entity")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle empty domain array", () => {
|
||||
const filter = generateEntityFilter(mockHass, { domain: [] });
|
||||
|
||||
// Empty domain array means no entities should pass domain filter
|
||||
expect(filter("light.living_room")).toBe(false);
|
||||
expect(filter("switch.kitchen")).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("edge cases", () => {
|
||||
it("should handle non-existent entities", () => {
|
||||
const filter = generateEntityFilter(mockHass, { domain: "light" });
|
||||
|
||||
expect(filter("light.nonexistent")).toBe(false);
|
||||
expect(filter("invalid_entity_id")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle entities without device or area assignments", () => {
|
||||
const filter = generateEntityFilter(mockHass, { area: "living_room" });
|
||||
|
||||
expect(filter("light.no_area")).toBe(false);
|
||||
});
|
||||
|
||||
it("should handle entities with device but no area", () => {
|
||||
const filter = generateEntityFilter(mockHass, { area: "living_room" });
|
||||
|
||||
// light.no_area has device10 which has no area_id
|
||||
expect(filter("light.no_area")).toBe(false);
|
||||
});
|
||||
});
|
||||
});
|
Reference in New Issue
Block a user