Skip to content
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.

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

Card Picker with Previews of cards #4975

Merged
merged 26 commits into from Mar 3, 2020
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
75204f2
Card Picker with Previews of cards
zsarnett Feb 25, 2020
7c98bff
Getting Preview Async - Using dialogs entities
zsarnett Feb 25, 2020
4669819
Create generic getElement - filter entities before
zsarnett Feb 25, 2020
c34d5b2
lint
zsarnett Feb 25, 2020
994ff54
Add entities back to Picker. Set Qualifier
zsarnett Feb 25, 2020
5dc4415
Style Updates
zsarnett Feb 25, 2020
0dafdd8
Move setup of filtered cards to connected
zsarnett Feb 25, 2020
caec3d3
style updates
zsarnett Feb 25, 2020
ba0a775
Dont pull entities if noEntity config
zsarnett Feb 25, 2020
3210ee1
Move all config logic to getConfig
zsarnett Feb 25, 2020
9ee88ee
Style Update - Remove Manual process
zsarnett Feb 25, 2020
1e4a06a
Merge branch 'dev' into card-picker
zsarnett Feb 25, 2020
be3cf2b
lint
zsarnett Feb 25, 2020
c2e501f
Accounting for ll-rebuild for async cards
zsarnett Feb 26, 2020
9938f02
Style Updates - Use GetStubConfig for most
zsarnett Feb 27, 2020
1abc82d
Lint
zsarnett Feb 27, 2020
c527633
Filter entities with function - style - no preview
zsarnett Feb 27, 2020
cfbb9f2
Iframe rename and description
zsarnett Feb 27, 2020
5e1be9a
Move getstubconfig to helper - update spinner
zsarnett Feb 27, 2020
f511398
Style for themes
zsarnett Feb 27, 2020
76707e1
Move entities to be calc once
zsarnett Feb 29, 2020
b8981f4
Should update
zsarnett Mar 2, 2020
6dfab4f
Merge branch 'dev' into card-picker
zsarnett Mar 2, 2020
ca14e14
oops
zsarnett Mar 2, 2020
8234e10
TSC
zsarnett Mar 2, 2020
0a7fbd8
Comments
zsarnett Mar 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 23 additions & 2 deletions src/panels/lovelace/cards/hui-alarm-panel-card.ts
Expand Up @@ -24,6 +24,8 @@ import {
import { AlarmPanelCardConfig } from "./types";
import { PaperInputElement } from "@polymer/paper-input/paper-input";
import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
import { findEntities } from "../common/find-entites";
import { LovelaceConfig } from "../../../data/lovelace";

const ICONS = {
armed_away: "hass:shield-lock",
Expand All @@ -46,8 +48,27 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
return document.createElement("hui-alarm-panel-card-editor");
}

public static getStubConfig() {
return { states: ["arm_home", "arm_away"], entity: "" };
public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
) {
const includeDomains = ["alarm_control_panel"];
const maxEntities = 1;
const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill,
includeDomains
);

return {
states: ["arm_home", "arm_away"],
entity: foundEntities[0] || "",
};
}

@property() public hass?: HomeAssistant;
Expand Down
20 changes: 18 additions & 2 deletions src/panels/lovelace/cards/hui-button-card.ts
Expand Up @@ -30,9 +30,10 @@ import { ButtonCardConfig } from "./types";
import { actionHandler } from "../common/directives/action-handler-directive";
import { hasAction } from "../common/has-action";
import { handleAction } from "../common/handle-action";
import { ActionHandlerEvent } from "../../../data/lovelace";
import { ActionHandlerEvent, LovelaceConfig } from "../../../data/lovelace";
import { computeActiveState } from "../../../common/entity/compute_active_state";
import { iconColorCSS } from "../../../common/style/icon_color_css";
import { findEntities } from "../common/find-entites";

@customElement("hui-button-card")
export class HuiButtonCard extends LitElement implements LovelaceCard {
Expand All @@ -43,13 +44,28 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
return document.createElement("hui-button-card-editor");
}

public static getStubConfig(): object {
public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
): object {
const maxEntities = 1;
const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill
);

return {
tap_action: { action: "toggle" },
hold_action: { action: "more-info" },
show_icon: true,
show_name: true,
state_color: true,
entity: foundEntities[0] || "",
};
}

