Skip to content

Commit

Permalink
Merge branch 'home-assistant:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ildar170975 authored Oct 15, 2024
2 parents 4c3b750 + b063840 commit d55243e
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 163 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"@types/leaflet-draw": "1.0.11",
"@types/lodash.merge": "4.6.9",
"@types/luxon": "3.4.2",
"@types/mocha": "10.0.7",
"@types/mocha": "10.0.9",
"@types/qrcode": "1.5.5",
"@types/serve-handler": "6.1.4",
"@types/sortablejs": "1.15.8",
Expand Down Expand Up @@ -216,15 +216,15 @@
"gulp-zopfli-green": "6.0.2",
"html-minifier-terser": "7.2.0",
"husky": "9.1.6",
"instant-mocha": "1.5.2",
"instant-mocha": "1.5.3",
"jszip": "3.10.1",
"lint-staged": "15.2.10",
"lit-analyzer": "2.0.3",
"lodash.merge": "4.6.2",
"lodash.template": "4.5.0",
"magic-string": "0.30.12",
"map-stream": "0.0.7",
"mocha": "10.5.0",
"mocha": "10.7.3",
"object-hash": "3.0.0",
"open": "10.1.0",
"pinst": "3.0.0",
Expand Down
7 changes: 7 additions & 0 deletions src/components/ha-password-field.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export class HaPasswordField extends LitElement {
.type=${this._unmaskedPassword ? "text" : "password"}
.suffix=${html`<div style="width: 24px"></div>`}
@input=${this._handleInputChange}
@change=${this._reDispatchEvent}
></ha-textfield>
<ha-icon-button
toggles
Expand Down Expand Up @@ -156,6 +157,12 @@ export class HaPasswordField extends LitElement {
this.value = ev.target.value;
}

@eventOptions({ passive: true })
private _reDispatchEvent(oldEvent: Event) {
const newEvent = new Event(oldEvent.type, oldEvent);
this.dispatchEvent(newEvent);
}

static styles = css`
:host {
display: block;
Expand Down
1 change: 1 addition & 0 deletions src/data/thread.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { HomeAssistant } from "../types";

export interface ThreadRouter {
instance_name: string;
addresses: [string];
border_agent_id: string | null;
brand: "google" | "apple" | "homeassistant";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ export class ThreadConfigPanel extends SubscribeMixin(LitElement) {
@error=${this._onImageError}
@load=${this._onImageLoad}
/>
${router.model_name ||
${router.instance_name ||
router.model_name ||
router.server?.replace(".local.", "") ||
""}
<span slot="secondary">${router.server}</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ import { showConfirmationDialog } from "../../lovelace/custom-card-helpers";
import { fixStatisticsIssue } from "./fix-statistics";
import { showStatisticsAdjustSumDialog } from "./show-dialog-statistics-adjust-sum";

const FIX_ISSUES_ORDER = {
const FIX_ISSUES_ORDER: Record<StatisticsValidationResult["type"], number> = {
no_state: 0,
entity_no_longer_recorded: 1,
entity_not_recorded: 1,
state_class_removed: 2,
units_changed: 3,
};

const FIXABLE_ISSUES = [
const FIXABLE_ISSUES: StatisticsValidationResult["type"][] = [
"no_state",
"entity_no_longer_recorded",
"unsupported_state_class",
"state_class_removed",
"units_changed",
];

Expand Down
Loading

0 comments on commit d55243e

Please sign in to comment.