From 1f4d359050c5e4774985c12a9e29800e649ffc07 Mon Sep 17 00:00:00 2001 From: Ian Richardson Date: Mon, 23 Sep 2019 03:57:47 -0500 Subject: [PATCH] Replace all default exports in common/ with named exports (#3790) --- src/cards/ha-camera-card.js | 2 +- src/cards/ha-entities-card.js | 8 ++++---- src/cards/ha-history_graph-card.js | 2 +- src/cards/ha-media_player-card.js | 2 +- src/cards/ha-persistent_notification-card.js | 4 ++-- src/cards/ha-plant-card.js | 2 +- src/cards/ha-weather-card.js | 2 +- src/common/entity/attribute_class_names.ts | 6 +++--- src/common/entity/binary_sensor_icon.ts | 4 ++-- src/common/entity/can_toggle_domain.ts | 4 ++-- src/common/entity/can_toggle_state.ts | 11 ++++------- src/common/entity/compute_domain.ts | 4 ++-- src/common/entity/compute_object_id.ts | 4 ++-- src/common/entity/compute_state_display.ts | 4 ++-- src/common/entity/compute_state_domain.ts | 6 +++--- src/common/entity/compute_state_name.ts | 7 ++++--- src/common/entity/cover_icon.ts | 6 +++--- src/common/entity/domain_icon.ts | 4 ++-- src/common/entity/entity_filter.ts | 2 +- src/common/entity/extract_views.ts | 4 ++-- src/common/entity/feature_class_names.ts | 6 +++--- src/common/entity/get_group_entities.ts | 6 +++--- src/common/entity/get_view_entities.ts | 10 +++++----- src/common/entity/has_location.ts | 4 ++-- src/common/entity/input_dateteime_icon.ts | 6 +++--- src/common/entity/sensor_icon.ts | 6 +++--- src/common/entity/split_by_groups.ts | 6 +++--- src/common/entity/state_card_type.ts | 11 ++++------- src/common/entity/state_icon.ts | 17 ++++++++--------- src/common/entity/state_more_info_type.ts | 6 +++--- src/common/entity/states_sort_by_name.ts | 11 ++++------- src/common/entity/timer_time_remaining.ts | 4 ++-- src/components/entity/ha-entity-picker.ts | 2 +- src/components/entity/ha-entity-toggle.ts | 4 ++-- src/components/entity/ha-state-icon.js | 2 +- src/components/entity/ha-state-label-badge.ts | 10 +++++----- src/components/entity/state-badge.ts | 4 ++-- src/components/entity/state-info.js | 2 +- src/components/ha-camera-stream.ts | 2 +- src/components/ha-cards.js | 6 +++--- src/components/ha-menu-button.ts | 2 +- src/components/ha-sidebar.ts | 2 +- src/data/device_automation.ts | 8 ++++---- src/data/entity_registry.ts | 2 +- src/data/history.ts | 6 +++--- src/data/script.ts | 2 +- src/dialogs/ha-more-info-dialog.js | 2 +- .../more-info/controls/more-info-content.ts | 2 +- .../more-info/controls/more-info-cover.js | 8 ++++---- src/dialogs/more-info/controls/more-info-fan.js | 2 +- .../more-info/controls/more-info-group.js | 2 +- .../controls/more-info-input_datetime.js | 2 +- .../more-info/controls/more-info-light.js | 2 +- .../controls/more-info-media_player.js | 2 +- .../controls/more-info-water_heater.js | 2 +- src/dialogs/more-info/more-info-controls.js | 4 ++-- src/dialogs/more-info/more-info-settings.js | 4 ++-- .../notifications/notification-drawer.js | 2 +- .../config/automation/ha-automation-editor.ts | 2 +- .../config/automation/ha-automation-picker.ts | 2 +- .../config/automation/ha-config-automation.js | 2 +- src/panels/config/cloud/alexa/cloud-alexa.ts | 4 ++-- .../google-assistant/cloud-google-assistant.ts | 4 ++-- .../config/customize/ha-config-customize.js | 8 ++++---- .../config/customize/ha-form-customize.js | 2 +- .../devices/ha-config-devices-dashboard.ts | 2 +- src/panels/config/devices/ha-device-card.js | 2 +- .../dialog-entity-registry-detail.ts | 4 ++-- .../ha-config-entity-registry.ts | 6 +++--- src/panels/config/ha-entity-config.js | 2 +- .../integrations/ha-config-entries-dashboard.ts | 2 +- src/panels/config/js/condition/zone.tsx | 4 ++-- src/panels/config/js/trigger/zone.tsx | 4 ++-- src/panels/config/script/ha-config-script.js | 4 ++-- src/panels/config/script/ha-script-editor.js | 4 ++-- src/panels/config/script/ha-script-picker.ts | 2 +- src/panels/config/zha/zha-device-card.ts | 2 +- src/panels/config/zwave/ha-config-zwave.js | 10 +++++----- src/panels/config/zwave/zwave-groups.js | 2 +- src/panels/logbook/ha-logbook.js | 2 +- src/panels/lovelace/cards/hui-entities-card.ts | 2 +- .../lovelace/cards/hui-entity-button-card.ts | 8 ++++---- src/panels/lovelace/cards/hui-gauge-card.ts | 2 +- src/panels/lovelace/cards/hui-glance-card.ts | 4 ++-- .../lovelace/cards/hui-legacy-wrapper-card.js | 2 +- src/panels/lovelace/cards/hui-light-card.ts | 4 ++-- src/panels/lovelace/cards/hui-map-card.ts | 6 +++--- .../lovelace/cards/hui-picture-entity-card.ts | 6 +++--- .../lovelace/cards/hui-picture-glance-card.ts | 8 ++++---- .../lovelace/cards/hui-plant-status-card.ts | 2 +- src/panels/lovelace/cards/hui-sensor-card.ts | 4 ++-- .../lovelace/cards/hui-thermostat-card.ts | 2 +- .../lovelace/cards/hui-weather-forecast-card.ts | 2 +- src/panels/lovelace/common/compute-tooltip.ts | 2 +- .../common/entity/turn-on-off-entities.ts | 2 +- .../common/entity/turn-on-off-entity.ts | 2 +- .../lovelace/common/generate-lovelace-config.ts | 14 +++++++------- .../components/hui-generic-entity-row.ts | 2 +- .../unused-entities/hui-unused-entities.ts | 4 ++-- .../elements/hui-state-badge-element.ts | 2 +- .../elements/hui-state-label-element.ts | 2 +- .../entity-rows/hui-group-entity-row.ts | 3 +-- .../entity-rows/hui-input-select-entity-row.ts | 2 +- .../entity-rows/hui-sensor-entity-row.ts | 3 +-- .../lovelace/entity-rows/hui-text-entity-row.ts | 3 +-- .../entity-rows/hui-timer-entity-row.ts | 2 +- .../entity-rows/hui-toggle-entity-row.ts | 3 +-- src/panels/map/ha-panel-map.js | 4 ++-- src/panels/states/ha-panel-states.js | 8 ++++---- src/state-summary/state-card-content.js | 2 +- src/state-summary/state-card-display.js | 5 +++-- src/state-summary/state-card-input_select.ts | 2 +- src/state-summary/state-card-timer.js | 2 +- src/state-summary/state-card-weblink.js | 2 +- .../common/entity/attribute_class_names_test.ts | 3 +-- .../common/entity/can_toggle_domain_test.ts | 2 +- .../common/entity/can_toggle_state_test.ts | 2 +- test-mocha/common/entity/compute_domain.ts | 2 +- .../common/entity/compute_state_display.ts | 3 +-- .../common/entity/compute_state_domain.ts | 2 +- test-mocha/common/entity/extract_views.spec.ts | 2 +- .../common/entity/feature_class_names_test.ts | 2 +- .../common/entity/get_group_entities.spec.ts | 2 +- .../common/entity/get_view_entities.spec.ts | 2 +- test-mocha/common/entity/has_location.test.ts | 2 +- .../common/entity/split_by_groups.spec.ts | 2 +- .../common/entity/state_card_type_test.ts | 2 +- .../common/entity/state_more_info_type_test.ts | 2 +- .../common/entity/timer_time_remaining_test.ts | 2 +- 129 files changed, 243 insertions(+), 257 deletions(-) diff --git a/src/cards/ha-camera-card.js b/src/cards/ha-camera-card.js index feaa500075..5f90baf801 100644 --- a/src/cards/ha-camera-card.js +++ b/src/cards/ha-camera-card.js @@ -2,7 +2,7 @@ import "@polymer/paper-styles/element-styles/paper-material-styles"; import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; import { EventsMixin } from "../mixins/events-mixin"; import LocalizeMixin from "../mixins/localize-mixin"; import { fetchThumbnailUrlWithCache } from "../data/camera"; diff --git a/src/cards/ha-entities-card.js b/src/cards/ha-entities-card.js index d8215c29d2..ace243c427 100644 --- a/src/cards/ha-entities-card.js +++ b/src/cards/ha-entities-card.js @@ -6,10 +6,10 @@ import "../components/entity/ha-entity-toggle"; import "../components/ha-card"; import "../state-summary/state-card-content"; -import computeStateDomain from "../common/entity/compute_state_domain"; -import computeStateName from "../common/entity/compute_state_name"; -import stateMoreInfoType from "../common/entity/state_more_info_type"; -import canToggleState from "../common/entity/can_toggle_state"; +import { computeStateDomain } from "../common/entity/compute_state_domain"; +import { computeStateName } from "../common/entity/compute_state_name"; +import { stateMoreInfoType } from "../common/entity/state_more_info_type"; +import { canToggleState } from "../common/entity/can_toggle_state"; import { EventsMixin } from "../mixins/events-mixin"; import LocalizeMixin from "../mixins/localize-mixin"; diff --git a/src/cards/ha-history_graph-card.js b/src/cards/ha-history_graph-card.js index 5685c23515..c0f6e6d74f 100644 --- a/src/cards/ha-history_graph-card.js +++ b/src/cards/ha-history_graph-card.js @@ -5,7 +5,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../components/state-history-charts"; import "../data/ha-state-history-data"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; import { EventsMixin } from "../mixins/events-mixin"; /* diff --git a/src/cards/ha-media_player-card.js b/src/cards/ha-media_player-card.js index 5bbeef5c6e..4b69ef72cc 100644 --- a/src/cards/ha-media_player-card.js +++ b/src/cards/ha-media_player-card.js @@ -8,7 +8,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import HassMediaPlayerEntity from "../util/hass-media-player-model"; import { fetchMediaPlayerThumbnailWithCache } from "../data/media-player"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; import { EventsMixin } from "../mixins/events-mixin"; import LocalizeMixin from "../mixins/localize-mixin"; diff --git a/src/cards/ha-persistent_notification-card.js b/src/cards/ha-persistent_notification-card.js index 95cf52845f..446d5f2c28 100644 --- a/src/cards/ha-persistent_notification-card.js +++ b/src/cards/ha-persistent_notification-card.js @@ -5,9 +5,9 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../components/ha-card"; import "../components/ha-markdown"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; import LocalizeMixin from "../mixins/localize-mixin"; -import computeObjectId from "../common/entity/compute_object_id"; +import { computeObjectId } from "../common/entity/compute_object_id"; /* * @appliesMixin LocalizeMixin diff --git a/src/cards/ha-plant-card.js b/src/cards/ha-plant-card.js index e1e6a7b2ba..135f6f0378 100644 --- a/src/cards/ha-plant-card.js +++ b/src/cards/ha-plant-card.js @@ -4,7 +4,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../components/ha-card"; import "../components/ha-icon"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; import { EventsMixin } from "../mixins/events-mixin"; class HaPlantCard extends EventsMixin(PolymerElement) { diff --git a/src/cards/ha-weather-card.js b/src/cards/ha-weather-card.js index 52caa5afae..d187e3a5fe 100644 --- a/src/cards/ha-weather-card.js +++ b/src/cards/ha-weather-card.js @@ -1,7 +1,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; import "../components/ha-card"; import "../components/ha-icon"; diff --git a/src/common/entity/attribute_class_names.ts b/src/common/entity/attribute_class_names.ts index bf273870b8..34225bafb6 100644 --- a/src/common/entity/attribute_class_names.ts +++ b/src/common/entity/attribute_class_names.ts @@ -1,9 +1,9 @@ import { HassEntity } from "home-assistant-js-websocket"; -export default function attributeClassNames( +export const attributeClassNames = ( stateObj: HassEntity, attributes: string[] -): string { +): string => { if (!stateObj) { return ""; } @@ -13,4 +13,4 @@ export default function attributeClassNames( ) .filter((attr) => attr !== "") .join(" "); -} +}; diff --git a/src/common/entity/binary_sensor_icon.ts b/src/common/entity/binary_sensor_icon.ts index f5fa19fbc1..c1eb694afe 100644 --- a/src/common/entity/binary_sensor_icon.ts +++ b/src/common/entity/binary_sensor_icon.ts @@ -2,7 +2,7 @@ import { HassEntity } from "home-assistant-js-websocket"; /** Return an icon representing a binary sensor state. */ -export default function binarySensorIcon(state: HassEntity) { +export const binarySensorIcon = (state: HassEntity) => { const activated = state.state && state.state === "off"; switch (state.attributes.device_class) { case "battery": @@ -48,4 +48,4 @@ export default function binarySensorIcon(state: HassEntity) { default: return activated ? "hass:radiobox-blank" : "hass:checkbox-marked-circle"; } -} +}; diff --git a/src/common/entity/can_toggle_domain.ts b/src/common/entity/can_toggle_domain.ts index f1a0bc47b3..d1c4a08b7c 100644 --- a/src/common/entity/can_toggle_domain.ts +++ b/src/common/entity/can_toggle_domain.ts @@ -1,6 +1,6 @@ import { HomeAssistant } from "../../types"; -export default function canToggleDomain(hass: HomeAssistant, domain: string) { +export const canToggleDomain = (hass: HomeAssistant, domain: string) => { const services = hass.services[domain]; if (!services) { return false; @@ -13,4 +13,4 @@ export default function canToggleDomain(hass: HomeAssistant, domain: string) { return "open_cover" in services; } return "turn_on" in services; -} +}; diff --git a/src/common/entity/can_toggle_state.ts b/src/common/entity/can_toggle_state.ts index d990f363cb..8043833804 100644 --- a/src/common/entity/can_toggle_state.ts +++ b/src/common/entity/can_toggle_state.ts @@ -1,13 +1,10 @@ import { HassEntity } from "home-assistant-js-websocket"; -import canToggleDomain from "./can_toggle_domain"; -import computeStateDomain from "./compute_state_domain"; +import { canToggleDomain } from "./can_toggle_domain"; +import { computeStateDomain } from "./compute_state_domain"; import { HomeAssistant } from "../../types"; import { supportsFeature } from "./supports-feature"; -export default function canToggleState( - hass: HomeAssistant, - stateObj: HassEntity -) { +export const canToggleState = (hass: HomeAssistant, stateObj: HassEntity) => { const domain = computeStateDomain(stateObj); if (domain === "group") { return stateObj.state === "on" || stateObj.state === "off"; @@ -17,4 +14,4 @@ export default function canToggleState( } return canToggleDomain(hass, domain); -} +}; diff --git a/src/common/entity/compute_domain.ts b/src/common/entity/compute_domain.ts index 47eeb9e890..c09fbca1c4 100644 --- a/src/common/entity/compute_domain.ts +++ b/src/common/entity/compute_domain.ts @@ -1,3 +1,3 @@ -export default function computeDomain(entityId: string): string { +export const computeDomain = (entityId: string): string => { return entityId.substr(0, entityId.indexOf(".")); -} +}; diff --git a/src/common/entity/compute_object_id.ts b/src/common/entity/compute_object_id.ts index 865ab6254d..7a1ef1045c 100644 --- a/src/common/entity/compute_object_id.ts +++ b/src/common/entity/compute_object_id.ts @@ -1,4 +1,4 @@ /** Compute the object ID of a state. */ -export default function computeObjectId(entityId: string): string { +export const computeObjectId = (entityId: string): string => { return entityId.substr(entityId.indexOf(".") + 1); -} +}; diff --git a/src/common/entity/compute_state_display.ts b/src/common/entity/compute_state_display.ts index 4ca6fbae7e..62304f74e0 100644 --- a/src/common/entity/compute_state_display.ts +++ b/src/common/entity/compute_state_display.ts @@ -1,11 +1,11 @@ import { HassEntity } from "home-assistant-js-websocket"; -import computeStateDomain from "./compute_state_domain"; +import { computeStateDomain } from "./compute_state_domain"; import formatDateTime from "../datetime/format_date_time"; import formatDate from "../datetime/format_date"; import formatTime from "../datetime/format_time"; import { LocalizeFunc } from "../translations/localize"; -export default ( +export const computeStateDisplay = ( localize: LocalizeFunc, stateObj: HassEntity, language: string diff --git a/src/common/entity/compute_state_domain.ts b/src/common/entity/compute_state_domain.ts index 1ef02f4e8f..49f73ec656 100644 --- a/src/common/entity/compute_state_domain.ts +++ b/src/common/entity/compute_state_domain.ts @@ -1,6 +1,6 @@ import { HassEntity } from "home-assistant-js-websocket"; -import computeDomain from "./compute_domain"; +import { computeDomain } from "./compute_domain"; -export default function computeStateDomain(stateObj: HassEntity) { +export const computeStateDomain = (stateObj: HassEntity) => { return computeDomain(stateObj.entity_id); -} +}; diff --git a/src/common/entity/compute_state_name.ts b/src/common/entity/compute_state_name.ts index 57cf9bef45..ab0132100c 100644 --- a/src/common/entity/compute_state_name.ts +++ b/src/common/entity/compute_state_name.ts @@ -1,7 +1,8 @@ import { HassEntity } from "home-assistant-js-websocket"; -import computeObjectId from "./compute_object_id"; +import { computeObjectId } from "./compute_object_id"; -export default (stateObj: HassEntity): string => - stateObj.attributes.friendly_name === undefined +export const computeStateName = (stateObj: HassEntity): string => { + return stateObj.attributes.friendly_name === undefined ? computeObjectId(stateObj.entity_id).replace(/_/g, " ") : stateObj.attributes.friendly_name || ""; +}; diff --git a/src/common/entity/cover_icon.ts b/src/common/entity/cover_icon.ts index fa4c2eaff7..13eb5cd9de 100644 --- a/src/common/entity/cover_icon.ts +++ b/src/common/entity/cover_icon.ts @@ -1,8 +1,8 @@ /** Return an icon representing a cover state. */ import { HassEntity } from "home-assistant-js-websocket"; -import domainIcon from "./domain_icon"; +import { domainIcon } from "./domain_icon"; -export default function coverIcon(state: HassEntity): string { +export const coverIcon = (state: HassEntity): string => { const open = state.state !== "closed"; switch (state.attributes.device_class) { case "garage": @@ -18,4 +18,4 @@ export default function coverIcon(state: HassEntity): string { default: return domainIcon("cover", state.state); } -} +}; diff --git a/src/common/entity/domain_icon.ts b/src/common/entity/domain_icon.ts index 783fd1bb5c..3a1c5c720b 100644 --- a/src/common/entity/domain_icon.ts +++ b/src/common/entity/domain_icon.ts @@ -48,7 +48,7 @@ const fixedIcons = { weblink: "hass:open-in-new", }; -export default function domainIcon(domain: string, state?: string): string { +export const domainIcon = (domain: string, state?: string): string => { if (domain in fixedIcons) { return fixedIcons[domain]; } @@ -103,4 +103,4 @@ export default function domainIcon(domain: string, state?: string): string { ); return DEFAULT_DOMAIN_ICON; } -} +}; diff --git a/src/common/entity/entity_filter.ts b/src/common/entity/entity_filter.ts index 2b59721fe7..cd1309510b 100644 --- a/src/common/entity/entity_filter.ts +++ b/src/common/entity/entity_filter.ts @@ -1,4 +1,4 @@ -import computeDomain from "./compute_domain"; +import { computeDomain } from "./compute_domain"; export type FilterFunc = (entityId: string) => boolean; diff --git a/src/common/entity/extract_views.ts b/src/common/entity/extract_views.ts index d5679e5518..34965369ba 100644 --- a/src/common/entity/extract_views.ts +++ b/src/common/entity/extract_views.ts @@ -3,7 +3,7 @@ import { DEFAULT_VIEW_ENTITY_ID } from "../const"; import { GroupEntity } from "../../types"; // Return an ordered array of available views -export default function extractViews(entities: HassEntities): GroupEntity[] { +export const extractViews = (entities: HassEntities): GroupEntity[] => { const views: GroupEntity[] = []; Object.keys(entities).forEach((entityId) => { @@ -24,4 +24,4 @@ export default function extractViews(entities: HassEntities): GroupEntity[] { }); return views; -} +}; diff --git a/src/common/entity/feature_class_names.ts b/src/common/entity/feature_class_names.ts index 768e025a93..aaa9220c28 100644 --- a/src/common/entity/feature_class_names.ts +++ b/src/common/entity/feature_class_names.ts @@ -2,10 +2,10 @@ import { HassEntity } from "home-assistant-js-websocket"; import { supportsFeature } from "./supports-feature"; // Expects classNames to be an object mapping feature-bit -> className -export default function featureClassNames( +export const featureClassNames = ( stateObj: HassEntity, classNames: { [feature: number]: string } -) { +) => { if (!stateObj || !stateObj.attributes.supported_features) { return ""; } @@ -16,4 +16,4 @@ export default function featureClassNames( ) .filter((attr) => attr !== "") .join(" "); -} +}; diff --git a/src/common/entity/get_group_entities.ts b/src/common/entity/get_group_entities.ts index b77353e0c1..c411c8f1e8 100644 --- a/src/common/entity/get_group_entities.ts +++ b/src/common/entity/get_group_entities.ts @@ -1,10 +1,10 @@ import { HassEntities } from "home-assistant-js-websocket"; import { GroupEntity } from "../../types"; -export default function getGroupEntities( +export const getGroupEntities = ( entities: HassEntities, group: GroupEntity -) { +) => { const result = {}; group.attributes.entity_id.forEach((entityId) => { @@ -16,4 +16,4 @@ export default function getGroupEntities( }); return result; -} +}; diff --git a/src/common/entity/get_view_entities.ts b/src/common/entity/get_view_entities.ts index c3d249cfcd..ac7cb86e0b 100644 --- a/src/common/entity/get_view_entities.ts +++ b/src/common/entity/get_view_entities.ts @@ -1,14 +1,14 @@ import { HassEntities } from "home-assistant-js-websocket"; -import computeDomain from "./compute_domain"; -import getGroupEntities from "./get_group_entities"; +import { computeDomain } from "./compute_domain"; +import { getGroupEntities } from "./get_group_entities"; import { GroupEntity } from "../../types"; // Return an object containing all entities that the view will show // including embedded groups. -export default function getViewEntities( +export const getViewEntities = ( entities: HassEntities, view: GroupEntity -): HassEntities { +): HassEntities => { const viewEntities = {}; view.attributes.entity_id.forEach((entityId) => { @@ -32,4 +32,4 @@ export default function getViewEntities( }); return viewEntities; -} +}; diff --git a/src/common/entity/has_location.ts b/src/common/entity/has_location.ts index 5c290887bf..4ac76bfefe 100644 --- a/src/common/entity/has_location.ts +++ b/src/common/entity/has_location.ts @@ -1,7 +1,7 @@ import { HassEntity } from "home-assistant-js-websocket"; -export default function hasLocation(stateObj: HassEntity) { +export const hasLocation = (stateObj: HassEntity) => { return ( "latitude" in stateObj.attributes && "longitude" in stateObj.attributes ); -} +}; diff --git a/src/common/entity/input_dateteime_icon.ts b/src/common/entity/input_dateteime_icon.ts index 016b19cc48..870ecf80c3 100644 --- a/src/common/entity/input_dateteime_icon.ts +++ b/src/common/entity/input_dateteime_icon.ts @@ -1,8 +1,8 @@ /** Return an icon representing an input datetime state. */ -import domainIcon from "./domain_icon"; +import { domainIcon } from "./domain_icon"; import { HassEntity } from "home-assistant-js-websocket"; -export default function inputDateTimeIcon(state: HassEntity): string { +export const inputDateTimeIcon = (state: HassEntity): string => { if (!state.attributes.has_date) { return "hass:clock"; } @@ -10,4 +10,4 @@ export default function inputDateTimeIcon(state: HassEntity): string { return "hass:calendar"; } return domainIcon("input_datetime"); -} +}; diff --git a/src/common/entity/sensor_icon.ts b/src/common/entity/sensor_icon.ts index 3a04fa823c..32d7436d3b 100644 --- a/src/common/entity/sensor_icon.ts +++ b/src/common/entity/sensor_icon.ts @@ -1,7 +1,7 @@ /** Return an icon representing a sensor state. */ import { HassEntity } from "home-assistant-js-websocket"; import { UNIT_C, UNIT_F } from "../const"; -import domainIcon from "./domain_icon"; +import { domainIcon } from "./domain_icon"; const fixedDeviceClassIcons = { humidity: "hass:water-percent", @@ -12,7 +12,7 @@ const fixedDeviceClassIcons = { signal_strength: "hass:wifi", }; -export default function sensorIcon(state: HassEntity) { +export const sensorIcon = (state: HassEntity) => { const dclass = state.attributes.device_class; if (dclass && dclass in fixedDeviceClassIcons) { @@ -49,4 +49,4 @@ export default function sensorIcon(state: HassEntity) { return "hass:thermometer"; } return domainIcon("sensor"); -} +}; diff --git a/src/common/entity/split_by_groups.ts b/src/common/entity/split_by_groups.ts index aed1ab7f0e..72bf70bb50 100644 --- a/src/common/entity/split_by_groups.ts +++ b/src/common/entity/split_by_groups.ts @@ -1,11 +1,11 @@ -import computeDomain from "./compute_domain"; +import { computeDomain } from "./compute_domain"; import { HassEntities } from "home-assistant-js-websocket"; import { GroupEntity } from "../../types"; // Split a collection into a list of groups and a 'rest' list of ungrouped // entities. // Returns { groups: [], ungrouped: {} } -export default function splitByGroups(entities: HassEntities) { +export const splitByGroups = (entities: HassEntities) => { const groups: GroupEntity[] = []; const ungrouped: HassEntities = {}; @@ -26,4 +26,4 @@ export default function splitByGroups(entities: HassEntities) { ); return { groups, ungrouped }; -} +}; diff --git a/src/common/entity/state_card_type.ts b/src/common/entity/state_card_type.ts index 00f6b73b6a..f3b759be2c 100644 --- a/src/common/entity/state_card_type.ts +++ b/src/common/entity/state_card_type.ts @@ -1,13 +1,10 @@ import { HassEntity } from "home-assistant-js-websocket"; -import canToggleState from "./can_toggle_state"; -import computeStateDomain from "./compute_state_domain"; +import { canToggleState } from "./can_toggle_state"; +import { computeStateDomain } from "./compute_state_domain"; import { DOMAINS_WITH_CARD } from "../const"; import { HomeAssistant } from "../../types"; -export default function stateCardType( - hass: HomeAssistant, - stateObj: HassEntity -) { +export const stateCardType = (hass: HomeAssistant, stateObj: HassEntity) => { if (stateObj.state === "unavailable") { return "display"; } @@ -24,4 +21,4 @@ export default function stateCardType( return "toggle"; } return "display"; -} +}; diff --git a/src/common/entity/state_icon.ts b/src/common/entity/state_icon.ts index 351db86d12..aeb399e6c4 100644 --- a/src/common/entity/state_icon.ts +++ b/src/common/entity/state_icon.ts @@ -1,14 +1,13 @@ /** Return an icon representing a state. */ import { HassEntity } from "home-assistant-js-websocket"; import { DEFAULT_DOMAIN_ICON } from "../const"; +import { binarySensorIcon } from "./binary_sensor_icon"; -import computeDomain from "./compute_domain"; -import domainIcon from "./domain_icon"; - -import binarySensorIcon from "./binary_sensor_icon"; -import coverIcon from "./cover_icon"; -import sensorIcon from "./sensor_icon"; -import inputDateTimeIcon from "./input_dateteime_icon"; +import { computeDomain } from "./compute_domain"; +import { domainIcon } from "./domain_icon"; +import { coverIcon } from "./cover_icon"; +import { sensorIcon } from "./sensor_icon"; +import { inputDateTimeIcon } from "./input_dateteime_icon"; const domainIcons = { binary_sensor: binarySensorIcon, @@ -17,7 +16,7 @@ const domainIcons = { input_datetime: inputDateTimeIcon, }; -export default function stateIcon(state: HassEntity) { +export const stateIcon = (state: HassEntity) => { if (!state) { return DEFAULT_DOMAIN_ICON; } @@ -31,4 +30,4 @@ export default function stateIcon(state: HassEntity) { return domainIcons[domain](state); } return domainIcon(domain, state.state); -} +}; diff --git a/src/common/entity/state_more_info_type.ts b/src/common/entity/state_more_info_type.ts index dbdac2e198..028f4ed12e 100644 --- a/src/common/entity/state_more_info_type.ts +++ b/src/common/entity/state_more_info_type.ts @@ -1,8 +1,8 @@ import { HassEntity } from "home-assistant-js-websocket"; -import computeStateDomain from "./compute_state_domain"; +import { computeStateDomain } from "./compute_state_domain"; import { DOMAINS_HIDE_MORE_INFO, DOMAINS_WITH_MORE_INFO } from "../const"; -export default function stateMoreInfoType(stateObj: HassEntity) { +export const stateMoreInfoType = (stateObj: HassEntity) => { const domain = computeStateDomain(stateObj); if (DOMAINS_WITH_MORE_INFO.includes(domain)) { @@ -12,4 +12,4 @@ export default function stateMoreInfoType(stateObj: HassEntity) { return "hidden"; } return "default"; -} +}; diff --git a/src/common/entity/states_sort_by_name.ts b/src/common/entity/states_sort_by_name.ts index e7afcd0559..bb04b4a7b8 100644 --- a/src/common/entity/states_sort_by_name.ts +++ b/src/common/entity/states_sort_by_name.ts @@ -3,15 +3,12 @@ * * Usage: * const states = [state1, state2] - * states.sort(statesSortByName); + * states.sort(statessortStatesByName); */ import { HassEntity } from "home-assistant-js-websocket"; -import computeStateName from "./compute_state_name"; +import { computeStateName } from "./compute_state_name"; -export default function sortStatesByName( - entityA: HassEntity, - entityB: HassEntity -) { +export const sortStatesByName = (entityA: HassEntity, entityB: HassEntity) => { const nameA = computeStateName(entityA); const nameB = computeStateName(entityB); if (nameA < nameB) { @@ -21,4 +18,4 @@ export default function sortStatesByName( return 1; } return 0; -} +}; diff --git a/src/common/entity/timer_time_remaining.ts b/src/common/entity/timer_time_remaining.ts index 05e19a46bc..cd7c90ef8f 100644 --- a/src/common/entity/timer_time_remaining.ts +++ b/src/common/entity/timer_time_remaining.ts @@ -1,7 +1,7 @@ import { HassEntity } from "home-assistant-js-websocket"; import durationToSeconds from "../datetime/duration_to_seconds"; -export default function timerTimeRemaining(stateObj: HassEntity) { +export const timerTimeRemaining = (stateObj: HassEntity) => { let timeRemaining = durationToSeconds(stateObj.attributes.remaining); if (stateObj.state === "active") { @@ -11,4 +11,4 @@ export default function timerTimeRemaining(stateObj: HassEntity) { } return timeRemaining; -} +}; diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts index cc6945be6d..4c7593aa4e 100644 --- a/src/components/entity/ha-entity-picker.ts +++ b/src/components/entity/ha-entity-picker.ts @@ -7,7 +7,7 @@ import memoizeOne from "memoize-one"; import "./state-badge"; -import computeStateName from "../../common/entity/compute_state_name"; +import { computeStateName } from "../../common/entity/compute_state_name"; import { LitElement, TemplateResult, diff --git a/src/components/entity/ha-entity-toggle.ts b/src/components/entity/ha-entity-toggle.ts index f696341644..5a48bca525 100644 --- a/src/components/entity/ha-entity-toggle.ts +++ b/src/components/entity/ha-entity-toggle.ts @@ -14,8 +14,8 @@ import { HomeAssistant } from "../../types"; import { HassEntity } from "home-assistant-js-websocket"; import { forwardHaptic } from "../../data/haptics"; -import computeStateDomain from "../../common/entity/compute_state_domain"; -import computeStateName from "../../common/entity/compute_state_name"; +import { computeStateDomain } from "../../common/entity/compute_state_domain"; +import { computeStateName } from "../../common/entity/compute_state_name"; import "../ha-switch"; diff --git a/src/components/entity/ha-state-icon.js b/src/components/entity/ha-state-icon.js index 6bc389279f..33923171fc 100644 --- a/src/components/entity/ha-state-icon.js +++ b/src/components/entity/ha-state-icon.js @@ -2,7 +2,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../ha-icon"; -import stateIcon from "../../common/entity/state_icon"; +import { stateIcon } from "../../common/entity/state_icon"; class HaStateIcon extends PolymerElement { static get template() { diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts index 0361adfcfd..2d82e82095 100644 --- a/src/components/entity/ha-state-label-badge.ts +++ b/src/components/entity/ha-state-label-badge.ts @@ -14,11 +14,11 @@ import { classMap } from "lit-html/directives/class-map"; import { fireEvent } from "../../common/dom/fire_event"; import { HomeAssistant } from "../../types"; -import computeStateDomain from "../../common/entity/compute_state_domain"; -import computeStateName from "../../common/entity/compute_state_name"; -import domainIcon from "../../common/entity/domain_icon"; -import stateIcon from "../../common/entity/state_icon"; -import timerTimeRemaining from "../../common/entity/timer_time_remaining"; +import { computeStateDomain } from "../../common/entity/compute_state_domain"; +import { computeStateName } from "../../common/entity/compute_state_name"; +import { domainIcon } from "../../common/entity/domain_icon"; +import { stateIcon } from "../../common/entity/state_icon"; +import { timerTimeRemaining } from "../../common/entity/timer_time_remaining"; import secondsToDuration from "../../common/datetime/seconds_to_duration"; import "../ha-label-badge"; diff --git a/src/components/entity/state-badge.ts b/src/components/entity/state-badge.ts index dad1002550..f1ca755c4f 100644 --- a/src/components/entity/state-badge.ts +++ b/src/components/entity/state-badge.ts @@ -9,8 +9,8 @@ import { query, } from "lit-element"; import "../ha-icon"; -import computeStateDomain from "../../common/entity/compute_state_domain"; -import stateIcon from "../../common/entity/state_icon"; +import { computeStateDomain } from "../../common/entity/compute_state_domain"; +import { stateIcon } from "../../common/entity/state_icon"; import { HassEntity } from "home-assistant-js-websocket"; // Not duplicate, this is for typing. // tslint:disable-next-line diff --git a/src/components/entity/state-info.js b/src/components/entity/state-info.js index c9d5033a48..2bcc4700fa 100644 --- a/src/components/entity/state-info.js +++ b/src/components/entity/state-info.js @@ -3,7 +3,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../ha-relative-time"; import "./state-badge"; -import computeStateName from "../../common/entity/compute_state_name"; +import { computeStateName } from "../../common/entity/compute_state_name"; import { computeRTL } from "../../common/util/compute_rtl"; class StateInfo extends PolymerElement { diff --git a/src/components/ha-camera-stream.ts b/src/components/ha-camera-stream.ts index b4ee4247c7..e91b63cf8b 100644 --- a/src/components/ha-camera-stream.ts +++ b/src/components/ha-camera-stream.ts @@ -9,7 +9,7 @@ import { customElement, } from "lit-element"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; import { HomeAssistant, CameraEntity } from "../types"; import { fireEvent } from "../common/dom/fire_event"; import { diff --git a/src/components/ha-cards.js b/src/components/ha-cards.js index 1e94047d80..b794e31bdd 100644 --- a/src/components/ha-cards.js +++ b/src/components/ha-cards.js @@ -8,9 +8,9 @@ import "../cards/ha-badges-card"; import "../cards/ha-card-chooser"; import "./ha-demo-badge"; -import computeStateDomain from "../common/entity/compute_state_domain"; -import splitByGroups from "../common/entity/split_by_groups"; -import getGroupEntities from "../common/entity/get_group_entities"; +import { computeStateDomain } from "../common/entity/compute_state_domain"; +import { splitByGroups } from "../common/entity/split_by_groups"; +import { getGroupEntities } from "../common/entity/get_group_entities"; // mapping domain to size of the card. const DOMAINS_WITH_CARD = { diff --git a/src/components/ha-menu-button.ts b/src/components/ha-menu-button.ts index 721082155a..79efa6dec9 100644 --- a/src/components/ha-menu-button.ts +++ b/src/components/ha-menu-button.ts @@ -13,7 +13,7 @@ import { fireEvent } from "../common/dom/fire_event"; import { HomeAssistant } from "../types"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { subscribeNotifications } from "../data/persistent_notification"; -import computeDomain from "../common/entity/compute_domain"; +import { computeDomain } from "../common/entity/compute_domain"; @customElement("ha-menu-button") class HaMenuButton extends LitElement { diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts index 8385817ded..42a04cb1c1 100644 --- a/src/components/ha-sidebar.ts +++ b/src/components/ha-sidebar.ts @@ -27,7 +27,7 @@ import { PersistentNotification, subscribeNotifications, } from "../data/persistent_notification"; -import computeDomain from "../common/entity/compute_domain"; +import { computeDomain } from "../common/entity/compute_domain"; import { classMap } from "lit-html/directives/class-map"; // tslint:disable-next-line: no-duplicate-imports import { PaperIconItemElement } from "@polymer/paper-item/paper-icon-item"; diff --git a/src/data/device_automation.ts b/src/data/device_automation.ts index 0ff5581771..6939190f07 100644 --- a/src/data/device_automation.ts +++ b/src/data/device_automation.ts @@ -1,5 +1,5 @@ import { HomeAssistant } from "../types"; -import compute_state_name from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; export interface DeviceAutomation { device_id: string; @@ -69,7 +69,7 @@ export const localizeDeviceAutomationAction = ( return hass.localize( `component.${action.domain}.device_automation.action_type.${action.type}`, "entity_name", - state ? compute_state_name(state) : "", + state ? computeStateName(state) : "", "subtype", hass.localize( `component.${action.domain}.device_automation.action_subtype.${ @@ -91,7 +91,7 @@ export const localizeDeviceAutomationCondition = ( condition.type }`, "entity_name", - state ? compute_state_name(state) : "", + state ? computeStateName(state) : "", "subtype", hass.localize( `component.${condition.domain}.device_automation.condition_subtype.${ @@ -111,7 +111,7 @@ export const localizeDeviceAutomationTrigger = ( trigger.type }`, "entity_name", - state ? compute_state_name(state) : "", + state ? computeStateName(state) : "", "subtype", hass.localize( `component.${trigger.domain}.device_automation.trigger_subtype.${ diff --git a/src/data/entity_registry.ts b/src/data/entity_registry.ts index a3037e45cb..58fad95cf1 100644 --- a/src/data/entity_registry.ts +++ b/src/data/entity_registry.ts @@ -1,6 +1,6 @@ import { createCollection, Connection } from "home-assistant-js-websocket"; import { HomeAssistant } from "../types"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; import { debounce } from "../common/util/debounce"; export interface EntityRegistryEntry { diff --git a/src/data/history.ts b/src/data/history.ts index 0497658031..72a25dde92 100644 --- a/src/data/history.ts +++ b/src/data/history.ts @@ -1,9 +1,9 @@ -import computeStateName from "../common/entity/compute_state_name"; -import computeStateDomain from "../common/entity/compute_state_domain"; -import computeStateDisplay from "../common/entity/compute_state_display"; +import { computeStateName } from "../common/entity/compute_state_name"; +import { computeStateDomain } from "../common/entity/compute_state_domain"; import { HassEntity } from "home-assistant-js-websocket"; import { HomeAssistant } from "../types"; import { LocalizeFunc } from "../common/translations/localize"; +import { computeStateDisplay } from "../common/entity/compute_state_display"; const DOMAINS_USE_LAST_UPDATED = ["climate", "water_heater"]; const LINE_ATTRIBUTES_TO_KEEP = [ diff --git a/src/data/script.ts b/src/data/script.ts index 4cf4490bef..5eb2982f2f 100644 --- a/src/data/script.ts +++ b/src/data/script.ts @@ -1,5 +1,5 @@ import { HomeAssistant } from "../types"; -import computeObjectId from "../common/entity/compute_object_id"; +import { computeObjectId } from "../common/entity/compute_object_id"; export interface EventAction { event: string; diff --git a/src/dialogs/ha-more-info-dialog.js b/src/dialogs/ha-more-info-dialog.js index add05e52e1..131132c535 100644 --- a/src/dialogs/ha-more-info-dialog.js +++ b/src/dialogs/ha-more-info-dialog.js @@ -8,7 +8,7 @@ import "../resources/ha-style"; import "./more-info/more-info-controls"; import "./more-info/more-info-settings"; -import computeStateDomain from "../common/entity/compute_state_domain"; +import { computeStateDomain } from "../common/entity/compute_state_domain"; import isComponentLoaded from "../common/config/is_component_loaded"; import DialogMixin from "../mixins/dialog-mixin"; diff --git a/src/dialogs/more-info/controls/more-info-content.ts b/src/dialogs/more-info/controls/more-info-content.ts index 51dfab0c68..1d76bb1cc5 100644 --- a/src/dialogs/more-info/controls/more-info-content.ts +++ b/src/dialogs/more-info/controls/more-info-content.ts @@ -27,7 +27,7 @@ import "./more-info-vacuum"; import "./more-info-water_heater"; import "./more-info-weather"; -import stateMoreInfoType from "../../../common/entity/state_more_info_type"; +import { stateMoreInfoType } from "../../../common/entity/state_more_info_type"; import dynamicContentUpdater from "../../../common/dom/dynamic_content_updater"; import { HomeAssistant } from "../../../types"; diff --git a/src/dialogs/more-info/controls/more-info-cover.js b/src/dialogs/more-info/controls/more-info-cover.js index 56365d0245..f075583d91 100644 --- a/src/dialogs/more-info/controls/more-info-cover.js +++ b/src/dialogs/more-info/controls/more-info-cover.js @@ -5,13 +5,13 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../../../components/ha-cover-tilt-controls"; import "../../../components/ha-labeled-slider"; + import CoverEntity from "../../../util/cover-model"; - -import attributeClassNames from "../../../common/entity/attribute_class_names"; -import featureClassNames from "../../../common/entity/feature_class_names"; - +import { featureClassNames } from "../../../common/entity/feature_class_names"; import LocalizeMixin from "../../../mixins/localize-mixin"; +import { attributeClassNames } from "../../../common/entity/attribute_class_names"; + const FEATURE_CLASS_NAMES = { 128: "has-set_tilt_position", }; diff --git a/src/dialogs/more-info/controls/more-info-fan.js b/src/dialogs/more-info/controls/more-info-fan.js index f0ab3e512a..c27ac5bf26 100644 --- a/src/dialogs/more-info/controls/more-info-fan.js +++ b/src/dialogs/more-info/controls/more-info-fan.js @@ -10,8 +10,8 @@ import "../../../components/ha-paper-dropdown-menu"; import "../../../components/ha-switch"; import { EventsMixin } from "../../../mixins/events-mixin"; +import { attributeClassNames } from "../../../common/entity/attribute_class_names"; -import attributeClassNames from "../../../common/entity/attribute_class_names"; import LocalizeMixin from "../../../mixins/localize-mixin"; /* diff --git a/src/dialogs/more-info/controls/more-info-group.js b/src/dialogs/more-info/controls/more-info-group.js index f9f3632c84..81d2528b3c 100644 --- a/src/dialogs/more-info/controls/more-info-group.js +++ b/src/dialogs/more-info/controls/more-info-group.js @@ -4,7 +4,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../../../state-summary/state-card-content"; -import computeStateDomain from "../../../common/entity/compute_state_domain"; +import { computeStateDomain } from "../../../common/entity/compute_state_domain"; import dynamicContentUpdater from "../../../common/dom/dynamic_content_updater"; class MoreInfoGroup extends PolymerElement { diff --git a/src/dialogs/more-info/controls/more-info-input_datetime.js b/src/dialogs/more-info/controls/more-info-input_datetime.js index b8f6bc4260..fc16544b74 100644 --- a/src/dialogs/more-info/controls/more-info-input_datetime.js +++ b/src/dialogs/more-info/controls/more-info-input_datetime.js @@ -7,7 +7,7 @@ import "@vaadin/vaadin-date-picker/vaadin-date-picker"; import "../../../components/ha-relative-time"; import "../../../components/paper-time-input"; -import attributeClassNames from "../../../common/entity/attribute_class_names"; +import { attributeClassNames } from "../../../common/entity/attribute_class_names"; class DatetimeInput extends PolymerElement { static get template() { diff --git a/src/dialogs/more-info/controls/more-info-light.js b/src/dialogs/more-info/controls/more-info-light.js index cc8b762319..a280e38eef 100644 --- a/src/dialogs/more-info/controls/more-info-light.js +++ b/src/dialogs/more-info/controls/more-info-light.js @@ -10,7 +10,7 @@ import "../../../components/ha-color-picker"; import "../../../components/ha-labeled-slider"; import "../../../components/ha-paper-dropdown-menu"; -import featureClassNames from "../../../common/entity/feature_class_names"; +import { featureClassNames } from "../../../common/entity/feature_class_names"; import { EventsMixin } from "../../../mixins/events-mixin"; import LocalizeMixin from "../../../mixins/localize-mixin"; diff --git a/src/dialogs/more-info/controls/more-info-media_player.js b/src/dialogs/more-info/controls/more-info-media_player.js index 54d741fd22..b56cda1b06 100644 --- a/src/dialogs/more-info/controls/more-info-media_player.js +++ b/src/dialogs/more-info/controls/more-info-media_player.js @@ -10,7 +10,7 @@ import "../../../components/ha-paper-slider"; import "../../../components/ha-paper-dropdown-menu"; import HassMediaPlayerEntity from "../../../util/hass-media-player-model"; -import attributeClassNames from "../../../common/entity/attribute_class_names"; +import { attributeClassNames } from "../../../common/entity/attribute_class_names"; import isComponentLoaded from "../../../common/config/is_component_loaded"; import { EventsMixin } from "../../../mixins/events-mixin"; import LocalizeMixin from "../../../mixins/localize-mixin"; diff --git a/src/dialogs/more-info/controls/more-info-water_heater.js b/src/dialogs/more-info/controls/more-info-water_heater.js index b9e460e6f7..8438e59a3b 100644 --- a/src/dialogs/more-info/controls/more-info-water_heater.js +++ b/src/dialogs/more-info/controls/more-info-water_heater.js @@ -14,7 +14,7 @@ import "../../../components/ha-switch"; import { supportsFeature } from "../../../common/entity/supports-feature"; import { EventsMixin } from "../../../mixins/events-mixin"; -import featureClassNames from "../../../common/entity/feature_class_names"; +import { featureClassNames } from "../../../common/entity/feature_class_names"; import LocalizeMixin from "../../../mixins/localize-mixin"; /* diff --git a/src/dialogs/more-info/more-info-controls.js b/src/dialogs/more-info/more-info-controls.js index faf50be95a..2e280e5191 100644 --- a/src/dialogs/more-info/more-info-controls.js +++ b/src/dialogs/more-info/more-info-controls.js @@ -11,8 +11,8 @@ import "../../state-summary/state-card-content"; import "./controls/more-info-content"; -import computeStateName from "../../common/entity/compute_state_name"; -import computeStateDomain from "../../common/entity/compute_state_domain"; +import { computeStateName } from "../../common/entity/compute_state_name"; +import { computeStateDomain } from "../../common/entity/compute_state_domain"; import isComponentLoaded from "../../common/config/is_component_loaded"; import { DOMAINS_MORE_INFO_NO_HISTORY } from "../../common/const"; import { EventsMixin } from "../../mixins/events-mixin"; diff --git a/src/dialogs/more-info/more-info-settings.js b/src/dialogs/more-info/more-info-settings.js index c1a769cf7d..09e3014983 100644 --- a/src/dialogs/more-info/more-info-settings.js +++ b/src/dialogs/more-info/more-info-settings.js @@ -8,8 +8,8 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import { EventsMixin } from "../../mixins/events-mixin"; import LocalizeMixin from "../../mixins/localize-mixin"; -import computeStateName from "../../common/entity/compute_state_name"; -import computeDomain from "../../common/entity/compute_domain"; +import { computeStateName } from "../../common/entity/compute_state_name"; +import { computeDomain } from "../../common/entity/compute_domain"; import { updateEntityRegistryEntry } from "../../data/entity_registry"; import { showSaveSuccessToast } from "../../util/toast-saved-success"; diff --git a/src/dialogs/notifications/notification-drawer.js b/src/dialogs/notifications/notification-drawer.js index 9b0698ea9b..1b4d803fe4 100644 --- a/src/dialogs/notifications/notification-drawer.js +++ b/src/dialogs/notifications/notification-drawer.js @@ -12,7 +12,7 @@ import "../../components/ha-paper-icon-button-prev"; import { EventsMixin } from "../../mixins/events-mixin"; import LocalizeMixin from "../../mixins/localize-mixin"; import { subscribeNotifications } from "../../data/persistent_notification"; -import computeDomain from "../../common/entity/compute_domain"; +import { computeDomain } from "../../common/entity/compute_domain"; /* * @appliesMixin EventsMixin * @appliesMixin LocalizeMixin diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index 547f0219b7..c54c4d918c 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -20,7 +20,7 @@ import "../../../layouts/ha-app-layout"; import Automation from "../js/automation"; import unmountPreact from "../../../common/preact/unmount"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { haStyle } from "../../../resources/styles"; import { HomeAssistant } from "../../../types"; diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index 262e1e6c97..632f7fc9f8 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -19,7 +19,7 @@ import "../../../components/entity/ha-entity-toggle"; import "../ha-config-section"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { computeRTL } from "../../../common/util/compute_rtl"; import { haStyle } from "../../../resources/styles"; import { HomeAssistant } from "../../../types"; diff --git a/src/panels/config/automation/ha-config-automation.js b/src/panels/config/automation/ha-config-automation.js index 418d954562..f90282aa10 100644 --- a/src/panels/config/automation/ha-config-automation.js +++ b/src/panels/config/automation/ha-config-automation.js @@ -5,7 +5,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "./ha-automation-editor"; import "./ha-automation-picker"; -import computeStateDomain from "../../../common/entity/compute_state_domain"; +import { computeStateDomain } from "../../../common/entity/compute_state_domain"; class HaConfigAutomation extends PolymerElement { static get template() { diff --git a/src/panels/config/cloud/alexa/cloud-alexa.ts b/src/panels/config/cloud/alexa/cloud-alexa.ts index afdb072eae..f9a5cf8e40 100644 --- a/src/panels/config/cloud/alexa/cloud-alexa.ts +++ b/src/panels/config/cloud/alexa/cloud-alexa.ts @@ -35,8 +35,8 @@ import { AlexaEntity, fetchCloudAlexaEntities } from "../../../../data/alexa"; // tslint:disable-next-line: no-duplicate-imports import { HaSwitch } from "../../../../components/ha-switch"; -import computeStateName from "../../../../common/entity/compute_state_name"; -import computeDomain from "../../../../common/entity/compute_domain"; +import { computeStateName } from "../../../../common/entity/compute_state_name"; +import { computeDomain } from "../../../../common/entity/compute_domain"; const DEFAULT_CONFIG_EXPOSE = true; const IGNORE_INTERFACES = ["Alexa.EndpointHealth"]; diff --git a/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts b/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts index 08683dfb92..e15ff78815 100644 --- a/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts +++ b/src/panels/config/cloud/google-assistant/cloud-google-assistant.ts @@ -40,8 +40,8 @@ import { // tslint:disable-next-line: no-duplicate-imports import { HaSwitch } from "../../../../components/ha-switch"; -import computeStateName from "../../../../common/entity/compute_state_name"; -import computeDomain from "../../../../common/entity/compute_domain"; +import { computeStateName } from "../../../../common/entity/compute_state_name"; +import { computeDomain } from "../../../../common/entity/compute_domain"; const DEFAULT_CONFIG_EXPOSE = true; diff --git a/src/panels/config/customize/ha-config-customize.js b/src/panels/config/customize/ha-config-customize.js index 8eee9254f0..51a60b4909 100644 --- a/src/panels/config/customize/ha-config-customize.js +++ b/src/panels/config/customize/ha-config-customize.js @@ -12,9 +12,9 @@ import "../ha-config-section"; import "../ha-entity-config"; import "./ha-form-customize"; -import computeStateName from "../../../common/entity/compute_state_name"; -import computeStateDomain from "../../../common/entity/compute_state_domain"; -import sortByName from "../../../common/entity/states_sort_by_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; +import { computeStateDomain } from "../../../common/entity/compute_state_domain"; +import { sortStatesByName } from "../../../common/entity/states_sort_by_name"; import LocalizeMixin from "../../../mixins/localize-mixin"; /* @@ -93,7 +93,7 @@ class HaConfigCustomize extends LocalizeMixin(PolymerElement) { computeEntities(hass) { return Object.keys(hass.states) .map((key) => hass.states[key]) - .sort(sortByName); + .sort(sortStatesByName); } } customElements.define("ha-config-customize", HaConfigCustomize); diff --git a/src/panels/config/customize/ha-form-customize.js b/src/panels/config/customize/ha-form-customize.js index 865fcb1fda..17799f8415 100644 --- a/src/panels/config/customize/ha-form-customize.js +++ b/src/panels/config/customize/ha-form-customize.js @@ -7,7 +7,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import hassAttributeUtil from "../../../util/hass-attributes-util"; import "./ha-form-customize-attributes"; -import computeStateDomain from "../../../common/entity/compute_state_domain"; +import { computeStateDomain } from "../../../common/entity/compute_state_domain"; class HaFormCustomize extends PolymerElement { static get template() { diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts index a78239873e..37a3b01541 100644 --- a/src/panels/config/devices/ha-config-devices-dashboard.ts +++ b/src/panels/config/devices/ha-config-devices-dashboard.ts @@ -36,7 +36,7 @@ import { ConfigEntry } from "../../../data/config_entries"; import { AreaRegistryEntry } from "../../../data/area_registry"; import { navigate } from "../../../common/navigate"; import { LocalizeFunc } from "../../../common/translations/localize"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; interface DeviceRowData extends DeviceRegistryEntry { device?: DeviceRowData; diff --git a/src/panels/config/devices/ha-device-card.js b/src/panels/config/devices/ha-device-card.js index fe6a391dd7..f96783e2c1 100644 --- a/src/panels/config/devices/ha-device-card.js +++ b/src/panels/config/devices/ha-device-card.js @@ -11,7 +11,7 @@ import "../../../layouts/hass-subpage"; import { EventsMixin } from "../../../mixins/events-mixin"; import LocalizeMixin from "../../../mixins/localize-mixin"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import "../../../components/entity/state-badge"; import { compare } from "../../../common/string/compare"; import { diff --git a/src/panels/config/entity_registry/dialog-entity-registry-detail.ts b/src/panels/config/entity_registry/dialog-entity-registry-detail.ts index b1bbbd03b9..30da701f41 100644 --- a/src/panels/config/entity_registry/dialog-entity-registry-detail.ts +++ b/src/panels/config/entity_registry/dialog-entity-registry-detail.ts @@ -20,8 +20,8 @@ import { HassEntity } from "home-assistant-js-websocket"; // tslint:disable-next-line: no-duplicate-imports import { HaSwitch } from "../../../components/ha-switch"; -import computeDomain from "../../../common/entity/compute_domain"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeDomain } from "../../../common/entity/compute_domain"; +import { computeStateName } from "../../../common/entity/compute_state_name"; class DialogEntityRegistryDetail extends LitElement { @property() public hass!: HomeAssistant; diff --git a/src/panels/config/entity_registry/ha-config-entity-registry.ts b/src/panels/config/entity_registry/ha-config-entity-registry.ts index 8e5abfc3b8..d7d496dc89 100644 --- a/src/panels/config/entity_registry/ha-config-entity-registry.ts +++ b/src/panels/config/entity_registry/ha-config-entity-registry.ts @@ -21,9 +21,9 @@ import "../../../layouts/hass-subpage"; import "../../../layouts/hass-loading-screen"; import "../../../components/ha-card"; import "../../../components/ha-icon"; -import domainIcon from "../../../common/entity/domain_icon"; -import stateIcon from "../../../common/entity/state_icon"; -import computeDomain from "../../../common/entity/compute_domain"; +import { domainIcon } from "../../../common/entity/domain_icon"; +import { stateIcon } from "../../../common/entity/state_icon"; +import { computeDomain } from "../../../common/entity/compute_domain"; import "../ha-config-section"; import { showEntityRegistryDetailDialog, diff --git a/src/panels/config/ha-entity-config.js b/src/panels/config/ha-entity-config.js index 15661b5c62..c026143958 100644 --- a/src/panels/config/ha-entity-config.js +++ b/src/panels/config/ha-entity-config.js @@ -7,7 +7,7 @@ import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../../components/ha-card"; -import computeStateName from "../../common/entity/compute_state_name"; +import { computeStateName } from "../../common/entity/compute_state_name"; class HaEntityConfig extends PolymerElement { static get template() { diff --git a/src/panels/config/integrations/ha-config-entries-dashboard.ts b/src/panels/config/integrations/ha-config-entries-dashboard.ts index d15ae2c569..03a420d37a 100644 --- a/src/panels/config/integrations/ha-config-entries-dashboard.ts +++ b/src/panels/config/integrations/ha-config-entries-dashboard.ts @@ -18,7 +18,7 @@ import "../../../components/ha-icon"; import { computeRTL } from "../../../common/util/compute_rtl"; import "../ha-config-section"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { loadConfigFlowDialog, showConfigFlowDialog, diff --git a/src/panels/config/js/condition/zone.tsx b/src/panels/config/js/condition/zone.tsx index 4dc79962bc..5d8ba95431 100644 --- a/src/panels/config/js/condition/zone.tsx +++ b/src/panels/config/js/condition/zone.tsx @@ -1,7 +1,7 @@ import { h, Component } from "preact"; import "../../../../components/entity/ha-entity-picker"; -import hasLocation from "../../../../common/entity/has_location"; -import computeStateDomain from "../../../../common/entity/compute_state_domain"; +import { hasLocation } from "../../../../common/entity/has_location"; +import { computeStateDomain } from "../../../../common/entity/compute_state_domain"; function zoneAndLocationFilter(stateObj) { return hasLocation(stateObj) && computeStateDomain(stateObj) !== "zone"; diff --git a/src/panels/config/js/trigger/zone.tsx b/src/panels/config/js/trigger/zone.tsx index 392f61a137..f1c0520725 100644 --- a/src/panels/config/js/trigger/zone.tsx +++ b/src/panels/config/js/trigger/zone.tsx @@ -3,8 +3,8 @@ import "@polymer/paper-radio-button/paper-radio-button"; import "@polymer/paper-radio-group/paper-radio-group"; import "../../../../components/entity/ha-entity-picker"; -import hasLocation from "../../../../common/entity/has_location"; -import computeStateDomain from "../../../../common/entity/compute_state_domain"; +import { hasLocation } from "../../../../common/entity/has_location"; +import { computeStateDomain } from "../../../../common/entity/compute_state_domain"; function zoneAndLocationFilter(stateObj) { return hasLocation(stateObj) && computeStateDomain(stateObj) !== "zone"; diff --git a/src/panels/config/script/ha-config-script.js b/src/panels/config/script/ha-config-script.js index 88a1f0f1af..a0e7fcf1ed 100644 --- a/src/panels/config/script/ha-config-script.js +++ b/src/panels/config/script/ha-config-script.js @@ -5,8 +5,8 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "./ha-script-editor"; import "./ha-script-picker"; -import computeStateName from "../../../common/entity/compute_state_name"; -import computeStateDomain from "../../../common/entity/compute_state_domain"; +import { computeStateName } from "../../../common/entity/compute_state_name"; +import { computeStateDomain } from "../../../common/entity/compute_state_domain"; class HaConfigScript extends PolymerElement { static get template() { diff --git a/src/panels/config/script/ha-script-editor.js b/src/panels/config/script/ha-script-editor.js index 98bafc668e..8de26171b0 100644 --- a/src/panels/config/script/ha-script-editor.js +++ b/src/panels/config/script/ha-script-editor.js @@ -12,8 +12,8 @@ import "../../../components/ha-fab"; import Script from "../js/script"; import unmountPreact from "../../../common/preact/unmount"; -import computeObjectId from "../../../common/entity/compute_object_id"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeObjectId } from "../../../common/entity/compute_object_id"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import NavigateMixin from "../../../mixins/navigate-mixin"; import LocalizeMixin from "../../../mixins/localize-mixin"; diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index be4b30a862..e9bef2de42 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -20,7 +20,7 @@ import "../../../components/ha-fab"; import "../ha-config-section"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { haStyle } from "../../../resources/styles"; import { HomeAssistant } from "../../../types"; import { triggerScript } from "../../../data/script"; diff --git a/src/panels/config/zha/zha-device-card.ts b/src/panels/config/zha/zha-device-card.ts index 886fb6c2f4..bec3ef9c90 100644 --- a/src/panels/config/zha/zha-device-card.ts +++ b/src/panels/config/zha/zha-device-card.ts @@ -41,7 +41,7 @@ import { ItemSelectedEvent, NodeServiceData } from "./types"; import { navigate } from "../../../common/navigate"; import { UnsubscribeFunc, HassEvent } from "home-assistant-js-websocket"; import { formatAsPaddedHex } from "./functions"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; declare global { // for fire event diff --git a/src/panels/config/zwave/ha-config-zwave.js b/src/panels/config/zwave/ha-config-zwave.js index 440a2c901b..6169a54bdc 100644 --- a/src/panels/config/zwave/ha-config-zwave.js +++ b/src/panels/config/zwave/ha-config-zwave.js @@ -26,9 +26,9 @@ import "./zwave-usercodes"; import "./zwave-values"; import "./zwave-node-protection"; -import sortByName from "../../../common/entity/states_sort_by_name"; -import computeStateName from "../../../common/entity/compute_state_name"; -import computeStateDomain from "../../../common/entity/compute_state_domain"; +import { sortStatesByName } from "../../../common/entity/states_sort_by_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; +import { computeStateDomain } from "../../../common/entity/compute_state_domain"; import { EventsMixin } from "../../../mixins/events-mixin"; import LocalizeMixin from "../../../mixins/localize-mixin"; @@ -461,7 +461,7 @@ class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) { return Object.keys(hass.states) .map((key) => hass.states[key]) .filter((ent) => ent.entity_id.match("zwave[.]")) - .sort(sortByName); + .sort(sortStatesByName); } computeEntities(selectedNode) { @@ -481,7 +481,7 @@ class HaConfigZwave extends LocalizeMixin(EventsMixin(PolymerElement)) { !ent.entity_id.match("zwave[.]") ); }) - .sort(sortByName); + .sort(sortStatesByName); } selectedNodeChanged(selectedNode) { diff --git a/src/panels/config/zwave/zwave-groups.js b/src/panels/config/zwave/zwave-groups.js index 991b47db4c..5b67a07f3c 100644 --- a/src/panels/config/zwave/zwave-groups.js +++ b/src/panels/config/zwave/zwave-groups.js @@ -7,7 +7,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../../../components/buttons/ha-call-service-button"; import "../../../components/ha-card"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; class ZwaveGroups extends PolymerElement { static get template() { diff --git a/src/panels/logbook/ha-logbook.js b/src/panels/logbook/ha-logbook.js index 4322140249..5a173b13cc 100644 --- a/src/panels/logbook/ha-logbook.js +++ b/src/panels/logbook/ha-logbook.js @@ -6,7 +6,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import formatTime from "../../common/datetime/format_time"; import formatDate from "../../common/datetime/format_date"; import { EventsMixin } from "../../mixins/events-mixin"; -import domainIcon from "../../common/entity/domain_icon"; +import { domainIcon } from "../../common/entity/domain_icon"; import { computeRTL } from "../../common/util/compute_rtl"; /* diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts index c1d4825e20..15f5762029 100644 --- a/src/panels/lovelace/cards/hui-entities-card.ts +++ b/src/panels/lovelace/cards/hui-entities-card.ts @@ -21,7 +21,7 @@ import { processConfigEntities } from "../common/process-config-entities"; import { createRowElement } from "../common/create-row-element"; import { EntitiesCardConfig, EntitiesCardEntityConfig } from "./types"; -import computeDomain from "../../../common/entity/compute_domain"; +import { computeDomain } from "../../../common/entity/compute_domain"; import applyThemesOnElement from "../../../common/dom/apply_themes_on_element"; @customElement("hui-entities-card") diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts index 92b2177c39..1bcc93b11f 100644 --- a/src/panels/lovelace/cards/hui-entity-button-card.ts +++ b/src/panels/lovelace/cards/hui-entity-button-card.ts @@ -16,11 +16,11 @@ import "../../../components/ha-card"; import "../components/hui-warning"; import isValidEntityId from "../../../common/entity/valid_entity_id"; -import stateIcon from "../../../common/entity/state_icon"; -import computeStateDomain from "../../../common/entity/compute_state_domain"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { stateIcon } from "../../../common/entity/state_icon"; +import { computeStateDomain } from "../../../common/entity/compute_state_domain"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import applyThemesOnElement from "../../../common/dom/apply_themes_on_element"; -import computeDomain from "../../../common/entity/compute_domain"; +import { computeDomain } from "../../../common/entity/compute_domain"; import { HomeAssistant, LightEntity } from "../../../types"; import { LovelaceCard, LovelaceCardEditor } from "../types"; diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts index 25b00ddb61..cf00c29b04 100644 --- a/src/panels/lovelace/cards/hui-gauge-card.ts +++ b/src/panels/lovelace/cards/hui-gauge-card.ts @@ -15,7 +15,7 @@ import "../components/hui-warning"; import isValidEntityId from "../../../common/entity/valid_entity_id"; import applyThemesOnElement from "../../../common/dom/apply_themes_on_element"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { HomeAssistant } from "../../../types"; import { fireEvent } from "../../../common/dom/fire_event"; diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts index f33d00674a..067aa6df86 100644 --- a/src/panels/lovelace/cards/hui-glance-card.ts +++ b/src/panels/lovelace/cards/hui-glance-card.ts @@ -10,8 +10,7 @@ import { } from "lit-element"; import { classMap } from "lit-html/directives/class-map"; -import computeStateDisplay from "../../../common/entity/compute_state_display"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import applyThemesOnElement from "../../../common/dom/apply_themes_on_element"; import relativeTime from "../../../common/datetime/relative_time"; @@ -20,6 +19,7 @@ import "../../../components/ha-card"; import "../../../components/ha-icon"; import "../components/hui-warning-element"; +import { computeStateDisplay } from "../../../common/entity/compute_state_display"; import { HomeAssistant } from "../../../types"; import { LovelaceCard, LovelaceCardEditor } from "../types"; import { longPress } from "../common/directives/long-press-directive"; diff --git a/src/panels/lovelace/cards/hui-legacy-wrapper-card.js b/src/panels/lovelace/cards/hui-legacy-wrapper-card.js index c1b36d2e78..0bc35371bd 100644 --- a/src/panels/lovelace/cards/hui-legacy-wrapper-card.js +++ b/src/panels/lovelace/cards/hui-legacy-wrapper-card.js @@ -1,5 +1,5 @@ import { createErrorCardConfig } from "./hui-error-card"; -import computeDomain from "../../../common/entity/compute_domain"; +import { computeDomain } from "../../../common/entity/compute_domain"; export default class LegacyWrapperCard extends HTMLElement { constructor(tag, domain) { diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts index bb90cbef11..babb4f6004 100644 --- a/src/panels/lovelace/cards/hui-light-card.ts +++ b/src/panels/lovelace/cards/hui-light-card.ts @@ -9,8 +9,8 @@ import { import "@polymer/paper-icon-button/paper-icon-button"; import "@thomasloven/round-slider"; -import stateIcon from "../../../common/entity/state_icon"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { stateIcon } from "../../../common/entity/state_icon"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import applyThemesOnElement from "../../../common/dom/apply_themes_on_element"; import "../../../components/ha-card"; diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts index 2d706d4528..48153af8f8 100644 --- a/src/panels/lovelace/cards/hui-map-card.ts +++ b/src/panels/lovelace/cards/hui-map-card.ts @@ -18,11 +18,11 @@ import { createTileLayer, LeafletModuleType, } from "../../../common/dom/setup-leaflet-map"; -import computeStateDomain from "../../../common/entity/compute_state_domain"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateDomain } from "../../../common/entity/compute_state_domain"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { debounce } from "../../../common/util/debounce"; import parseAspectRatio from "../../../common/util/parse-aspect-ratio"; -import computeDomain from "../../../common/entity/compute_domain"; +import { computeDomain } from "../../../common/entity/compute_domain"; import { HomeAssistant } from "../../../types"; import { LovelaceCard } from "../types"; diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts index 9a0cdeb01c..e789f8c823 100644 --- a/src/panels/lovelace/cards/hui-picture-entity-card.ts +++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts @@ -14,10 +14,10 @@ import "../../../components/ha-card"; import "../components/hui-image"; import "../components/hui-warning"; -import computeDomain from "../../../common/entity/compute_domain"; -import computeStateDisplay from "../../../common/entity/compute_state_display"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeDomain } from "../../../common/entity/compute_domain"; +import { computeStateName } from "../../../common/entity/compute_state_name"; +import { computeStateDisplay } from "../../../common/entity/compute_state_display"; import { longPress } from "../common/directives/long-press-directive"; import { HomeAssistant } from "../../../types"; import { LovelaceCard, LovelaceCardEditor } from "../types"; diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts index a57978fdfc..c214baf333 100644 --- a/src/panels/lovelace/cards/hui-picture-glance-card.ts +++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts @@ -10,16 +10,16 @@ import { } from "lit-element"; import { classMap } from "lit-html/directives/class-map"; -import computeStateDisplay from "../../../common/entity/compute_state_display"; -import computeStateName from "../../../common/entity/compute_state_name"; -import computeDomain from "../../../common/entity/compute_domain"; -import stateIcon from "../../../common/entity/state_icon"; +import { computeStateName } from "../../../common/entity/compute_state_name"; +import { computeDomain } from "../../../common/entity/compute_domain"; +import { stateIcon } from "../../../common/entity/state_icon"; import "../../../components/ha-card"; import "../../../components/ha-icon"; import "../components/hui-image"; import "../components/hui-warning-element"; +import { computeStateDisplay } from "../../../common/entity/compute_state_display"; import { DOMAINS_TOGGLE } from "../../../common/const"; import { LovelaceCard } from "../types"; import { EntityConfig } from "../entity-rows/types"; diff --git a/src/panels/lovelace/cards/hui-plant-status-card.ts b/src/panels/lovelace/cards/hui-plant-status-card.ts index 239051374c..1134a351b5 100644 --- a/src/panels/lovelace/cards/hui-plant-status-card.ts +++ b/src/panels/lovelace/cards/hui-plant-status-card.ts @@ -13,7 +13,7 @@ import { HassEntity } from "home-assistant-js-websocket"; import "../../../components/ha-card"; import "../../../components/ha-icon"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { LovelaceCardEditor, LovelaceCard } from "../types"; import { HomeAssistant } from "../../../types"; diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts index 19da175597..c747334930 100644 --- a/src/panels/lovelace/cards/hui-sensor-card.ts +++ b/src/panels/lovelace/cards/hui-sensor-card.ts @@ -12,8 +12,8 @@ import { import "@polymer/paper-spinner/paper-spinner"; import applyThemesOnElement from "../../../common/dom/apply_themes_on_element"; -import computeStateName from "../../../common/entity/compute_state_name"; -import stateIcon from "../../../common/entity/state_icon"; +import { computeStateName } from "../../../common/entity/compute_state_name"; +import { stateIcon } from "../../../common/entity/state_icon"; import "../../../components/ha-card"; import "../../../components/ha-icon"; diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts index 9ca11ab80b..e593b93ee1 100644 --- a/src/panels/lovelace/cards/hui-thermostat-card.ts +++ b/src/panels/lovelace/cards/hui-thermostat-card.ts @@ -14,7 +14,7 @@ import "../../../components/ha-icon"; import "../components/hui-warning"; import applyThemesOnElement from "../../../common/dom/apply_themes_on_element"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { hasConfigOrEntityChanged } from "../common/has-changed"; import { HomeAssistant } from "../../../types"; diff --git a/src/panels/lovelace/cards/hui-weather-forecast-card.ts b/src/panels/lovelace/cards/hui-weather-forecast-card.ts index a251c92ab8..93f43609e1 100644 --- a/src/panels/lovelace/cards/hui-weather-forecast-card.ts +++ b/src/panels/lovelace/cards/hui-weather-forecast-card.ts @@ -13,7 +13,7 @@ import "../../../components/ha-card"; import "../components/hui-warning"; import isValidEntityId from "../../../common/entity/valid_entity_id"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { HomeAssistant } from "../../../types"; import { hasConfigOrEntityChanged } from "../common/has-changed"; diff --git a/src/panels/lovelace/common/compute-tooltip.ts b/src/panels/lovelace/common/compute-tooltip.ts index f2140227c3..6093fa2b79 100644 --- a/src/panels/lovelace/common/compute-tooltip.ts +++ b/src/panels/lovelace/common/compute-tooltip.ts @@ -1,4 +1,4 @@ -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { HomeAssistant } from "../../../types"; import { LovelaceElementConfig } from "../elements/types"; import { ActionConfig } from "../../../data/lovelace"; diff --git a/src/panels/lovelace/common/entity/turn-on-off-entities.ts b/src/panels/lovelace/common/entity/turn-on-off-entities.ts index 495413e9d9..1ad24203b2 100644 --- a/src/panels/lovelace/common/entity/turn-on-off-entities.ts +++ b/src/panels/lovelace/common/entity/turn-on-off-entities.ts @@ -1,4 +1,4 @@ -import computeDomain from "../../../../common/entity/compute_domain"; +import { computeDomain } from "../../../../common/entity/compute_domain"; import { STATES_OFF } from "../../../../common/const"; import { HomeAssistant } from "../../../../types"; diff --git a/src/panels/lovelace/common/entity/turn-on-off-entity.ts b/src/panels/lovelace/common/entity/turn-on-off-entity.ts index 8823438bf3..b7ffcbcc89 100644 --- a/src/panels/lovelace/common/entity/turn-on-off-entity.ts +++ b/src/panels/lovelace/common/entity/turn-on-off-entity.ts @@ -1,4 +1,4 @@ -import computeDomain from "../../../../common/entity/compute_domain"; +import { computeDomain } from "../../../../common/entity/compute_domain"; import { HomeAssistant } from "../../../../types"; export const turnOnOffEntity = ( diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts index fbd053bae8..de86979f83 100644 --- a/src/panels/lovelace/common/generate-lovelace-config.ts +++ b/src/panels/lovelace/common/generate-lovelace-config.ts @@ -10,13 +10,13 @@ import { HassConfig, } from "home-assistant-js-websocket"; -import extractViews from "../../../common/entity/extract_views"; -import getViewEntities from "../../../common/entity/get_view_entities"; -import computeStateName from "../../../common/entity/compute_state_name"; -import splitByGroups from "../../../common/entity/split_by_groups"; -import computeObjectId from "../../../common/entity/compute_object_id"; -import computeStateDomain from "../../../common/entity/compute_state_domain"; -import computeDomain from "../../../common/entity/compute_domain"; +import { extractViews } from "../../../common/entity/extract_views"; +import { getViewEntities } from "../../../common/entity/get_view_entities"; +import { computeStateName } from "../../../common/entity/compute_state_name"; +import { splitByGroups } from "../../../common/entity/split_by_groups"; +import { computeObjectId } from "../../../common/entity/compute_object_id"; +import { computeStateDomain } from "../../../common/entity/compute_state_domain"; +import { computeDomain } from "../../../common/entity/compute_domain"; import { EntityRowConfig, WeblinkConfig } from "../entity-rows/types"; import { LocalizeFunc } from "../../../common/translations/localize"; diff --git a/src/panels/lovelace/components/hui-generic-entity-row.ts b/src/panels/lovelace/components/hui-generic-entity-row.ts index 2245716652..f00e5f93d9 100644 --- a/src/panels/lovelace/components/hui-generic-entity-row.ts +++ b/src/panels/lovelace/components/hui-generic-entity-row.ts @@ -1,4 +1,4 @@ -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { LitElement, html, diff --git a/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts b/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts index cccf63a37a..25255be903 100644 --- a/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts +++ b/src/panels/lovelace/editor/unused-entities/hui-unused-entities.ts @@ -25,8 +25,8 @@ import { DataTabelColumnContainer, } from "../../../../components/ha-data-table"; -import computeStateName from "../../../../common/entity/compute_state_name"; -import computeDomain from "../../../../common/entity/compute_domain"; +import { computeStateName } from "../../../../common/entity/compute_state_name"; +import { computeDomain } from "../../../../common/entity/compute_domain"; import { computeRTL } from "../../../../common/util/compute_rtl"; import { computeUnusedEntities } from "../../common/compute-unused-entities"; diff --git a/src/panels/lovelace/elements/hui-state-badge-element.ts b/src/panels/lovelace/elements/hui-state-badge-element.ts index bb6a36b455..5102112bdb 100644 --- a/src/panels/lovelace/elements/hui-state-badge-element.ts +++ b/src/panels/lovelace/elements/hui-state-badge-element.ts @@ -10,7 +10,7 @@ import { import "../../../components/entity/ha-state-label-badge"; import "../components/hui-warning-element"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { LovelaceElement, StateBadgeElementConfig } from "./types"; import { HomeAssistant } from "../../../types"; import { hasConfigOrEntityChanged } from "../common/has-changed"; diff --git a/src/panels/lovelace/elements/hui-state-label-element.ts b/src/panels/lovelace/elements/hui-state-label-element.ts index 561e9a8588..b6389cb842 100644 --- a/src/panels/lovelace/elements/hui-state-label-element.ts +++ b/src/panels/lovelace/elements/hui-state-label-element.ts @@ -12,7 +12,7 @@ import { import "../../../components/entity/ha-state-label-badge"; import "../components/hui-warning-element"; -import computeStateDisplay from "../../../common/entity/compute_state_display"; +import { computeStateDisplay } from "../../../common/entity/compute_state_display"; import { computeTooltip } from "../common/compute-tooltip"; import { handleClick } from "../common/handle-click"; import { longPress } from "../common/directives/long-press-directive"; diff --git a/src/panels/lovelace/entity-rows/hui-group-entity-row.ts b/src/panels/lovelace/entity-rows/hui-group-entity-row.ts index ebc78cee83..4b47afd9ae 100644 --- a/src/panels/lovelace/entity-rows/hui-group-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-group-entity-row.ts @@ -11,8 +11,7 @@ import "../components/hui-generic-entity-row"; import "../../../components/entity/ha-entity-toggle"; import "../components/hui-warning"; -import computeStateDisplay from "../../../common/entity/compute_state_display"; - +import { computeStateDisplay } from "../../../common/entity/compute_state_display"; import { DOMAINS_TOGGLE } from "../../../common/const"; import { HomeAssistant } from "../../../types"; import { EntityRow, EntityConfig } from "./types"; diff --git a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts index cda3d1d66e..12abfa60ad 100644 --- a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts @@ -15,7 +15,7 @@ import "../../../components/ha-paper-dropdown-menu"; import "../../../components/entity/state-badge"; import "../components/hui-warning"; -import computeStateName from "../../../common/entity/compute_state_name"; +import { computeStateName } from "../../../common/entity/compute_state_name"; import { HomeAssistant, InputSelectEntity } from "../../../types"; import { EntityRow, EntityConfig } from "./types"; diff --git a/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts b/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts index 1f7907b773..e415f717c9 100644 --- a/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts @@ -16,8 +16,7 @@ import "../components/hui-warning"; import { HomeAssistant } from "../../../types"; import { EntityRow, EntityConfig } from "./types"; import { hasConfigOrEntityChanged } from "../common/has-changed"; - -import computeStateDisplay from "../../../common/entity/compute_state_display"; +import { computeStateDisplay } from "../../../common/entity/compute_state_display"; interface SensorEntityConfig extends EntityConfig { format?: "relative" | "date" | "time" | "datetime"; diff --git a/src/panels/lovelace/entity-rows/hui-text-entity-row.ts b/src/panels/lovelace/entity-rows/hui-text-entity-row.ts index 34e98c737c..4ca97ad0ce 100644 --- a/src/panels/lovelace/entity-rows/hui-text-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-text-entity-row.ts @@ -12,8 +12,7 @@ import { import "../components/hui-generic-entity-row"; import "../components/hui-warning"; -import computeStateDisplay from "../../../common/entity/compute_state_display"; - +import { computeStateDisplay } from "../../../common/entity/compute_state_display"; import { HomeAssistant } from "../../../types"; import { EntityRow, EntityConfig } from "./types"; import { hasConfigOrEntityChanged } from "../common/has-changed"; diff --git a/src/panels/lovelace/entity-rows/hui-timer-entity-row.ts b/src/panels/lovelace/entity-rows/hui-timer-entity-row.ts index 05508ad130..ded2954fdc 100644 --- a/src/panels/lovelace/entity-rows/hui-timer-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-timer-entity-row.ts @@ -10,7 +10,7 @@ import { import "../components/hui-generic-entity-row"; import "../components/hui-warning"; -import timerTimeRemaining from "../../../common/entity/timer_time_remaining"; +import { timerTimeRemaining } from "../../../common/entity/timer_time_remaining"; import secondsToDuration from "../../../common/datetime/seconds_to_duration"; import { HomeAssistant } from "../../../types"; diff --git a/src/panels/lovelace/entity-rows/hui-toggle-entity-row.ts b/src/panels/lovelace/entity-rows/hui-toggle-entity-row.ts index 22055d8316..b8f636b3ad 100644 --- a/src/panels/lovelace/entity-rows/hui-toggle-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-toggle-entity-row.ts @@ -11,8 +11,7 @@ import "../components/hui-generic-entity-row"; import "../../../components/entity/ha-entity-toggle"; import "../components/hui-warning"; -import computeStateDisplay from "../../../common/entity/compute_state_display"; - +import { computeStateDisplay } from "../../../common/entity/compute_state_display"; import { HomeAssistant } from "../../../types"; import { EntityRow, EntityConfig } from "./types"; import { hasConfigOrEntityChanged } from "../common/has-changed"; diff --git a/src/panels/map/ha-panel-map.js b/src/panels/map/ha-panel-map.js index 464a47927e..24053cee0e 100644 --- a/src/panels/map/ha-panel-map.js +++ b/src/panels/map/ha-panel-map.js @@ -7,8 +7,8 @@ import "../../components/ha-icon"; import "./ha-entity-marker"; -import computeStateDomain from "../../common/entity/compute_state_domain"; -import computeStateName from "../../common/entity/compute_state_name"; +import { computeStateDomain } from "../../common/entity/compute_state_domain"; +import { computeStateName } from "../../common/entity/compute_state_name"; import LocalizeMixin from "../../mixins/localize-mixin"; import { setupLeafletMap } from "../../common/dom/setup-leaflet-map"; diff --git a/src/panels/states/ha-panel-states.js b/src/panels/states/ha-panel-states.js index 70c1a8936e..39a1a64d5d 100644 --- a/src/panels/states/ha-panel-states.js +++ b/src/panels/states/ha-panel-states.js @@ -16,10 +16,10 @@ import "../../components/ha-start-voice-button"; import "../../layouts/ha-app-layout"; -import extractViews from "../../common/entity/extract_views"; -import getViewEntities from "../../common/entity/get_view_entities"; -import computeStateName from "../../common/entity/compute_state_name"; -import computeStateDomain from "../../common/entity/compute_state_domain"; +import { extractViews } from "../../common/entity/extract_views"; +import { getViewEntities } from "../../common/entity/get_view_entities"; +import { computeStateName } from "../../common/entity/compute_state_name"; +import { computeStateDomain } from "../../common/entity/compute_state_domain"; import computeLocationName from "../../common/config/location_name"; import NavigateMixin from "../../mixins/navigate-mixin"; import { EventsMixin } from "../../mixins/events-mixin"; diff --git a/src/state-summary/state-card-content.js b/src/state-summary/state-card-content.js index 7a6c12ff66..61f0d69732 100644 --- a/src/state-summary/state-card-content.js +++ b/src/state-summary/state-card-content.js @@ -17,7 +17,7 @@ import "./state-card-vacuum"; import "./state-card-water_heater"; import "./state-card-weblink"; -import stateCardType from "../common/entity/state_card_type"; +import { stateCardType } from "../common/entity/state_card_type"; import dynamicContentUpdater from "../common/dom/dynamic_content_updater"; class StateCardContent extends PolymerElement { diff --git a/src/state-summary/state-card-display.js b/src/state-summary/state-card-display.js index 050a093c2c..ca48fa93eb 100644 --- a/src/state-summary/state-card-display.js +++ b/src/state-summary/state-card-display.js @@ -3,10 +3,11 @@ import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../components/entity/state-info"; + import LocalizeMixin from "../mixins/localize-mixin"; -import computeStateDisplay from "../common/entity/compute_state_display"; -import attributeClassNames from "../common/entity/attribute_class_names"; +import { attributeClassNames } from "../common/entity/attribute_class_names"; +import { computeStateDisplay } from "../common/entity/compute_state_display"; import { computeRTL } from "../common/util/compute_rtl"; /* diff --git a/src/state-summary/state-card-input_select.ts b/src/state-summary/state-card-input_select.ts index 5566c27a6c..c447d0e4e8 100644 --- a/src/state-summary/state-card-input_select.ts +++ b/src/state-summary/state-card-input_select.ts @@ -16,7 +16,7 @@ import "@polymer/paper-listbox/paper-listbox"; import "../components/entity/state-badge"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; import { HomeAssistant, InputSelectEntity } from "../types"; import { setInputSelectOption } from "../data/input-select"; import { PolymerIronSelectEvent } from "../polymer-types"; diff --git a/src/state-summary/state-card-timer.js b/src/state-summary/state-card-timer.js index da8d2a8ef7..6c803ec6a0 100644 --- a/src/state-summary/state-card-timer.js +++ b/src/state-summary/state-card-timer.js @@ -4,7 +4,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../components/entity/state-info"; -import timerTimeRemaining from "../common/entity/timer_time_remaining"; +import { timerTimeRemaining } from "../common/entity/timer_time_remaining"; import secondsToDuration from "../common/datetime/seconds_to_duration"; class StateCardTimer extends PolymerElement { diff --git a/src/state-summary/state-card-weblink.js b/src/state-summary/state-card-weblink.js index d078965983..5c99cf1537 100644 --- a/src/state-summary/state-card-weblink.js +++ b/src/state-summary/state-card-weblink.js @@ -3,7 +3,7 @@ import { PolymerElement } from "@polymer/polymer/polymer-element"; import "../components/entity/state-badge"; -import computeStateName from "../common/entity/compute_state_name"; +import { computeStateName } from "../common/entity/compute_state_name"; class StateCardWeblink extends PolymerElement { static get template() { diff --git a/test-mocha/common/entity/attribute_class_names_test.ts b/test-mocha/common/entity/attribute_class_names_test.ts index b6a904b00a..edc3d93d2d 100644 --- a/test-mocha/common/entity/attribute_class_names_test.ts +++ b/test-mocha/common/entity/attribute_class_names_test.ts @@ -1,6 +1,5 @@ import { assert } from "chai"; - -import attributeClassNames from "../../../src/common/entity/attribute_class_names"; +import { attributeClassNames } from "../../../src/common/entity/attribute_class_names"; describe("attributeClassNames", () => { const attrs = ["mock_attr1", "mock_attr2"]; diff --git a/test-mocha/common/entity/can_toggle_domain_test.ts b/test-mocha/common/entity/can_toggle_domain_test.ts index a3d3d36b30..8a47e57edf 100644 --- a/test-mocha/common/entity/can_toggle_domain_test.ts +++ b/test-mocha/common/entity/can_toggle_domain_test.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import canToggleDomain from "../../../src/common/entity/can_toggle_domain"; +import { canToggleDomain } from "../../../src/common/entity/can_toggle_domain"; describe("canToggleDomain", () => { const hass: any = { diff --git a/test-mocha/common/entity/can_toggle_state_test.ts b/test-mocha/common/entity/can_toggle_state_test.ts index b0239dd376..b35bb04c63 100644 --- a/test-mocha/common/entity/can_toggle_state_test.ts +++ b/test-mocha/common/entity/can_toggle_state_test.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import canToggleState from "../../../src/common/entity/can_toggle_state"; +import { canToggleState } from "../../../src/common/entity/can_toggle_state"; describe("canToggleState", () => { const hass: any = { diff --git a/test-mocha/common/entity/compute_domain.ts b/test-mocha/common/entity/compute_domain.ts index 5ec3990cce..2c085036b4 100644 --- a/test-mocha/common/entity/compute_domain.ts +++ b/test-mocha/common/entity/compute_domain.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import computeDomain from "../../../src/common/entity/compute_domain"; +import { computeDomain } from "../../../src/common/entity/compute_domain"; describe("computeDomain", () => { it("Returns domains", () => { diff --git a/test-mocha/common/entity/compute_state_display.ts b/test-mocha/common/entity/compute_state_display.ts index f45067ef78..8c120208b7 100644 --- a/test-mocha/common/entity/compute_state_display.ts +++ b/test-mocha/common/entity/compute_state_display.ts @@ -1,6 +1,5 @@ import { assert } from "chai"; - -import computeStateDisplay from "../../../src/common/entity/compute_state_display"; +import { computeStateDisplay } from "../../../src/common/entity/compute_state_display"; describe("computeStateDisplay", () => { // Mock Localize function for testing diff --git a/test-mocha/common/entity/compute_state_domain.ts b/test-mocha/common/entity/compute_state_domain.ts index 803737fa5a..55c8ae964b 100644 --- a/test-mocha/common/entity/compute_state_domain.ts +++ b/test-mocha/common/entity/compute_state_domain.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import computeStateDomain from "../../../src/common/entity/compute_state_domain"; +import { computeStateDomain } from "../../../src/common/entity/compute_state_domain"; describe("computeStateDomain", () => { it("Detects sensor domain", () => { diff --git a/test-mocha/common/entity/extract_views.spec.ts b/test-mocha/common/entity/extract_views.spec.ts index 9528f21a9a..aa53fd3d78 100644 --- a/test-mocha/common/entity/extract_views.spec.ts +++ b/test-mocha/common/entity/extract_views.spec.ts @@ -1,6 +1,6 @@ import * as assert from "assert"; -import extractViews from "../../../src/common/entity/extract_views"; +import { extractViews } from "../../../src/common/entity/extract_views"; import { createEntities, createView } from "./test_util"; diff --git a/test-mocha/common/entity/feature_class_names_test.ts b/test-mocha/common/entity/feature_class_names_test.ts index 544d95a1e6..70ef71f03a 100644 --- a/test-mocha/common/entity/feature_class_names_test.ts +++ b/test-mocha/common/entity/feature_class_names_test.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import featureClassNames from "../../../src/common/entity/feature_class_names"; +import { featureClassNames } from "../../../src/common/entity/feature_class_names"; import { HassEntity } from "home-assistant-js-websocket"; describe("featureClassNames", () => { diff --git a/test-mocha/common/entity/get_group_entities.spec.ts b/test-mocha/common/entity/get_group_entities.spec.ts index a6c5d6177b..2c22a2913b 100644 --- a/test-mocha/common/entity/get_group_entities.spec.ts +++ b/test-mocha/common/entity/get_group_entities.spec.ts @@ -1,6 +1,6 @@ import * as assert from "assert"; -import getGroupEntities from "../../../src/common/entity/get_group_entities"; +import { getGroupEntities } from "../../../src/common/entity/get_group_entities"; import { createEntities, createGroup, entityMap } from "./test_util"; diff --git a/test-mocha/common/entity/get_view_entities.spec.ts b/test-mocha/common/entity/get_view_entities.spec.ts index c39b8a37ed..fa2f0f6840 100644 --- a/test-mocha/common/entity/get_view_entities.spec.ts +++ b/test-mocha/common/entity/get_view_entities.spec.ts @@ -1,6 +1,6 @@ import * as assert from "assert"; -import getViewEntities from "../../../src/common/entity/get_view_entities"; +import { getViewEntities } from "../../../src/common/entity/get_view_entities"; import { createEntities, diff --git a/test-mocha/common/entity/has_location.test.ts b/test-mocha/common/entity/has_location.test.ts index 88ee4f7508..8b0e7af263 100644 --- a/test-mocha/common/entity/has_location.test.ts +++ b/test-mocha/common/entity/has_location.test.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import hasLocation from "../../../src/common/entity/has_location"; +import { hasLocation } from "../../../src/common/entity/has_location"; describe("hasLocation", () => { it("flags states with location", () => { diff --git a/test-mocha/common/entity/split_by_groups.spec.ts b/test-mocha/common/entity/split_by_groups.spec.ts index ede3c3ea19..1e4a28140d 100644 --- a/test-mocha/common/entity/split_by_groups.spec.ts +++ b/test-mocha/common/entity/split_by_groups.spec.ts @@ -1,6 +1,6 @@ import * as assert from "assert"; -import splitByGroups from "../../../src/common/entity/split_by_groups"; +import { splitByGroups } from "../../../src/common/entity/split_by_groups"; import { createEntities, createGroup, entityMap } from "./test_util"; diff --git a/test-mocha/common/entity/state_card_type_test.ts b/test-mocha/common/entity/state_card_type_test.ts index deb455784c..ebf2ef4612 100644 --- a/test-mocha/common/entity/state_card_type_test.ts +++ b/test-mocha/common/entity/state_card_type_test.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import stateCardType from "../../../src/common/entity/state_card_type"; +import { stateCardType } from "../../../src/common/entity/state_card_type"; describe("stateCardType", () => { const hass: any = { diff --git a/test-mocha/common/entity/state_more_info_type_test.ts b/test-mocha/common/entity/state_more_info_type_test.ts index 1d62f53b8d..4774fcf951 100644 --- a/test-mocha/common/entity/state_more_info_type_test.ts +++ b/test-mocha/common/entity/state_more_info_type_test.ts @@ -1,6 +1,6 @@ import { assert } from "chai"; -import stateMoreInfoType from "../../../src/common/entity/state_more_info_type"; +import { stateMoreInfoType } from "../../../src/common/entity/state_more_info_type"; describe("stateMoreInfoType", () => { it("Returns media_player for media_player states", () => { diff --git a/test-mocha/common/entity/timer_time_remaining_test.ts b/test-mocha/common/entity/timer_time_remaining_test.ts index e049fa1015..3fb7632869 100644 --- a/test-mocha/common/entity/timer_time_remaining_test.ts +++ b/test-mocha/common/entity/timer_time_remaining_test.ts @@ -1,7 +1,7 @@ import { assert } from "chai"; import * as sinon from "sinon"; -import timerTimeRemaining from "../../../src/common/entity/timer_time_remaining"; +import { timerTimeRemaining } from "../../../src/common/entity/timer_time_remaining"; describe("timerTimeRemaining", () => { it("works with idle timers", () => {