* {
+ color: var(--secondary-text-color);
+ }
`,
];
}
diff --git a/src/dialogs/config-flow/show-dialog-config-flow.ts b/src/dialogs/config-flow/show-dialog-config-flow.ts
index 42337b40ff..5b7c0722b7 100644
--- a/src/dialogs/config-flow/show-dialog-config-flow.ts
+++ b/src/dialogs/config-flow/show-dialog-config-flow.ts
@@ -24,7 +24,7 @@ export const showConfigFlowDialog = (
loadDevicesAndAreas: true,
getFlowHandlers: async (hass) => {
const [handlers] = await Promise.all([
- getConfigFlowHandlers(hass),
+ getConfigFlowHandlers(hass, "integration"),
hass.loadBackendTranslation("title", undefined, true),
]);
diff --git a/src/dialogs/config-flow/step-flow-pick-handler.ts b/src/dialogs/config-flow/step-flow-pick-handler.ts
index 9f2a7e6740..0beb4ac26f 100644
--- a/src/dialogs/config-flow/step-flow-pick-handler.ts
+++ b/src/dialogs/config-flow/step-flow-pick-handler.ts
@@ -216,15 +216,16 @@ class StepFlowPickHandler extends LitElement {
if (handler.is_add) {
if (handler.slug === "zwave_js") {
- const entries = await getConfigEntries(this.hass);
- const entry = entries.find((ent) => ent.domain === "zwave_js");
+ const entries = await getConfigEntries(this.hass, {
+ domain: "zwave_js",
+ });
- if (!entry) {
+ if (!entries.length) {
return;
}
showZWaveJSAddNodeDialog(this, {
- entry_id: entry.entry_id,
+ entry_id: entries[0].entry_id,
});
} else if (handler.slug === "zha") {
navigate("/config/zha/add");
diff --git a/src/dialogs/more-info/controls/more-info-update.ts b/src/dialogs/more-info/controls/more-info-update.ts
new file mode 100644
index 0000000000..de1dbe1f10
--- /dev/null
+++ b/src/dialogs/more-info/controls/more-info-update.ts
@@ -0,0 +1,212 @@
+import "@material/mwc-button/mwc-button";
+import "@material/mwc-linear-progress/mwc-linear-progress";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
+import { customElement, property } from "lit/decorators";
+import { supportsFeature } from "../../../common/entity/supports-feature";
+import "../../../components/ha-checkbox";
+import "../../../components/ha-formfield";
+import "../../../components/ha-markdown";
+import { UNAVAILABLE_STATES } from "../../../data/entity";
+import {
+ updateIsInstalling,
+ UpdateEntity,
+ UPDATE_SUPPORT_BACKUP,
+ UPDATE_SUPPORT_INSTALL,
+ UPDATE_SUPPORT_PROGRESS,
+ UPDATE_SUPPORT_SPECIFIC_VERSION,
+} from "../../../data/update";
+import type { HomeAssistant } from "../../../types";
+
+@customElement("more-info-update")
+class MoreInfoUpdate extends LitElement {
+ @property({ attribute: false }) public hass!: HomeAssistant;
+
+ @property({ attribute: false }) public stateObj?: UpdateEntity;
+
+ protected render(): TemplateResult {
+ if (
+ !this.hass ||
+ !this.stateObj ||
+ UNAVAILABLE_STATES.includes(this.stateObj.state)
+ ) {
+ return html``;
+ }
+
+ const skippedVersion =
+ this.stateObj.attributes.latest_version &&
+ this.stateObj.attributes.skipped_version ===
+ this.stateObj.attributes.latest_version;
+
+ return html`
+ ${this.stateObj.attributes.in_progress
+ ? supportsFeature(this.stateObj, UPDATE_SUPPORT_PROGRESS) &&
+ typeof this.stateObj.attributes.in_progress === "number"
+ ? html``
+ : html``
+ : ""}
+ ${this.stateObj.attributes.title
+ ? html`${this.stateObj.attributes.title}
`
+ : ""}
+
+
+
+ ${this.hass.localize(
+ "ui.dialogs.more_info_control.update.current_version"
+ )}
+
+
+ ${this.stateObj.attributes.current_version ??
+ this.hass.localize("state.default.unavailable")}
+
+
+
+ ${this.hass.localize(
+ "ui.dialogs.more_info_control.update.latest_version"
+ )}
+
+
+ ${this.stateObj.attributes.latest_version ??
+ this.hass.localize("state.default.unavailable")}
+
+
+ `
+ : ""}
+ ${supportsFeature(this.stateObj, UPDATE_SUPPORT_BACKUP)
+ ? html`
+
+
+ `
+ : ""}
+
+
+
+ ${this.hass.localize("ui.dialogs.more_info_control.update.skip")}
+
+ ${supportsFeature(this.stateObj, UPDATE_SUPPORT_INSTALL)
+ ? html`
+
+ ${this.hass.localize(
+ "ui.dialogs.more_info_control.update.install"
+ )}
+
+ `
+ : ""}
+
+ `;
+ }
+
+ get _shouldCreateBackup(): boolean | null {
+ if (!supportsFeature(this.stateObj!, UPDATE_SUPPORT_BACKUP)) {
+ return null;
+ }
+ const checkbox = this.shadowRoot?.querySelector("ha-checkbox");
+ if (checkbox) {
+ return checkbox.checked;
+ }
+ return true;
+ }
+
+ private _handleInstall(): void {
+ const installData: Record = {
+ entity_id: this.stateObj!.entity_id,
+ };
+
+ if (this._shouldCreateBackup) {
+ installData.backup = true;
+ }
+
+ if (
+ supportsFeature(this.stateObj!, UPDATE_SUPPORT_SPECIFIC_VERSION) &&
+ this.stateObj!.attributes.latest_version
+ ) {
+ installData.version = this.stateObj!.attributes.latest_version;
+ }
+
+ this.hass.callService("update", "install", installData);
+ }
+
+ private _handleSkip(): void {
+ this.hass.callService("update", "skip", {
+ entity_id: this.stateObj!.entity_id,
+ });
+ }
+
+ static get styles(): CSSResultGroup {
+ return css`
+ hr {
+ border-color: var(--divider-color);
+ border-bottom: none;
+ margin: 16px 0;
+ }
+ ha-expansion-panel {
+ margin: 16px 0;
+ }
+ .row {
+ margin: 0;
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ }
+ .actions {
+ margin: 8px 0 0;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: center;
+ }
+
+ .actions mwc-button {
+ margin: 0 4px 4px;
+ }
+ a {
+ color: var(--primary-color);
+ }
+ `;
+ }
+}
+
+declare global {
+ interface HTMLElementTagNameMap {
+ "more-info-update": MoreInfoUpdate;
+ }
+}
diff --git a/src/dialogs/more-info/state_more_info_control.ts b/src/dialogs/more-info/state_more_info_control.ts
index 02abe5e731..3df5e85b4b 100644
--- a/src/dialogs/more-info/state_more_info_control.ts
+++ b/src/dialogs/more-info/state_more_info_control.ts
@@ -25,6 +25,7 @@ const LAZY_LOADED_MORE_INFO_CONTROL = {
script: () => import("./controls/more-info-script"),
sun: () => import("./controls/more-info-sun"),
timer: () => import("./controls/more-info-timer"),
+ update: () => import("./controls/more-info-update"),
vacuum: () => import("./controls/more-info-vacuum"),
water_heater: () => import("./controls/more-info-water_heater"),
weather: () => import("./controls/more-info-weather"),
diff --git a/src/onboarding/onboarding-integrations.ts b/src/onboarding/onboarding-integrations.ts
index 6ac3504e5e..9fc15b0c07 100644
--- a/src/onboarding/onboarding-integrations.ts
+++ b/src/onboarding/onboarding-integrations.ts
@@ -169,8 +169,8 @@ class OnboardingIntegrations extends LitElement {
}
private async _loadConfigEntries() {
- const entries = await getConfigEntries(this.hass!);
- // We filter out the config entry for the local weather and rpi_power.
+ const entries = await getConfigEntries(this.hass!, { type: "integration" });
+ // We filter out the config entries that are automatically created during onboarding.
// It is one that we create automatically and it will confuse the user
// if it starts showing up during onboarding.
this._entries = entries.filter(
diff --git a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
index 99f48c8989..78d56a0b1b 100644
--- a/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
+++ b/src/panels/config/devices/device-detail/integration-elements/zwave_js/ha-device-info-zwave_js.ts
@@ -58,12 +58,11 @@ export class HaDeviceInfoZWaveJS extends LitElement {
return;
}
- const configEntries = await getConfigEntries(this.hass);
+ const configEntries = await getConfigEntries(this.hass, {
+ domain: "zwave_js",
+ });
let zwaveJsConfEntries = 0;
for (const entry of configEntries) {
- if (entry.domain !== "zwave_js") {
- continue;
- }
if (zwaveJsConfEntries) {
this._multipleConfigEntries = true;
}
diff --git a/src/panels/config/energy/components/ha-energy-gas-settings.ts b/src/panels/config/energy/components/ha-energy-gas-settings.ts
index 3f92d1a023..4e65150f2b 100644
--- a/src/panels/config/energy/components/ha-energy-gas-settings.ts
+++ b/src/panels/config/energy/components/ha-energy-gas-settings.ts
@@ -121,6 +121,7 @@ export class EnergyGasSettings extends LitElement {
showEnergySettingsGasDialog(this, {
unit: getEnergyGasUnitCategory(this.hass, this.preferences),
saveCallback: async (source) => {
+ delete source.unit_of_measurement;
await this._savePreferences({
...this.preferences,
energy_sources: this.preferences.energy_sources.concat(source),
diff --git a/src/panels/config/energy/components/ha-energy-grid-settings.ts b/src/panels/config/energy/components/ha-energy-grid-settings.ts
index 700329dd1c..46ac49d885 100644
--- a/src/panels/config/energy/components/ha-energy-grid-settings.ts
+++ b/src/panels/config/energy/components/ha-energy-grid-settings.ts
@@ -54,7 +54,7 @@ export class EnergyGridSettings extends LitElement {
@property({ attribute: false })
public validationResult?: EnergyPreferencesValidation;
- @state() private _configEntries?: ConfigEntry[];
+ @state() private _co2ConfigEntry?: ConfigEntry;
protected firstUpdated() {
this._fetchCO2SignalConfigEntries();
@@ -195,28 +195,28 @@ export class EnergyGridSettings extends LitElement {
"ui.panel.config.energy.grid.grid_carbon_footprint"
)}
- ${this._configEntries?.map(
- (entry) => html`
-
-
${entry.title}
-
-
-
-
-
+
+
${this._co2ConfigEntry.title}
+
+
+
+
+
+
+ ${this.hass.localize(
+ "ui.dialogs.entity_registry.editor.configure_state"
+ )}
+
+
+ `
+ : ""}
+
${this.hass.localize("ui.dialogs.entity_registry.editor.delete")}
@@ -471,13 +508,21 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
this._submitting = true;
try {
- await removeEntityRegistryEntry(this.hass!, this._origEntityId);
+ if (this._helperConfigEntry) {
+ await deleteConfigEntry(this.hass, this._helperConfigEntry.entry_id);
+ } else {
+ await removeEntityRegistryEntry(this.hass!, this._origEntityId);
+ }
fireEvent(this, "close-dialog");
} finally {
this._submitting = false;
}
}
+ private async _showOptionsFlow() {
+ showOptionsFlowDialog(this, this._helperConfigEntry!);
+ }
+
static get styles(): CSSResultGroup {
return [
haStyle,
diff --git a/src/panels/config/helpers/const.ts b/src/panels/config/helpers/const.ts
index 2e927f66ad..c103332573 100644
--- a/src/panels/config/helpers/const.ts
+++ b/src/panels/config/helpers/const.ts
@@ -1,11 +1,11 @@
-import { Counter } from "../../../data/counter";
-import { InputBoolean } from "../../../data/input_boolean";
-import { InputButton } from "../../../data/input_button";
-import { InputDateTime } from "../../../data/input_datetime";
-import { InputNumber } from "../../../data/input_number";
-import { InputSelect } from "../../../data/input_select";
-import { InputText } from "../../../data/input_text";
-import { Timer } from "../../../data/timer";
+import type { Counter } from "../../../data/counter";
+import type { InputBoolean } from "../../../data/input_boolean";
+import type { InputButton } from "../../../data/input_button";
+import type { InputDateTime } from "../../../data/input_datetime";
+import type { InputNumber } from "../../../data/input_number";
+import type { InputSelect } from "../../../data/input_select";
+import type { InputText } from "../../../data/input_text";
+import type { Timer } from "../../../data/timer";
export const HELPER_DOMAINS = [
"input_boolean",
diff --git a/src/panels/config/helpers/dialog-helper-detail.ts b/src/panels/config/helpers/dialog-helper-detail.ts
index bbd0b645e1..c3adf6a826 100644
--- a/src/panels/config/helpers/dialog-helper-detail.ts
+++ b/src/panels/config/helpers/dialog-helper-detail.ts
@@ -8,6 +8,8 @@ import { isComponentLoaded } from "../../../common/config/is_component_loaded";
import { dynamicElement } from "../../../common/dom/dynamic-element-directive";
import { domainIcon } from "../../../common/entity/domain_icon";
import "../../../components/ha-dialog";
+import "../../../components/ha-circular-progress";
+import { getConfigFlowHandlers } from "../../../data/config_flow";
import { createCounter } from "../../../data/counter";
import { createInputBoolean } from "../../../data/input_boolean";
import { createInputButton } from "../../../data/input_button";
@@ -16,6 +18,7 @@ import { createInputNumber } from "../../../data/input_number";
import { createInputSelect } from "../../../data/input_select";
import { createInputText } from "../../../data/input_text";
import { createTimer } from "../../../data/timer";
+import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-config-flow";
import { haStyleDialog } from "../../../resources/styles";
import { HomeAssistant } from "../../../types";
import { Helper } from "./const";
@@ -27,6 +30,8 @@ import "./forms/ha-input_number-form";
import "./forms/ha-input_select-form";
import "./forms/ha-input_text-form";
import "./forms/ha-timer-form";
+import { domainToName } from "../../../data/integration";
+import type { ShowDialogHelperDetailParams } from "./show-dialog-helper-detail";
const HELPERS = {
input_boolean: createInputBoolean,
@@ -47,7 +52,7 @@ export class DialogHelperDetail extends LitElement {
@state() private _opened = false;
- @state() private _platform?: string;
+ @state() private _domain?: string;
@state() private _error?: string;
@@ -55,102 +60,135 @@ export class DialogHelperDetail extends LitElement {
@query(".form") private _form?: HTMLDivElement;
- public async showDialog(): Promise {
- this._platform = undefined;
+ @state() private _helperFlows?: string[];
+
+ private _params?: ShowDialogHelperDetailParams;
+
+ public async showDialog(params: ShowDialogHelperDetailParams): Promise {
+ this._params = params;
+ this._domain = undefined;
this._item = undefined;
this._opened = true;
await this.updateComplete;
+ Promise.all([
+ getConfigFlowHandlers(this.hass, "helper"),
+ // Ensure the titles are loaded before we render the flows.
+ this.hass.loadBackendTranslation("title", undefined, true),
+ ]).then(([flows]) => {
+ this._helperFlows = flows;
+ });
}
public closeDialog(): void {
this._opened = false;
this._error = "";
+ this._params = undefined;
}
protected render(): TemplateResult {
+ let content: TemplateResult;
+
+ if (this._domain) {
+ content = html`
+
+
+ ${this.hass!.localize("ui.panel.config.helpers.dialog.create")}
+
+
+ ${this.hass!.localize("ui.common.back")}
+
+ `;
+ } else if (this._helperFlows === undefined) {
+ content = html``;
+ } else {
+ const items: [string, string][] = [];
+
+ for (const helper of Object.keys(HELPERS)) {
+ items.push([
+ helper,
+ this.hass.localize(`ui.panel.config.helpers.types.${helper}`) ||
+ helper,
+ ]);
+ }
+
+ for (const domain of this._helperFlows) {
+ items.push([domain, domainToName(this.hass.localize, domain)]);
+ }
+
+ items.sort((a, b) => a[1].localeCompare(b[1]));
+
+ content = html`
+ ${items.map(([domain, label]) => {
+ // Only OG helpers need to be loaded prior adding one
+ const isLoaded =
+ !(domain in HELPERS) || isComponentLoaded(this.hass, domain);
+ return html`
+
+
+ ${label}
+
+ ${!isLoaded
+ ? html`
+ ${this.hass.localize(
+ "ui.dialogs.helper_settings.platform_not_loaded",
+ "platform",
+ domain
+ )}
+ `
+ : ""}
+ `;
+ })}
+
+ ${this.hass!.localize("ui.common.cancel")}
+
+ `;
+ }
+
return html`
- ${this._platform
- ? html`
-
-
- ${this.hass!.localize("ui.panel.config.helpers.dialog.create")}
-
-
- ${this.hass!.localize("ui.common.back")}
-
- `
- : html`
- ${Object.keys(HELPERS).map((platform: string) => {
- const isLoaded = isComponentLoaded(this.hass, platform);
- return html`
-
-
-
- ${this.hass.localize(
- `ui.panel.config.helpers.types.${platform}`
- ) || platform}
-
-
- ${!isLoaded
- ? html`
- ${this.hass.localize(
- "ui.dialogs.helper_settings.platform_not_loaded",
- "platform",
- platform
- )}
- `
- : ""}
- `;
- })}
-
- ${this.hass!.localize("ui.common.cancel")}
-
- `}
+ ${content}
`;
}
@@ -160,13 +198,13 @@ export class DialogHelperDetail extends LitElement {
}
private async _createItem(): Promise {
- if (!this._platform || !this._item) {
+ if (!this._domain || !this._item) {
return;
}
this._submitting = true;
this._error = "";
try {
- await HELPERS[this._platform](this.hass, this._item);
+ await HELPERS[this._domain](this.hass, this._item);
this.closeDialog();
} catch (err: any) {
this._error = err.message || "Unknown error";
@@ -181,12 +219,22 @@ export class DialogHelperDetail extends LitElement {
}
ev.stopPropagation();
ev.preventDefault();
- this._platformPicked(ev);
+ this._domainPicked(ev);
}
- private _platformPicked(ev: Event): void {
- this._platform = (ev.currentTarget! as any).platform;
- this._focusForm();
+ private _domainPicked(ev: Event): void {
+ const domain = (ev.currentTarget! as any).domain;
+
+ if (domain in HELPERS) {
+ this._domain = domain;
+ this._focusForm();
+ } else {
+ showConfigFlowDialog(this, {
+ startFlowHandler: domain,
+ dialogClosedCallback: this._params!.dialogClosedCallback,
+ });
+ this.closeDialog();
+ }
}
private async _focusForm(): Promise {
@@ -195,7 +243,7 @@ export class DialogHelperDetail extends LitElement {
}
private _goBack() {
- this._platform = undefined;
+ this._domain = undefined;
this._item = undefined;
this._error = undefined;
}
diff --git a/src/panels/config/helpers/ha-config-helpers.ts b/src/panels/config/helpers/ha-config-helpers.ts
index ac58f83e44..4ce9d00118 100644
--- a/src/panels/config/helpers/ha-config-helpers.ts
+++ b/src/panels/config/helpers/ha-config-helpers.ts
@@ -1,28 +1,58 @@
import { mdiPencilOff, mdiPlus } from "@mdi/js";
import "@polymer/paper-tooltip/paper-tooltip";
-import { HassEntity } from "home-assistant-js-websocket";
+import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
import { html, LitElement, PropertyValues, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
-import memoize from "memoize-one";
+import memoizeOne from "memoize-one";
import { computeStateDomain } from "../../../common/entity/compute_state_domain";
import { domainIcon } from "../../../common/entity/domain_icon";
+import { LocalizeFunc } from "../../../common/translations/localize";
import {
DataTableColumnContainer,
RowClickedEvent,
} from "../../../components/data-table/ha-data-table";
import "../../../components/ha-fab";
+import "../../../components/ha-icon-overflow-menu";
import "../../../components/ha-icon";
import "../../../components/ha-svg-icon";
+import { ConfigEntry, getConfigEntries } from "../../../data/config_entries";
+import {
+ EntityRegistryEntry,
+ subscribeEntityRegistry,
+} from "../../../data/entity_registry";
+import { domainToName } from "../../../data/integration";
import "../../../layouts/hass-loading-screen";
import "../../../layouts/hass-tabs-subpage-data-table";
+import { SubscribeMixin } from "../../../mixins/subscribe-mixin";
import { HomeAssistant, Route } from "../../../types";
import { showEntityEditorDialog } from "../entities/show-dialog-entity-editor";
import { configSections } from "../ha-panel-config";
import { HELPER_DOMAINS } from "./const";
import { showHelperDetailDialog } from "./show-dialog-helper-detail";
+// This groups items by a key but only returns last entry per key.
+const groupByOne = (
+ items: T[],
+ keySelector: (item: T) => string
+): Record => {
+ const result: Record = {};
+ for (const item of items) {
+ result[keySelector(item)] = item;
+ }
+ return result;
+};
+
+const getConfigEntry = (
+ entityEntries: Record,
+ configEntries: Record,
+ entityId: string
+) => {
+ const configEntryId = entityEntries![entityId]?.config_entry_id;
+ return configEntryId ? configEntries![configEntryId] : undefined;
+};
+
@customElement("ha-config-helpers")
-export class HaConfigHelpers extends LitElement {
+export class HaConfigHelpers extends SubscribeMixin(LitElement) {
@property({ attribute: false }) public hass!: HomeAssistant;
@property() public isWide!: boolean;
@@ -33,98 +63,122 @@ export class HaConfigHelpers extends LitElement {
@state() private _stateItems: HassEntity[] = [];
- private _columns = memoize((narrow, _language): DataTableColumnContainer => {
- const columns: DataTableColumnContainer = {
- icon: {
+ @state() private _entityEntries?: Record;
+
+ @state() private _configEntries?: Record;
+
+ private _columns = memoizeOne(
+ (narrow: boolean, localize: LocalizeFunc): DataTableColumnContainer => {
+ const columns: DataTableColumnContainer = {
+ icon: {
+ title: "",
+ label: localize("ui.panel.config.helpers.picker.headers.icon"),
+ type: "icon",
+ template: (icon, helper: any) =>
+ icon
+ ? html` `
+ : html``,
+ },
+ name: {
+ title: localize("ui.panel.config.helpers.picker.headers.name"),
+ sortable: true,
+ filterable: true,
+ grows: true,
+ direction: "asc",
+ template: (name, item: any) =>
+ html`
+ ${name}
+ ${narrow
+ ? html` ${item.entity_id}
`
+ : ""}
+ `,
+ },
+ };
+ if (!narrow) {
+ columns.entity_id = {
+ title: localize("ui.panel.config.helpers.picker.headers.entity_id"),
+ sortable: true,
+ filterable: true,
+ width: "25%",
+ };
+ }
+ columns.type = {
+ title: localize("ui.panel.config.helpers.picker.headers.type"),
+ sortable: true,
+ width: "25%",
+ filterable: true,
+ template: (type, row) =>
+ row.configEntry
+ ? domainToName(localize, type)
+ : html`
+ ${localize(`ui.panel.config.helpers.types.${type}`) || type}
+ `,
+ };
+ columns.editable = {
title: "",
label: this.hass.localize(
- "ui.panel.config.helpers.picker.headers.icon"
+ "ui.panel.config.helpers.picker.headers.editable"
),
type: "icon",
- template: (icon, helper: any) =>
- icon
- ? html` `
- : html``,
- },
- name: {
- title: this.hass.localize(
- "ui.panel.config.helpers.picker.headers.name"
- ),
- sortable: true,
- filterable: true,
- grows: true,
- direction: "asc",
- template: (name, item: any) =>
- html`
- ${name}
- ${narrow
- ? html` ${item.entity_id}
`
- : ""}
- `,
- },
- };
- if (!narrow) {
- columns.entity_id = {
- title: this.hass.localize(
- "ui.panel.config.helpers.picker.headers.entity_id"
- ),
- sortable: true,
- filterable: true,
- width: "25%",
- };
- }
- columns.type = {
- title: this.hass.localize("ui.panel.config.helpers.picker.headers.type"),
- sortable: true,
- width: "25%",
- filterable: true,
- template: (type) =>
- html`
- ${this.hass.localize(`ui.panel.config.helpers.types.${type}`) || type}
+ template: (editable) => html`
+ ${!editable
+ ? html`
+
+
+
+ ${this.hass.localize(
+ "ui.panel.config.entities.picker.status.readonly"
+ )}
+
+
-
-
- ${this.hass.localize(
- "ui.panel.config.entities.picker.status.readonly"
- )}
-
-
-
-
-
+
+
`;
}
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
index 0d315cc889..ea529a2a35 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
@@ -108,32 +108,30 @@ export class HuiPictureEntityCardEditor
@value-changed=${this._valueChanged}
>
`;
}
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
index adcd07a57e..d6c6e1a0ac 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
@@ -1,13 +1,13 @@
-import "../../components/hui-action-editor";
-import "../../../../components/ha-form/ha-form";
import { CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators";
import { array, assert, assign, object, optional, string } from "superstruct";
import { fireEvent } from "../../../../common/dom/fire_event";
+import "../../../../components/ha-form/ha-form";
import type { HaFormSchema } from "../../../../components/ha-form/types";
import type { ActionConfig } from "../../../../data/lovelace";
import type { HomeAssistant } from "../../../../types";
import type { PictureGlanceCardConfig } from "../../cards/types";
+import "../../components/hui-action-editor";
import "../../components/hui-entity-editor";
import type { EntityConfig } from "../../entity-rows/types";
import type { LovelaceCardEditor } from "../../types";
@@ -96,28 +96,26 @@ export class HuiPictureGlanceCardEditor
@value-changed=${this._valueChanged}
>