Expand Down
20 changes: 18 additions & 2 deletions src/panels/lovelace/cards/hui-entities-card.ts
Expand Up @@ -27,6 +27,8 @@ import { createHeaderFooterElement } from "../create-element/create-header-foote
import { LovelaceHeaderFooterConfig } from "../header-footer/types";
import { DOMAINS_TOGGLE } from "../../../common/const";
import { computeDomain } from "../../../common/entity/compute_domain";
import { LovelaceConfig } from "../../../data/lovelace";
import { findEntities } from "../common/find-entites";

@customElement("hui-entities-card")
class HuiEntitiesCard extends LitElement implements LovelaceCard {
Expand All @@ -37,8 +39,22 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
return document.createElement("hui-entities-card-editor");
}

public static getStubConfig(): object {
return { entities: [] };
public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
) {
const maxEntities = 3;
const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill
);

return { entities: foundEntities };
}

@property() private _config?: EntitiesCardConfig;
Expand Down
29 changes: 27 additions & 2 deletions src/panels/lovelace/cards/hui-gauge-card.ts
Expand Up @@ -22,6 +22,9 @@ import { fireEvent } from "../../../common/dom/fire_event";
import { hasConfigOrEntityChanged } from "../common/has-changed";
import { LovelaceCard, LovelaceCardEditor } from "../types";
import { GaugeCardConfig } from "./types";
import { LovelaceConfig } from "../../../data/lovelace";
import { findEntities } from "../common/find-entites";
import { HassEntity } from "home-assistant-js-websocket/dist/types";

export const severityMap = {
red: "var(--label-badge-red)",
Expand All @@ -38,8 +41,30 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
);
return document.createElement("hui-gauge-card-editor");
}
public static getStubConfig(): object {
return { entity: "" };

public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
): object {
const includeDomains = ["sensor"];
const maxEntities = 1;
const entityFilter = (stateObj: HassEntity): boolean => {
return !isNaN(Number(stateObj.state));
};

const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill,
includeDomains,
entityFilter
);

return { entity: foundEntities[0] || "" };
}

@property() public hass?: HomeAssistant;
Expand Down
23 changes: 20 additions & 3 deletions src/panels/lovelace/cards/hui-glance-card.ts
Expand Up @@ -27,10 +27,11 @@ import { processConfigEntities } from "../common/process-config-entities";
import { GlanceCardConfig, GlanceConfigEntity } from "./types";
import { actionHandler } from "../common/directives/action-handler-directive";
import { hasAction } from "../common/has-action";
import { ActionHandlerEvent } from "../../../data/lovelace";
import { ActionHandlerEvent, LovelaceConfig } from "../../../data/lovelace";
import { handleAction } from "../common/handle-action";
import { computeDomain } from "../../../common/entity/compute_domain";
import { UNAVAILABLE, UNKNOWN } from "../../../data/entity";
import { findEntities } from "../common/find-entites";

@customElement("hui-glance-card")
export class HuiGlanceCard extends LitElement implements LovelaceCard {
Expand All @@ -41,8 +42,24 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
return document.createElement("hui-glance-card-editor");
}

public static getStubConfig(): object {
return { entities: [] };
public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
): object {
const includeDomains = ["sensor"];
const maxEntities = 3;
const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill,
includeDomains
);

return { entities: foundEntities };
}

@property() public hass?: HomeAssistant;
Expand Down
22 changes: 20 additions & 2 deletions src/panels/lovelace/cards/hui-history-graph-card.ts
Expand Up @@ -20,6 +20,8 @@ import { HomeAssistant } from "../../../types";
import { HistoryGraphCardConfig } from "./types";
import { LovelaceCard } from "../types";
import { EntityConfig } from "../entity-rows/types";
import { LovelaceConfig } from "../../../data/lovelace";
import { findEntities } from "../common/find-entites";

@customElement("hui-history-graph-card")
export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
Expand All @@ -30,8 +32,24 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
return document.createElement("hui-history-graph-card-editor");
}

public static getStubConfig() {
return { entities: [] };
public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
): object {
const includeDomains = ["sensor"];
const maxEntities = 1;
const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill,
includeDomains
);

return { entities: foundEntities };
}

