{
- if (changedProps.has("_deviceClass")) {
- const domain = computeDomain(this.entry.entity_id);
-
- if (domain === "number" && this._deviceClass) {
- const { units } = await getNumberDeviceClassConvertibleUnits(
- this.hass,
- this._deviceClass
- );
- this._numberDeviceClassConvertibleUnits = units;
- } else {
- this._numberDeviceClassConvertibleUnits = [];
- }
- if (domain === "sensor" && this._deviceClass) {
- const { units } = await getSensorDeviceClassConvertibleUnits(
- this.hass,
- this._deviceClass
- );
- this._sensorDeviceClassConvertibleUnits = units;
- } else {
- this._sensorDeviceClassConvertibleUnits = [];
- }
- }
- if (changedProps.has("_entityId")) {
- const domain = computeDomain(this.entry.entity_id);
-
- if (domain === "weather") {
- const { units } = await getWeatherConvertibleUnits(this.hass);
- this._weatherConvertibleUnits = units;
- } else {
- this._weatherConvertibleUnits = undefined;
- }
- }
- }
+ @query("entity-registry-settings-editor")
+ private _registryEditor?: EntityRegistrySettingsEditor;
protected render() {
- if (this.entry.entity_id !== this._origEntityId) {
- return nothing;
- }
const stateObj: HassEntity | undefined =
this.hass.states[this.entry.entity_id];
- const domain = computeDomain(this.entry.entity_id);
-
- const invalidDomainUpdate = computeDomain(this._entityId.trim()) !== domain;
-
- const defaultPrecision =
- this.entry.options?.sensor?.suggested_display_precision ?? undefined;
+ const device = this.entry.device_id
+ ? this.hass.devices[this.entry.device_id]
+ : undefined;
return html`
${!stateObj
? html`
- ${this._device?.disabled_by
+ ${device?.disabled_by
? html`${this.hass!.localize(
"ui.dialogs.entity_registry.editor.device_disabled"
)}${this._error}`
: ""}
-
-
- ${this._deviceClassOptions
- ? html`
-
-
- ${this._deviceClassesSorted(
- domain,
- this._deviceClassOptions[0],
- this.hass.localize
- ).map(
- (entry) => html`
-
- ${entry.label}
-
- `
- )}
- ${this._deviceClassOptions[0].length &&
- this._deviceClassOptions[1].length
- ? html``
- : ""}
- ${this._deviceClassesSorted(
- domain,
- this._deviceClassOptions[1],
- this.hass.localize
- ).map(
- (entry) => html`
-
- ${entry.label}
-
- `
- )}
-
- `
- : ""}
- ${domain === "number" &&
- this._deviceClass &&
- stateObj?.attributes.unit_of_measurement &&
- this._numberDeviceClassConvertibleUnits?.includes(
- stateObj?.attributes.unit_of_measurement
- )
- ? html`
-
- ${this._numberDeviceClassConvertibleUnits.map(
- (unit: string) => html`
- ${unit}
- `
- )}
-
- `
- : ""}
- ${domain === "sensor" &&
- this._deviceClass &&
- stateObj?.attributes.unit_of_measurement &&
- this._sensorDeviceClassConvertibleUnits?.includes(
- stateObj?.attributes.unit_of_measurement
- )
- ? html`
-
- ${this._sensorDeviceClassConvertibleUnits.map(
- (unit: string) => html`
- ${unit}
- `
- )}
-
- `
- : ""}
- ${domain === "sensor" &&
- // Allow customizing the precision for a sensor with numerical device class,
- // a unit of measurement or state class
- ((this._deviceClass &&
- !["date", "enum", "timestamp"].includes(this._deviceClass)) ||
- stateObj?.attributes.unit_of_measurement ||
- stateObj?.attributes.state_class)
- ? html`
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.precision_default",
- {
- value: this.precisionLabel(
- defaultPrecision,
- stateObj?.state
- ),
- }
- )}
- ${PRECISIONS.map(
- (precision) => html`
-
- ${this.precisionLabel(precision, stateObj?.state)}
-
- `
- )}
-
- `
- : ""}
- ${domain === "weather"
- ? html`
-
- ${this._weatherConvertibleUnits?.precipitation_unit.map(
- (unit: string) => html`
- ${unit}
- `
- )}
-
-
- ${this._weatherConvertibleUnits?.pressure_unit.map(
- (unit: string) => html`
- ${unit}
- `
- )}
-
-
- ${this._weatherConvertibleUnits?.temperature_unit.map(
- (unit: string) => html`
- ${unit}
- `
- )}
-
-
- ${this._weatherConvertibleUnits?.visibility_unit.map(
- (unit: string) => html`
- ${unit}
- `
- )}
-
-
- ${this._weatherConvertibleUnits?.wind_speed_unit.map(
- (unit: string) => html`
- ${unit}
- `
- )}
-
- `
- : ""}
- ${domain === "switch"
- ? html`
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.device_classes.switch.switch"
- )}
-
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.device_classes.switch.outlet"
- )}
-
-
- ${this._switchAsDomainsSorted(
- SWITCH_AS_DOMAINS,
- this.hass.localize
- ).map(
- (entry) => html`
-
- ${entry.label}
-
- `
- )}
- `
- : ""}
- ${this._helperConfigEntry && this._helperConfigEntry.supports_options
- ? html`
-
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.configure_state",
- "integration",
- domainToName(
- this.hass.localize,
- this._helperConfigEntry.domain
- )
- )}
-
-
- `
- : ""}
-
- ${!this.entry.device_id
- ? html`
`
- : ""}
-
- 0} hasMeta>
- Voice assistants
-
- ${this.entry.aliases.length
- ? [...this.entry.aliases]
- .sort((a, b) =>
- stringCompare(a, b, this.hass.locale.language)
- )
- .join(", ")
- : this.hass.localize(
- "ui.dialogs.entity_registry.editor.no_aliases"
- )}
-
-
-
-
- ${this._cameraPrefs
- ? html`
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.stream.preload_stream"
- )}
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.stream.preload_stream_description"
- )}
-
-
-
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.stream.stream_orientation"
- )}
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.stream.stream_orientation_description"
- )}
-
- ${CAMERA_ORIENTATIONS.map((num) => {
- const localizeStr =
- "ui.dialogs.entity_registry.editor.stream.stream_orientation_" +
- num.toString();
- return html`
-
- ${this.hass.localize(localizeStr as LocalizeKeys)}
-
- `;
- })}
-
-
- `
- : ""}
-
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.entity_status"
- )}
-
-
- ${this._disabledBy &&
- this._disabledBy !== "user" &&
- this._disabledBy !== "integration"
- ? this.hass.localize(
- "ui.dialogs.entity_registry.editor.enabled_cause",
- "cause",
- this.hass.localize(
- `config_entry.disabled_by.${this._disabledBy}`
- )
- )
- : ""}
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${this._disabledBy !== null
- ? html`
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.enabled_description"
- )}
-
- `
- : this._hiddenBy !== null
- ? html`
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.hidden_description"
- )}
-
- `
- : ""}
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.aliases_description"
- )}
-
- ${this.entry.device_id
- ? html`
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.change_area"
- )}
-
-
-
- ${this.hass.localize(
- "ui.dialogs.entity_registry.editor.area_note"
- )}
- ${this._device
- ? html`
-
- `
- : ""}
-
- `
- : ""}
-
+ @change=${this._entityRegistryChanged}
+ >
{
- await updateDeviceRegistryEntry(this.hass, this._device!.id, updates);
+ await updateDeviceRegistryEntry(this.hass, device.id, updates);
},
});
}
- private _handleVoiceAssistantsClicked() {
- showVoiceAssistantsView(this, "Voice assistants");
- }
-
private async _enableEntry() {
this._error = undefined;
this._submitting = true;
try {
const result = await updateEntityRegistryEntry(
this.hass!,
- this._origEntityId,
+ this.entry.entity_id,
{ disabled_by: null }
);
fireEvent(this, "entity-entry-updated", result.entity_entry);
@@ -1097,140 +163,14 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
private async _updateEntry(): Promise {
this._submitting = true;
-
- const parent = (this.getRootNode() as ShadowRoot).host as HTMLElement;
-
- const params: Partial = {
- name: this._name.trim() || null,
- icon: this._icon.trim() || null,
- area_id: this._areaId || null,
- new_entity_id: this._entityId.trim(),
- };
-
- // Only update device class if changed by user
- if (
- this._deviceClass !==
- (this.entry.device_class || this.entry.original_device_class)
- ) {
- params.device_class = this._deviceClass;
- }
-
- const stateObj: HassEntity | undefined =
- this.hass.states[this.entry.entity_id];
- const domain = computeDomain(this.entry.entity_id);
-
- if (
- this.entry.disabled_by !== this._disabledBy &&
- (this._disabledBy === null || this._disabledBy === "user")
- ) {
- params.disabled_by = this._disabledBy;
- }
- if (
- this.entry.hidden_by !== this._hiddenBy &&
- (this._hiddenBy === null || this._hiddenBy === "user")
- ) {
- params.hidden_by = this._hiddenBy;
- }
- if (
- (domain === "number" || domain === "sensor") &&
- stateObj?.attributes?.unit_of_measurement !== this._unit_of_measurement
- ) {
- params.options_domain = domain;
- params.options = this.entry.options?.[domain] || {};
- params.options.unit_of_measurement = this._unit_of_measurement;
- }
- if (
- domain === "sensor" &&
- this.entry.options?.[domain]?.display_precision !== this._precision
- ) {
- params.options_domain = domain;
- params.options = params.options || this.entry.options?.[domain] || {};
- (params.options as SensorEntityOptions).display_precision =
- this._precision;
- }
- if (
- domain === "weather" &&
- (stateObj?.attributes?.precipitation_unit !== this._precipitation_unit ||
- stateObj?.attributes?.pressure_unit !== this._pressure_unit ||
- stateObj?.attributes?.temperature_unit !== this._temperature_unit ||
- stateObj?.attributes?.visbility_unit !== this._visibility_unit ||
- stateObj?.attributes?.wind_speed_unit !== this._wind_speed_unit)
- ) {
- params.options_domain = "weather";
- params.options = {
- precipitation_unit: this._precipitation_unit,
- pressure_unit: this._pressure_unit,
- temperature_unit: this._temperature_unit,
- visibility_unit: this._visibility_unit,
- wind_speed_unit: this._wind_speed_unit,
- };
- }
try {
- const result = await updateEntityRegistryEntry(
- this.hass!,
- this._origEntityId,
- params
- );
- if (result.require_restart) {
- showAlertDialog(this, {
- text: this.hass.localize(
- "ui.dialogs.entity_registry.editor.enabled_restart_confirm"
- ),
- });
- }
- if (result.reload_delay) {
- showAlertDialog(this, {
- text: this.hass.localize(
- "ui.dialogs.entity_registry.editor.enabled_delay_confirm",
- "delay",
- result.reload_delay
- ),
- });
- }
- fireEvent(this as HTMLElement, "close-dialog");
+ await this._registryEditor!.updateEntry();
+ fireEvent(this, "close-dialog");
} catch (err: any) {
this._error = err.message || "Unknown error";
} finally {
this._submitting = false;
}
-
- if (this._switchAs !== "switch") {
- if (
- !(await showConfirmationDialog(this, {
- text: this.hass!.localize(
- "ui.dialogs.entity_registry.editor.switch_as_x_confirm",
- "domain",
- this._switchAs
- ),
- }))
- ) {
- return;
- }
- const configFlow = await createConfigFlow(this.hass, "switch_as_x");
- const result = (await handleConfigFlowStep(
- this.hass,
- configFlow.flow_id,
- {
- entity_id: this._entityId.trim(),
- target_domain: this._switchAs,
- }
- )) as DataEntryFlowStepCreateEntry;
- if (!result.result?.entry_id) {
- return;
- }
- const unsub = await this.hass.connection.subscribeEvents(() => {
- unsub();
- fetchEntityRegistry(this.hass.connection).then((entityRegistry) => {
- const entity = entityRegistry.find(
- (reg) => reg.config_entry_id === result.result!.entry_id
- );
- if (!entity) {
- return;
- }
- showMoreInfoDialog(parent, { entityId: entity.entity_id });
- });
- }, "entity_registry_updated");
- }
}
private async _confirmDeleteEntry(): Promise {
@@ -1250,7 +190,7 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
if (this._helperConfigEntry) {
await deleteConfigEntry(this.hass, this._helperConfigEntry.entry_id);
} else {
- await removeEntityRegistryEntry(this.hass!, this._origEntityId);
+ await removeEntityRegistryEntry(this.hass!, this.entry.entity_id);
}
fireEvent(this, "close-dialog");
} finally {
@@ -1258,36 +198,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
}
}
- private async _showOptionsFlow() {
- showOptionsFlowDialog(this, this._helperConfigEntry!, null);
- }
-
- private _switchAsDomainsSorted = memoizeOne(
- (domains: string[], localize: LocalizeFunc) =>
- domains
- .map((entry) => ({
- domain: entry,
- label: domainToName(localize, entry),
- }))
- .sort((a, b) =>
- stringCompare(a.label, b.label, this.hass.locale.language)
- )
- );
-
- private _deviceClassesSorted = memoizeOne(
- (domain: string, deviceClasses: string[], localize: LocalizeFunc) =>
- deviceClasses
- .map((entry) => ({
- deviceClass: entry,
- label: localize(
- `ui.dialogs.entity_registry.editor.device_classes.${domain}.${entry}`
- ),
- }))
- .sort((a, b) =>
- stringCompare(a.label, b.label, this.hass.locale.language)
- )
- );
-
static get styles(): CSSResultGroup {
return [
haStyle,
@@ -1301,61 +211,17 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
.buttons {
box-sizing: border-box;
display: flex;
- padding: 24px;
- padding-top: 16px;
+ padding: 8px 16px 8px 24px;
justify-content: space-between;
- padding-bottom: max(env(safe-area-inset-bottom), 24px);
+ padding-bottom: max(env(safe-area-inset-bottom), 8px);
background-color: var(--mdc-theme-surface, #fff);
border-top: 1px solid var(--divider-color);
position: sticky;
bottom: 0px;
}
- ha-select {
- width: 100%;
- margin: 8px 0;
- }
- ha-switch {
- margin-right: 16px;
- }
- ha-settings-row {
- padding: 0;
- }
- ha-settings-row ha-switch {
- margin-right: 0;
- }
- ha-textfield {
- display: block;
- margin: 8px 0;
- }
- ha-area-picker {
- margin: 8px 0;
- display: block;
- }
- .row {
- margin: 8px 0;
- color: var(--primary-text-color);
- display: flex;
- align-items: center;
- }
- .label {
- margin-top: 16px;
- }
- .secondary {
- margin: 8px 0;
- }
- li[divider] {
- border-bottom-color: var(--divider-color);
- }
ha-alert mwc-button {
width: max-content;
}
- .aliases {
- border-radius: 4px;
- margin-top: 4px;
- margin-bottom: 4px;
- --mdc-icon-button-size: 24px;
- overflow: hidden;
- }
`,
];
}
diff --git a/src/translations/en.json b/src/translations/en.json
index 788a3ac2ca..e847913eb1 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -1041,7 +1041,7 @@
"enabled_label": "Enabled",
"disabled_label": "Disabled",
"enabled_cause": "Cannot change status. Disabled by {cause}.",
- "hidden_label": "Hidden",
+ "visible_label": "Visible",
"hidden_cause": "Hidden by {cause}.",
"device_disabled": "The device of this entity is disabled.",
"entity_disabled": "This entity is disabled.",
@@ -1056,12 +1056,11 @@
"confirm_delete": "Are you sure you want to delete this entity?",
"update": "Update",
"note": "Note: This might not work yet with all integrations.",
- "advanced": "Advanced settings",
- "area": "Set entity area only",
- "area_note": "By default the entities of a device are in the same area as the device. If you change the area of this entity, it will no longer follow the area of the device.",
- "follow_device_area": "Follow device area",
- "change_device_area": "Change device area",
+ "use_device_area": "Use device area",
+ "change_device_settings": "You can {link} in the device settings",
+ "change_device_area_link": "change the device area",
"configure_state": "{integration} options",
+ "configure_state_secondary": "Specific options for {integration}",
"stream": {
"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.",
@@ -1076,10 +1075,7 @@
"stream_orientation_7": "Rotate right and flip",
"stream_orientation_8": "Rotate right"
},
- "aliases_section": "Aliases",
- "no_aliases": "No configured aliases",
- "configured_aliases": "{count} configured {count, plural,\n one {alias}\n other {aliases}\n}",
- "aliases_description": "Aliases are alternative names used in voice assistants to refer to this entity."
+ "no_aliases": "Configure aliases and expose settings for voice assistants"
}
},
"voice-settings": {