= {};
-
- for (const entity of entities) {
- const source = entitySources[entity.entity_id];
- if (!source?.domain) {
- continue;
- }
-
- if (!deviceIntegrations[entity.device_id!]) {
- deviceIntegrations[entity.device_id!] = [];
- }
- deviceIntegrations[entity.device_id!].push(source.domain);
- }
- return deviceIntegrations;
- }
- );
}
declare global {
diff --git a/src/components/ha-selector/ha-selector-entity.ts b/src/components/ha-selector/ha-selector-entity.ts
index 8cb925f5d1..2c7062171c 100644
--- a/src/components/ha-selector/ha-selector-entity.ts
+++ b/src/components/ha-selector/ha-selector-entity.ts
@@ -1,12 +1,12 @@
import { HassEntity } from "home-assistant-js-websocket";
import { html, LitElement, PropertyValues } from "lit";
import { customElement, property, state } from "lit/decorators";
-import { computeStateDomain } from "../../common/entity/compute_state_domain";
import {
EntitySources,
fetchEntitySourcesWithCache,
} from "../../data/entity_sources";
-import { EntitySelector } from "../../data/selector";
+import type { EntitySelector } from "../../data/selector";
+import { filterSelectorEntities } from "../../data/selector";
import { HomeAssistant } from "../../types";
import "../entity/ha-entities-picker";
import "../entity/ha-entity-picker";
@@ -73,37 +73,8 @@ export class HaEntitySelector extends LitElement {
}
}
- private _filterEntities = (entity: HassEntity): boolean => {
- const {
- domain: filterDomain,
- device_class: filterDeviceClass,
- integration: filterIntegration,
- } = this.selector.entity;
-
- if (filterDomain) {
- const entityDomain = computeStateDomain(entity);
- if (
- Array.isArray(filterDomain)
- ? !filterDomain.includes(entityDomain)
- : entityDomain !== filterDomain
- ) {
- return false;
- }
- }
- if (
- filterDeviceClass &&
- entity.attributes.device_class !== filterDeviceClass
- ) {
- return false;
- }
- if (
- filterIntegration &&
- this._entitySources?.[entity.entity_id]?.domain !== filterIntegration
- ) {
- return false;
- }
- return true;
- };
+ private _filterEntities = (entity: HassEntity): boolean =>
+ filterSelectorEntities(this.selector.entity, entity, this._entitySources);
}
declare global {
diff --git a/src/components/ha-selector/ha-selector-number.ts b/src/components/ha-selector/ha-selector-number.ts
index 43ae1430ee..0ccfedafd2 100644
--- a/src/components/ha-selector/ha-selector-number.ts
+++ b/src/components/ha-selector/ha-selector-number.ts
@@ -4,9 +4,9 @@ import { classMap } from "lit/directives/class-map";
import { fireEvent } from "../../common/dom/fire_event";
import { NumberSelector } from "../../data/selector";
import { HomeAssistant } from "../../types";
+import "../ha-input-helper-text";
import "../ha-slider";
import "../ha-textfield";
-import "../ha-input-helper-text";
@customElement("ha-selector-number")
export class HaNumberSelector extends LitElement {
@@ -30,21 +30,25 @@ export class HaNumberSelector extends LitElement {
const isBox = this.selector.number.mode === "box";
return html`
- ${this.label ? html`${this.label}${this.required ? " *" : ""}` : ""}
- ${["control", "sensor", "config", "diagnostic"].map((category) =>
- // Make sure we render controls if no other cards will be rendered
- entitiesByCategory[category].length > 0 ||
- (entities.length === 0 && category === "control")
- ? html`
-
-
- `
- : ""
+ ${(["control", "sensor", "config", "diagnostic"] as const).map(
+ (category) =>
+ // Make sure we render controls if no other cards will be rendered
+ entitiesByCategory[category].length > 0 ||
+ (entities.length === 0 && category === "control")
+ ? html`
+
+
+ `
+ : ""
)}
diff --git a/src/panels/config/energy/components/styles.ts b/src/panels/config/energy/components/styles.ts
index 5aab3c4dbc..d980606a44 100644
--- a/src/panels/config/energy/components/styles.ts
+++ b/src/panels/config/energy/components/styles.ts
@@ -8,6 +8,9 @@ export const energyCardStyles = css`
height: 32px;
width: 32px;
margin-right: 8px;
+ margin-inline-end: 8px;
+ margin-inline-start: initial;
+ direction: var(--direction);
}
h3 {
margin-top: 24px;
@@ -24,6 +27,9 @@ export const energyCardStyles = css`
.row ha-icon,
.row img {
margin-right: 16px;
+ margin-inline-end: 16px;
+ margin-inline-start: initial;
+ direction: var(--direction);
}
.row img {
height: 24px;
diff --git a/src/panels/config/entities/entity-registry-basic-editor.ts b/src/panels/config/entities/entity-registry-basic-editor.ts
index de7d374318..3d915e2db4 100644
--- a/src/panels/config/entities/entity-registry-basic-editor.ts
+++ b/src/panels/config/entities/entity-registry-basic-editor.ts
@@ -13,6 +13,7 @@ import {
subscribeDeviceRegistry,
} from "../../../data/device_registry";
import {
+ EntityRegistryEntry,
EntityRegistryEntryUpdateParams,
ExtEntityRegistryEntry,
updateEntityRegistryEntry,
@@ -25,7 +26,7 @@ import type { HomeAssistant } from "../../../types";
export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
@property({ attribute: false }) public hass!: HomeAssistant;
- @property() public entry!: ExtEntityRegistryEntry;
+ @property({ attribute: false }) public entry!: ExtEntityRegistryEntry;
@state() private _origEntityId!: string;
@@ -33,7 +34,7 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
@state() private _areaId?: string | null;
- @state() private _disabledBy!: string | null;
+ @state() private _disabledBy!: EntityRegistryEntry["disabled_by"];
@state() private _hiddenBy!: string | null;
@@ -41,7 +42,7 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
@state() private _device?: DeviceRegistryEntry;
- @state() private _submitting?: boolean;
+ @state() private _submitting = false;
public async updateEntry(): Promise {
this._submitting = true;
@@ -145,8 +146,8 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
>
@@ -182,8 +183,8 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
name="hiddendisabled"
value="enabled"
.checked=${!this._hiddenBy && !this._disabledBy}
- .disabled=${this._device?.disabled_by ||
- (this._disabledBy &&
+ .disabled=${!!this._device?.disabled_by ||
+ (this._disabledBy !== null &&
!(
this._disabledBy === "user" ||
this._disabledBy === "integration"
@@ -200,8 +201,8 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
name="hiddendisabled"
value="hidden"
.checked=${this._hiddenBy !== null}
- .disabled=${this._device?.disabled_by ||
- (this._disabledBy &&
+ .disabled=${!!this._device?.disabled_by ||
+ (this._disabledBy !== null &&
!(
this._disabledBy === "user" ||
this._disabledBy === "integration"
@@ -218,8 +219,8 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
name="hiddendisabled"
value="disabled"
.checked=${this._disabledBy !== null}
- .disabled=${this._device?.disabled_by ||
- (this._disabledBy &&
+ .disabled=${!!this._device?.disabled_by ||
+ (this._disabledBy !== null &&
!(
this._disabledBy === "user" ||
this._disabledBy === "integration"
@@ -302,3 +303,9 @@ export class HaEntityRegistryBasicEditor extends SubscribeMixin(LitElement) {
`;
}
}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "ha-registry-basic-editor": HaEntityRegistryBasicEditor;
+ }
+}
diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index 799d221004..c3ae97d0e3 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -53,6 +53,7 @@ import {
updateDeviceRegistryEntry,
} from "../../../data/device_registry";
import {
+ EntityRegistryEntry,
EntityRegistryEntryUpdateParams,
ExtEntityRegistryEntry,
fetchEntityRegistry,
@@ -105,6 +106,10 @@ const OVERRIDE_DEVICE_CLASSES = {
],
};
+const OVERRIDE_NUMBER_UNITS = {
+ temperature: ["°C", "°F", "K"],
+};
+
const OVERRIDE_SENSOR_UNITS = {
temperature: ["°C", "°F", "K"],
pressure: ["hPa", "Pa", "kPa", "bar", "cbar", "mbar", "mmHg", "inHg", "psi"],
@@ -124,7 +129,7 @@ const SWITCH_AS_DOMAINS = ["cover", "fan", "light", "lock", "siren"];
export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
@property({ attribute: false }) public hass!: HomeAssistant;
- @property() public entry!: ExtEntityRegistryEntry;
+ @property({ type: Object }) public entry!: ExtEntityRegistryEntry;
@state() private _name!: string;
@@ -138,9 +143,9 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
@state() private _areaId?: string | null;
- @state() private _disabledBy!: string | null;
+ @state() private _disabledBy!: EntityRegistryEntry["disabled_by"];
- @state() private _hiddenBy!: string | null;
+ @state() private _hiddenBy!: EntityRegistryEntry["hidden_by"];
@state() private _device?: DeviceRegistryEntry;
@@ -235,7 +240,7 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
}
}
- if (domain === "sensor") {
+ if (domain === "number" || domain === "sensor") {
const stateObj: HassEntity | undefined =
this.hass.states[this.entry.entity_id];
this._unit_of_measurement = stateObj?.attributes?.unit_of_measurement;
@@ -361,6 +366,31 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
`
: ""}
+ ${domain === "number" &&
+ this._deviceClass &&
+ stateObj?.attributes.unit_of_measurement &&
+ OVERRIDE_NUMBER_UNITS[this._deviceClass]?.includes(
+ stateObj?.attributes.unit_of_measurement
+ )
+ ? html`
+
+ ${OVERRIDE_NUMBER_UNITS[this._deviceClass].map(
+ (unit: string) => html`
+ ${unit}
+ `
+ )}
+
+ `
+ : ""}
${domain === "sensor" &&
this._deviceClass &&
stateObj?.attributes.unit_of_measurement &&
@@ -601,9 +631,10 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
name="hiddendisabled"
value="enabled"
.checked=${!this._hiddenBy && !this._disabledBy}
- .disabled=${(this._hiddenBy && this._hiddenBy !== "user") ||
- this._device?.disabled_by ||
- (this._disabledBy &&
+ .disabled=${(this._hiddenBy !== null &&
+ this._hiddenBy !== "user") ||
+ !!this._device?.disabled_by ||
+ (this._disabledBy !== null &&
this._disabledBy !== "user" &&
this._disabledBy !== "integration")}
@change=${this._viewStatusChanged}
@@ -861,10 +892,10 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
params.hidden_by = this._hiddenBy;
}
if (
- domain === "sensor" &&
+ (domain === "number" || domain === "number") &&
stateObj?.attributes?.unit_of_measurement !== this._unit_of_measurement
) {
- params.options_domain = "sensor";
+ params.options_domain = domain;
params.options = { unit_of_measurement: this._unit_of_measurement };
}
if (
@@ -1023,12 +1054,10 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
bottom: 0;
width: 100%;
box-sizing: border-box;
- border-top: 1px solid
- var(--mdc-dialog-scroll-divider-color, rgba(0, 0, 0, 0.12));
display: flex;
- justify-content: space-between;
- padding: 8px;
- padding-bottom: max(env(safe-area-inset-bottom), 8px);
+ padding: 0 24px 24px 24px;
+ justify-content: flex-end;
+ padding-bottom: max(env(safe-area-inset-bottom), 24px);
background-color: var(--mdc-theme-surface, #fff);
}
ha-select {
diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts
index 0a92026932..154f2cb424 100644
--- a/src/panels/config/entities/ha-config-entities.ts
+++ b/src/panels/config/entities/ha-config-entities.ts
@@ -15,6 +15,7 @@ import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, query, state } from "lit/decorators";
import { classMap } from "lit/directives/class-map";
+import { ifDefined } from "lit/directives/if-defined";
import { styleMap } from "lit/directives/style-map";
import memoize from "memoize-one";
import type { HASSDomEvent } from "../../../common/dom/fire_event";
@@ -85,11 +86,11 @@ export interface EntityRow extends StateEntity {
export class HaConfigEntities extends SubscribeMixin(LitElement) {
@property({ attribute: false }) public hass!: HomeAssistant;
- @property() public isWide!: boolean;
+ @property({ type: Boolean }) public isWide!: boolean;
- @property() public narrow!: boolean;
+ @property({ type: Boolean }) public narrow!: boolean;
- @property() public route!: Route;
+ @property({ attribute: false }) public route!: Route;
@state() private _entities?: EntityRegistryEntry[];
@@ -174,7 +175,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
type: "icon",
template: (_, entry: EntityRow) => html`
@@ -237,12 +238,10 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
hidden: narrow || !showDisabled,
filterable: true,
width: "15%",
- template: (disabled_by) =>
- this.hass.localize(
- `ui.panel.config.devices.disabled_by.${disabled_by}`
- ) ||
- disabled_by ||
- "—",
+ template: (disabled_by: EntityRegistryEntry["disabled_by"]) =>
+ disabled_by === null
+ ? "—"
+ : this.hass.localize(`config_entry.disabled_by.${disabled_by}`),
},
status: {
title: this.hass.localize(
@@ -736,6 +735,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
readonly: true,
selectable: false,
entity_category: null,
+ has_entity_name: false,
});
}
if (changed) {
@@ -1011,3 +1011,9 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) {
];
}
}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "ha-config-entities": HaConfigEntities;
+ }
+}
diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts
index 7f7b93df45..c910dfdbeb 100644
--- a/src/panels/config/ha-panel-config.ts
+++ b/src/panels/config/ha-panel-config.ts
@@ -6,9 +6,9 @@ import {
mdiCog,
mdiDatabase,
mdiDevices,
- mdiHeart,
mdiInformation,
mdiInformationOutline,
+ mdiLifebuoy,
mdiLightningBolt,
mdiMapMarkerRadius,
mdiMathLog,
@@ -267,6 +267,12 @@ export const configSections: { [name: string]: PageNavigation[] } = {
iconPath: mdiUpdate,
iconColor: "#3B808E",
},
+ {
+ path: "/config/repairs",
+ translationKey: "repairs",
+ iconPath: mdiLifebuoy,
+ iconColor: "#5c995c",
+ },
{
component: "logs",
path: "/config/logs",
@@ -315,13 +321,6 @@ export const configSections: { [name: string]: PageNavigation[] } = {
iconColor: "#301A8E",
component: "hassio",
},
- {
- path: "/config/system_health",
- translationKey: "system_health",
- iconPath: mdiHeart,
- iconColor: "#507FfE",
- components: ["system_health", "hassio"],
- },
],
about: [
{
@@ -440,14 +439,14 @@ class HaPanelConfig extends HassRouterPage {
tag: "ha-config-section-storage",
load: () => import("./storage/ha-config-section-storage"),
},
- system_health: {
- tag: "ha-config-system-health",
- load: () => import("./system-health/ha-config-system-health"),
- },
updates: {
tag: "ha-config-section-updates",
load: () => import("./core/ha-config-section-updates"),
},
+ repairs: {
+ tag: "ha-config-repairs-dashboard",
+ load: () => import("./repairs/ha-config-repairs-dashboard"),
+ },
users: {
tag: "ha-config-users",
load: () => import("./users/ha-config-users"),
diff --git a/src/panels/config/hardware/dialog-hardware-available.ts b/src/panels/config/hardware/dialog-hardware-available.ts
index 9413c8acb7..aee0f828e7 100644
--- a/src/panels/config/hardware/dialog-hardware-available.ts
+++ b/src/panels/config/hardware/dialog-hardware-available.ts
@@ -89,7 +89,7 @@ class DialogHardwareAvailable extends LitElement implements HassDialog {
)}
@@ -97,7 +97,9 @@ class DialogHardwareAvailable extends LitElement implements HassDialog {
.hass=${this.hass}
.filter=${this._filter}
@value-changed=${this._handleSearchChange}
- .label=${this.hass.localize("common.search")}
+ .label=${this.hass.localize(
+ "ui.panel.config.hardware.available_hardware.search"
+ )}
>
diff --git a/src/panels/config/hardware/ha-config-hardware.ts b/src/panels/config/hardware/ha-config-hardware.ts
index 532e344340..ebeea3e350 100644
--- a/src/panels/config/hardware/ha-config-hardware.ts
+++ b/src/panels/config/hardware/ha-config-hardware.ts
@@ -202,7 +202,7 @@ class HaConfigHardware extends LitElement {
title: this.hass.localize("ui.panel.config.hardware.reboot_host"),
text: this.hass.localize("ui.panel.config.hardware.reboot_host_confirm"),
confirmText: this.hass.localize("ui.panel.config.hardware.reboot_host"),
- dismissText: this.hass.localize("common.cancel"),
+ dismissText: this.hass.localize("ui.common.cancel"),
});
if (!confirmed) {
@@ -236,7 +236,7 @@ class HaConfigHardware extends LitElement {
"ui.panel.config.hardware.shutdown_host_confirm"
),
confirmText: this.hass.localize("ui.panel.config.hardware.shutdown_host"),
- dismissText: this.hass.localize("common.cancel"),
+ dismissText: this.hass.localize("ui.common.cancel"),
});
if (!confirmed) {
diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts
index beb0bb0cb0..82ce8bf60f 100644
--- a/src/panels/config/integrations/ha-config-integrations.ts
+++ b/src/panels/config/integrations/ha-config-integrations.ts
@@ -14,7 +14,8 @@ import { customElement, property, state } from "lit/decorators";
import { ifDefined } from "lit/directives/if-defined";
import memoizeOne from "memoize-one";
import { isComponentLoaded } from "../../../common/config/is_component_loaded";
-import type { HASSDomEvent } from "../../../common/dom/fire_event";
+import { fireEvent, HASSDomEvent } from "../../../common/dom/fire_event";
+import { protocolIntegrationPicked } from "../../../common/integrations/protocolIntegrationPicked";
import { navigate } from "../../../common/navigate";
import { caseInsensitiveStringCompare } from "../../../common/string/compare";
import type { LocalizeFunc } from "../../../common/translations/localize";
@@ -49,6 +50,10 @@ import {
fetchIntegrationManifests,
IntegrationManifest,
} from "../../../data/integration";
+import {
+ getSupportedBrands,
+ getSupportedBrandsLookup,
+} from "../../../data/supported_brands";
import { scanUSBDevices } from "../../../data/usb";
import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-config-flow";
import {
@@ -677,49 +682,84 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
if (!domain) {
return;
}
+
const handlers = await getConfigFlowHandlers(this.hass, "integration");
- if (!handlers.includes(domain)) {
- if (HELPER_DOMAINS.includes(domain)) {
- navigate(`/config/helpers/add?domain=${domain}`, {
- replace: true,
- });
+ // Integration exists, so we can just create a flow
+ if (handlers.includes(domain)) {
+ const localize = await localizePromise;
+ if (
+ !(await showConfirmationDialog(this, {
+ title: localize("ui.panel.config.integrations.confirm_new", {
+ integration: domainToName(localize, domain),
+ }),
+ }))
+ ) {
return;
}
- const helpers = await getConfigFlowHandlers(this.hass, "helper");
- if (helpers.includes(domain)) {
- navigate(`/config/helpers/add?domain=${domain}`, {
- replace: true,
- });
- return;
- }
- showAlertDialog(this, {
- title: this.hass.localize(
- "ui.panel.config.integrations.config_flow.error"
- ),
+ showConfigFlowDialog(this, {
+ dialogClosedCallback: () => {
+ this._handleFlowUpdated();
+ },
+ startFlowHandler: domain,
+ manifest: this._manifests[domain],
+ showAdvanced: this.hass.userData?.showAdvanced,
+ });
+ }
+
+ const supportedBrands = await getSupportedBrands(this.hass);
+ const supportedBrandsIntegrations =
+ getSupportedBrandsLookup(supportedBrands);
+
+ // Supported brand exists, so we can just create a flow
+ if (Object.keys(supportedBrandsIntegrations).includes(domain)) {
+ const brand = supportedBrandsIntegrations[domain];
+ const slug = brand.supported_flows![0];
+
+ showConfirmationDialog(this, {
text: this.hass.localize(
- "ui.panel.config.integrations.config_flow.no_config_flow"
+ "ui.panel.config.integrations.config_flow.supported_brand_flow",
+ {
+ supported_brand: brand.name,
+ flow_domain_name: domainToName(this.hass.localize, slug),
+ }
),
+ confirm: () => {
+ if (["zha", "zwave_js"].includes(slug)) {
+ protocolIntegrationPicked(this, this.hass, slug);
+ return;
+ }
+
+ fireEvent(this, "handler-picked", {
+ handler: slug,
+ });
+ },
+ });
+
+ return;
+ }
+
+ // If not an integration or supported brand, try helper else show alert
+ if (HELPER_DOMAINS.includes(domain)) {
+ navigate(`/config/helpers/add?domain=${domain}`, {
+ replace: true,
});
return;
}
- const localize = await localizePromise;
- if (
- !(await showConfirmationDialog(this, {
- title: localize("ui.panel.config.integrations.confirm_new", {
- integration: domainToName(localize, domain),
- }),
- }))
- ) {
+ const helpers = await getConfigFlowHandlers(this.hass, "helper");
+ if (helpers.includes(domain)) {
+ navigate(`/config/helpers/add?domain=${domain}`, {
+ replace: true,
+ });
return;
}
- showConfigFlowDialog(this, {
- dialogClosedCallback: () => {
- this._handleFlowUpdated();
- },
- startFlowHandler: domain,
- manifest: this._manifests[domain],
- showAdvanced: this.hass.userData?.showAdvanced,
+ showAlertDialog(this, {
+ title: this.hass.localize(
+ "ui.panel.config.integrations.config_flow.error"
+ ),
+ text: this.hass.localize(
+ "ui.panel.config.integrations.config_flow.no_config_flow"
+ ),
});
}
diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts
index 40484aa881..348cdc3e6f 100644
--- a/src/panels/config/integrations/ha-integration-card.ts
+++ b/src/panels/config/integrations/ha-integration-card.ts
@@ -7,7 +7,7 @@ import {
mdiDotsVertical,
mdiOpenInNew,
} from "@mdi/js";
-import "@polymer/paper-item";
+import "@polymer/paper-item/paper-item";
import "@polymer/paper-listbox";
import "@polymer/paper-tooltip/paper-tooltip";
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
@@ -31,6 +31,7 @@ import {
reloadConfigEntry,
updateConfigEntry,
ERROR_STATES,
+ RECOVERABLE_STATES,
} from "../../../data/config_entries";
import type { DeviceRegistryEntry } from "../../../data/device_registry";
import { getConfigEntryDiagnosticsDownloadUrl } from "../../../data/diagnostics";
@@ -63,13 +64,15 @@ export class HaIntegrationCard extends LitElement {
@property() public domain!: string;
- @property() public items!: ConfigEntryExtended[];
+ @property({ attribute: false }) public items!: ConfigEntryExtended[];
- @property() public manifest?: IntegrationManifest;
+ @property({ attribute: false }) public manifest?: IntegrationManifest;
- @property() public entityRegistryEntries!: EntityRegistryEntry[];
+ @property({ attribute: false })
+ public entityRegistryEntries!: EntityRegistryEntry[];
- @property() public deviceRegistryEntries!: DeviceRegistryEntry[];
+ @property({ attribute: false })
+ public deviceRegistryEntries!: DeviceRegistryEntry[];
@property() public selectedConfigEntryId?: string;
@@ -178,7 +181,7 @@ export class HaIntegrationCard extends LitElement {
const services = this._getServices(item, this.deviceRegistryEntries);
const entities = this._getEntities(item, this.entityRegistryEntries);
- let stateText: [string, ...unknown[]] | undefined;
+ let stateText: Parameters | undefined;
let stateTextExtra: TemplateResult | string | undefined;
if (item.disabled_by) {
@@ -224,7 +227,7 @@ export class HaIntegrationCard extends LitElement {
for (const [items, localizeKey] of [
[devices, "devices"],
[services, "services"],
- ] as [DeviceRegistryEntry[], string][]) {
+ ] as const) {
if (items.length === 0) {
continue;
}
@@ -366,7 +369,7 @@ export class HaIntegrationCard extends LitElement {
`
: ""}
${!item.disabled_by &&
- (item.state === "loaded" || item.state === "setup_retry") &&
+ RECOVERABLE_STATES.includes(item.state) &&
item.supports_unload &&
item.source !== "system"
? html`
diff --git a/src/panels/config/integrations/ha-integration-header.ts b/src/panels/config/integrations/ha-integration-header.ts
index 84988ab146..f954b5adf0 100644
--- a/src/panels/config/integrations/ha-integration-header.ts
+++ b/src/panels/config/integrations/ha-integration-header.ts
@@ -12,13 +12,13 @@ import { brandsUrl } from "../../../util/brands-url";
export class HaIntegrationHeader extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant;
- @property() public banner!: string;
+ @property() public banner?: string;
@property() public localizedDomainName?: string;
@property() public domain!: string;
- @property() public label!: string;
+ @property() public label?: string;
@property({ attribute: false }) public manifest?: IntegrationManifest;
diff --git a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
index c1a75807c7..9f6cb644dc 100644
--- a/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
+++ b/src/panels/config/integrations/integration-panels/zwave_js/dialog-zwave_js-add-node.ts
@@ -401,7 +401,7 @@ class DialogZWaveJSAddNode extends LitElement {