Skip to content

Don't filter attributes when saving scene #4278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
balloob merged 4 commits into from
Nov 27, 2019
Merged

Don't filter attributes when saving scene #4278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a88b045
Add cover attributes to scene editor
bramkragten Nov 27, 2019
2f61a2f
Add more
bramkragten Nov 27, 2019
72e9245
Remove filtering of attributes
bramkragten Nov 27, 2019
b93108a
Update ha-scene-editor.ts
bramkragten Nov 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions src/data/scene.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,38 +18,6 @@ export const SCENE_IGNORED_DOMAINS = [
"zone",
];

export const SCENE_SAVED_ATTRIBUTES = {
light: [
"brightness",
"color_temp",
"effect",
"rgb_color",
"xy_color",
"hs_color",
],
media_player: [
"is_volume_muted",
"volume_level",
"sound_mode",
"source",
"media_content_id",
"media_content_type",
],
climate: [
"target_temperature",
"target_temperature_high",
"target_temperature_low",
"target_humidity",
"fan_mode",
"swing_mode",
"hvac_mode",
"preset_mode",
],
vacuum: ["cleaning_mode"],
fan: ["speed", "current_direction"],
water_heather: ["temperature", "operation_mode"],
};

export interface SceneEntity extends HassEntityBase {
attributes: HassEntityAttributeBase & { id?: string };
}
Expand Down
13 changes: 1 addition & 12 deletions src/panels/config/scene/ha-scene-editor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ import {
saveScene,
SCENE_IGNORED_DOMAINS,
SceneEntities,
SCENE_SAVED_ATTRIBUTES,
applyScene,
activateScene,
} from "../../../data/scene";
Expand Down Expand Up @@ -617,17 +616,7 @@ export class HaSceneEditor extends SubscribeMixin(LitElement) {
if (!stateObj) {
return;
}
const domain = computeDomain(entityId);
const attributes = {};
for (const attribute in stateObj.attributes) {
if (
SCENE_SAVED_ATTRIBUTES[domain] &&
SCENE_SAVED_ATTRIBUTES[domain].includes(attribute)
) {
attributes[attribute] = stateObj.attributes[attribute];
}
}
return { ...attributes, state: stateObj.state };
return { ...stateObj.attributes, state: stateObj.state };
}

private async _saveScene(): Promise<void> {
Expand Down