@property() public hass?: HomeAssistant;
Expand Down
23 changes: 21 additions & 2 deletions src/panels/lovelace/cards/hui-light-card.ts
Expand Up @@ -29,6 +29,8 @@ import { toggleEntity } from "../common/entity/toggle-entity";
import { LightCardConfig } from "./types";
import { supportsFeature } from "../../../common/entity/supports-feature";
import { SUPPORT_BRIGHTNESS } from "../../../data/light";
import { LovelaceConfig } from "../../../data/lovelace";
import { findEntities } from "../common/find-entites";
import { UNAVAILABLE } from "../../../data/entity";

@customElement("hui-light-card")
Expand All @@ -39,8 +41,25 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
);
return document.createElement("hui-light-card-editor");
}
public static getStubConfig(): object {
return { entity: "" };

public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
): object {
const includeDomains = ["light"];
const maxEntities = 1;
const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill,
includeDomains
);

return { entity: foundEntities[0] || "" };
}

@property() public hass?: HomeAssistant;
Expand Down
22 changes: 20 additions & 2 deletions src/panels/lovelace/cards/hui-map-card.ts
Expand Up @@ -30,6 +30,8 @@ import { EntityConfig } from "../entity-rows/types";
import { processConfigEntities } from "../common/process-config-entities";
import { MapCardConfig } from "./types";
import { classMap } from "lit-html/directives/class-map";
import { LovelaceConfig } from "../../../data/lovelace";
import { findEntities } from "../common/find-entites";

@customElement("hui-map-card")
class HuiMapCard extends LitElement implements LovelaceCard {
Expand All @@ -40,8 +42,24 @@ class HuiMapCard extends LitElement implements LovelaceCard {
return document.createElement("hui-map-card-editor");
}

public static getStubConfig() {
return { entities: [] };
public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
): object {
const includeDomains = ["device_tracker"];
const maxEntities = 2;
const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill,
includeDomains
);

return { entities: foundEntities };
}

@property() public hass?: HomeAssistant;
Expand Down
22 changes: 20 additions & 2 deletions src/panels/lovelace/cards/hui-media-control-card.ts
Expand Up @@ -34,6 +34,8 @@ import { LovelaceCard, LovelaceCardEditor } from "../types";
import { fireEvent } from "../../../common/dom/fire_event";
import { MediaControlCardConfig } from "./types";
import { UNAVAILABLE } from "../../../data/entity";
import { LovelaceConfig } from "../../../data/lovelace";
import { findEntities } from "../common/find-entites";

@customElement("hui-media-control-card")
export class HuiMediaControlCard extends LitElement implements LovelaceCard {
Expand All @@ -44,8 +46,24 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
return document.createElement("hui-media-control-card-editor");
}

public static getStubConfig(): object {
return { entity: "" };
public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
): object {
const includeDomains = ["media_player"];
const maxEntities = 1;
const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill,
includeDomains
);

return { entity: foundEntities[0] || "" };
}

@property() public hass?: HomeAssistant;
Expand Down
30 changes: 30 additions & 0 deletions src/panels/lovelace/cards/hui-picture-elements-card.ts
Expand Up @@ -15,9 +15,39 @@ import { HomeAssistant } from "../../../types";
import { LovelaceElementConfig, LovelaceElement } from "../elements/types";
import { PictureElementsCardConfig } from "./types";
import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element";
import { LovelaceConfig } from "../../../data/lovelace";
import { findEntities } from "../common/find-entites";

@customElement("hui-picture-elements-card")
class HuiPictureElementsCard extends LitElement implements LovelaceCard {
public static getStubConfig(
hass: HomeAssistant,
lovelaceConfig: LovelaceConfig,
entities?: string[],
entitiesFill?: string[]
): object {
const maxEntities = 1;
const foundEntities = findEntities(
hass,
lovelaceConfig,
maxEntities,
entities,
entitiesFill
);

return {
elements: [
{
type: "state-badge",
entity: foundEntities[0] || "",
style: "position: absolute, transform: translate(-50%, -50%)",
},
],
image:
"https://www.home-assistant.io/images/merchandise/shirt-frontpage.png",
};
}

@property() private _config?: PictureElementsCardConfig;

private _hass?: HomeAssistant;
Expand Down