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
4 changes: 2 additions & 2 deletions src/panels/lovelace/cards/hui-conditional-card.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import computeCardSize from "../common/compute-card-size";
import createCardElement from "../common/create-card-element";
import { computeCardSize } from "../common/compute-card-size";
import { HomeAssistant } from "../../../types";
import { LovelaceCard, LovelaceConfig } from "../types";

Expand Down Expand Up @@ -72,7 +72,7 @@ class HuiConditionalCard extends HTMLElement implements LovelaceCard {
}

public getCardSize() {
return computeCardSize(this._card);
return computeCardSize(this._card!);
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/panels/lovelace/cards/hui-horizontal-stack-card.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { html } from "@polymer/lit-element";
import { TemplateResult } from "lit-html";

import computeCardSize from "../common/compute-card-size";

import { computeCardSize } from "../common/compute-card-size";
import { HuiStackCard } from "./hui-stack-card";

class HuiHorizontalStackCard extends HuiStackCard {
Expand Down
3 changes: 1 addition & 2 deletions src/panels/lovelace/cards/hui-vertical-stack-card.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { html } from "@polymer/lit-element";

import computeCardSize from "../common/compute-card-size";

import { computeCardSize } from "../common/compute-card-size";
import { HuiStackCard } from "./hui-stack-card";
import { TemplateResult } from "lit-html";

Expand Down
3 changes: 0 additions & 3 deletions src/panels/lovelace/common/compute-card-size.js

This file was deleted.

5 changes: 5 additions & 0 deletions src/panels/lovelace/common/compute-card-size.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { LovelaceCard } from "../types";

export const computeCardSize = (card: LovelaceCard): number => {
return typeof card.getCardSize === "function" ? card.getCardSize() : 1;
};
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { HassEntities, HassEntity } from "home-assistant-js-websocket";

import computeDomain from "../../../common/entity/compute_domain";

export default function computeNotifications(states) {
export const computeNotifications = (states: HassEntities): HassEntity[] => {
return Object.keys(states)
.filter((entityId) => computeDomain(entityId) === "configurator")
.map((entityId) => states[entityId]);
}
};
2 changes: 1 addition & 1 deletion src/panels/lovelace/hui-root.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import "../../components/ha-start-voice-button";
import "../../components/ha-icon";
import { loadModule, loadCSS, loadJS } from "../../common/dom/load_resource";
import { subscribeNotifications } from "../../data/ws-notifications";
import { computeNotifications } from "./common/compute-notifications";
import "./components/notifications/hui-notification-drawer";
import "./components/notifications/hui-notifications-button";
import "./hui-unused-entities";
import "./hui-view";
import debounce from "../../common/util/debounce";

import createCardElement from "./common/create-card-element";
import computeNotifications from "./common/compute-notifications";

// CSS and JS should only be imported once. Modules and HTML are safe.
const CSS_CACHE = {};
Expand Down
2 changes: 1 addition & 1 deletion src/panels/lovelace/hui-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "./components/hui-card-options.ts";
import applyThemesOnElement from "../../common/dom/apply_themes_on_element";

import createCardElement from "./common/create-card-element";
import computeCardSize from "./common/compute-card-size";
import { computeCardSize } from "./common/compute-card-size";

class HUIView extends PolymerElement {
static get template() {
Expand Down