Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion src/panels/lovelace/cards/hui-picture-glance-card.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import "../components/hui-warning-element";

import { computeStateDisplay } from "../../../common/entity/compute_state_display";
import { DOMAINS_TOGGLE } from "../../../common/const";
import { LovelaceCard } from "../types";
import { LovelaceCard, LovelaceCardEditor } from "../types";
import { EntityConfig } from "../entity-rows/types";
import { HomeAssistant } from "../../../types";
import { longPress } from "../common/directives/long-press-directive";
Expand All @@ -35,6 +35,18 @@ const STATES_OFF = new Set(["closed", "locked", "not_home", "off"]);

@customElement("hui-picture-glance-card")
class HuiPictureGlanceCard extends LitElement implements LovelaceCard {
public static async getConfigElement(): Promise<LovelaceCardEditor> {
await import(/* webpackChunkName: "hui-picture-glance-card-editor" */ "../editor/config-elements/hui-picture-glance-card-editor");
return document.createElement("hui-picture-glance-card-editor");
}
public static getStubConfig(): object {
return {
image:
"https://www.home-assistant.io/images/merchandise/shirt-frontpage.png",
entities: [],
};
}

@property() public hass?: HomeAssistant;

@property() private _config?: PictureGlanceCardConfig;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ import "../../../../components/ha-switch";

import { processEditorEntities } from "../process-editor-entities";
import { struct } from "../../common/structs/struct";
import { EntitiesEditorEvent, EditorTarget } from "../types";
import {
EntitiesEditorEvent,
EditorTarget,
entitiesConfigStruct,
} from "../types";
import { HomeAssistant } from "../../../../types";
import { LovelaceCardEditor } from "../../types";
import { fireEvent } from "../../../../common/dom/fire_event";
Expand All @@ -28,15 +32,6 @@ import {
EntitiesCardEntityConfig,
} from "../../cards/types";

const entitiesConfigStruct = struct.union([
{
entity: "entity-id",
name: "string?",
icon: "icon?",
},
"entity-id",
]);

const cardConfigStruct = struct({
type: "string",
title: "string|number?",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,17 @@ import "../../../../components/ha-switch";

import { struct } from "../../common/structs/struct";
import { processEditorEntities } from "../process-editor-entities";
import { EntitiesEditorEvent, EditorTarget } from "../types";
import {
EntitiesEditorEvent,
EditorTarget,
entitiesConfigStruct,
} from "../types";
import { HomeAssistant } from "../../../../types";
import { LovelaceCardEditor } from "../../types";
import { fireEvent } from "../../../../common/dom/fire_event";
import { configElementStyle } from "./config-elements-style";
import { GlanceCardConfig, ConfigEntity } from "../../cards/types";

const entitiesConfigStruct = struct.union([
{
entity: "entity-id",
name: "string?",
icon: "icon?",
},
"entity-id",
]);

const cardConfigStruct = struct({
type: "string",
title: "string|number?",
Expand Down
15 changes: 5 additions & 10 deletions src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import "../../components/hui-entity-editor";
import "../../components/hui-input-list-editor";

import { struct } from "../../common/structs/struct";
import { EntitiesEditorEvent, EditorTarget } from "../types";
import {
EntitiesEditorEvent,
EditorTarget,
entitiesConfigStruct,
} from "../types";
import { HomeAssistant } from "../../../../types";
import { LovelaceCardEditor } from "../../types";
import { fireEvent } from "../../../../common/dom/fire_event";
Expand All @@ -23,15 +27,6 @@ import { EntityConfig } from "../../entity-rows/types";
import { PolymerChangedEvent } from "../../../../polymer-types";
import { MapCardConfig } from "../../cards/types";

const entitiesConfigStruct = struct.union([
{
entity: "entity-id",
name: "string?",
icon: "icon?",
},
"entity-id",
]);

const cardConfigStruct = struct({
type: "string",
title: "string?",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,270 @@
import {
html,
LitElement,
TemplateResult,
customElement,
property,
} from "lit-element";
import "@polymer/paper-input/paper-input";
import "@polymer/paper-dropdown-menu/paper-dropdown-menu";
import "@polymer/paper-item/paper-item";
import "@polymer/paper-listbox/paper-listbox";

import "../../components/hui-action-editor";
import "../../components/hui-entity-editor";
import "../../../../components/entity/ha-entity-picker";

import { struct } from "../../common/structs/struct";
import {
EntitiesEditorEvent,
EditorTarget,
actionConfigStruct,
entitiesConfigStruct,
} from "../types";
import { HomeAssistant } from "../../../../types";
import { LovelaceCardEditor } from "../../types";
import { fireEvent } from "../../../../common/dom/fire_event";
import { configElementStyle } from "./config-elements-style";
import { ActionConfig } from "../../../../data/lovelace";
import { PictureGlanceCardConfig } from "../../cards/types";
import { EntityConfig } from "../../entity-rows/types";
import { processEditorEntities } from "../process-editor-entities";

const cardConfigStruct = struct({
type: "string",
title: "string?",
entity: "string?",
image: "string?",
camera_image: "string?",
camera_view: "string?",
aspect_ratio: "string?",
tap_action: struct.optional(actionConfigStruct),
hold_action: struct.optional(actionConfigStruct),
entities: [entitiesConfigStruct],
});

@customElement("hui-picture-glance-card-editor")
export class HuiPictureGlanceCardEditor extends LitElement
implements LovelaceCardEditor {
@property() public hass?: HomeAssistant;

@property() private _config?: PictureGlanceCardConfig;

@property() private _configEntities?: EntityConfig[];

public setConfig(config: PictureGlanceCardConfig): void {
config = cardConfigStruct(config);
this._config = config;
this._configEntities = processEditorEntities(config.entities);
}

get _entity(): string {
return this._config!.entity || "";
}

get _title(): string {
return this._config!.title || "";
}

get _image(): string {
return this._config!.image || this._camera_image
? ""
: "https://www.home-assistant.io/images/merchandise/shirt-frontpage.png";
}

get _camera_image(): string {
return this._config!.camera_image || "";
}

get _camera_view(): string {
return this._config!.camera_view || this._camera_image ? "auto" : "";
}

get _state_image(): {} {
return this._config!.state_image || {};
}

get _aspect_ratio(): string {
return this._config!.aspect_ratio || "";
}

get _tap_action(): ActionConfig {
return this._config!.tap_action || { action: "more-info" };
}

get _hold_action(): ActionConfig {
return this._config!.hold_action || { action: "more-info" };
}

get _show_name(): boolean {
return this._config!.show_name || false;
}

get _show_state(): boolean {
return this._config!.show_state || false;
}

protected render(): TemplateResult | void {
if (!this.hass) {
return html``;
}

const actions = ["more-info", "toggle", "navigate", "call-service", "none"];
Comment thread
iantrich marked this conversation as resolved.
const views = ["auto", "live"];

return html`
${configElementStyle}
<div class="card-config">
<paper-input
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.generic.title"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.config.optional"
)})"
.value="${this._title}"
.configValue="${"title"}"
@value-changed="${this._valueChanged}"
></paper-input>
<paper-input
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.generic.image"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.config.optional"
)})"
.value="${this._image}"
.configValue="${"image"}"
@value-changed="${this._valueChanged}"
></paper-input>
<ha-entity-picker
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.generic.camera_image"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.config.optional"
)})"
.hass="${this.hass}"
.value="${this._camera_image}"
.configValue=${"camera_image"}
@change="${this._valueChanged}"
allow-custom-entity
domain-filter="camera"
></ha-entity-picker>
<div class="side-by-side">
<paper-dropdown-menu
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.generic.camera_view"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.config.optional"
)})"
.configValue="${"camera_view"}"
@value-changed="${this._valueChanged}"
>
<paper-listbox
slot="dropdown-content"
.selected="${views.indexOf(this._camera_view)}"
>
${views.map((view) => {
return html`
<paper-item>${view}</paper-item>
`;
})}
</paper-listbox>
</paper-dropdown-menu>
<paper-input
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.generic.aspect_ratio"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.config.optional"
)})"
type="number"
.value="${Number(this._aspect_ratio.replace("%", ""))}"
.configValue="${"aspect_ratio"}"
@value-changed="${this._valueChanged}"
></paper-input>
</div>
<ha-entity-picker
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.generic.entity"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.config.optional"
)})"
.hass="${this.hass}"
.value="${this._entity}"
.configValue=${"entity"}
@change="${this._valueChanged}"
allow-custom-entity
></ha-entity-picker>
<div class="side-by-side">
<hui-action-editor
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.generic.tap_action"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.config.optional"
)})"
.hass="${this.hass}"
.config="${this._tap_action}"
.actions="${actions}"
.configValue="${"tap_action"}"
@action-changed="${this._valueChanged}"
></hui-action-editor>
<hui-action-editor
.label="${this.hass.localize(
"ui.panel.lovelace.editor.card.generic.hold_action"
)} (${this.hass.localize(
"ui.panel.lovelace.editor.card.config.optional"
)})"
.hass="${this.hass}"
.config="${this._hold_action}"
.actions="${actions}"
.configValue="${"hold_action"}"
@action-changed="${this._valueChanged}"
></hui-action-editor>
</div>
<hui-entity-editor
.hass="${this.hass}"
.entities="${this._configEntities}"
@entities-changed="${this._valueChanged}"
></hui-entity-editor>
</div>
`;
}

private _valueChanged(ev: EntitiesEditorEvent): void {
if (!this._config || !this.hass) {
return;
}
const target = ev.target! as EditorTarget;
let value = target.value;

if (target.configValue! === "aspect_ratio" && target.value) {
value += "%";
}

if (ev.detail && ev.detail.entities) {
this._config.entities = ev.detail.entities;
this._configEntities = processEditorEntities(this._config.entities);
} else if (target.configValue) {
if (
this[`_${target.configValue}`] === value ||
this[`_${target.configValue}`] === target.config
) {
return;
}

if (value === "") {
delete this._config[target.configValue!];
} else {
this._config = {
...this._config,
[target.configValue!]: value ? value : target.config,
};
}
}
fireEvent(this, "config-changed", { config: this._config });
}
}

declare global {
interface HTMLElementTagNameMap {
"hui-picture-glance-card-editor": HuiPictureGlanceCardEditor;
}
}
9 changes: 9 additions & 0 deletions src/panels/lovelace/editor/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,12 @@ export const actionConfigStruct = struct({
service: "string?",
service_data: "object?",
});

export const entitiesConfigStruct = struct.union([
{
entity: "entity-id",
name: "string?",
icon: "icon?",
},
"entity-id",
]);