Home Assistant
- [[hassVersion]]
+ [[hass.config.core.version]]
- Path to configuration.yaml: [[hassConfigDir]] + Path to configuration.yaml: [[hass.config.core.config_dir]]
@@ -92,7 +91,6 @@
Built using
Python 3,
Polymer [[polymerVersion]],
- NuclearJS [[nuclearVersion]]
Icons by Google and MaterialDesignIcons.com.
History
- [[formatTime(item.when)]]
-
+
[[item.name]]
-
+
[[item.name]]
@@ -76,13 +76,13 @@ Polymer({
},
},
- formatTime: function (dateObj) {
- return window.hassUtil.formatTime(dateObj);
+ formatTime: function (date) {
+ return window.hassUtil.formatTime(new Date(date));
},
entityClicked: function (ev) {
ev.preventDefault();
- this.hass.moreInfoActions.selectEntity(ev.model.item.entityId);
+ this.fire('hass-more-info', { entityId: ev.model.item.entity_id });
},
});
diff --git a/panels/logbook/ha-panel-logbook.html b/panels/logbook/ha-panel-logbook.html
index 6c7e69bee2..c67f6447f2 100644
--- a/panels/logbook/ha-panel-logbook.html
+++ b/panels/logbook/ha-panel-logbook.html
@@ -10,10 +10,10 @@
-
+
@@ -31,15 +31,18 @@
}
+
@@ -48,7 +51,7 @@
diff --git a/panels/map/ha-panel-map.html b/panels/map/ha-panel-map.html
index 654d812ad0..7c64e86406 100644
--- a/panels/map/ha-panel-map.html
+++ b/panels/map/ha-panel-map.html
@@ -8,7 +8,6 @@
-
@@ -37,41 +36,9 @@ window.L.Icon.Default.imagePath = '/static/images/leaflet';
Polymer({
is: 'ha-panel-map',
- behaviors: [window.hassBehavior],
-
properties: {
hass: {
type: Object,
- },
-
- locationGPS: {
- type: Number,
- bindNuclear: function (hass) {
- return hass.configGetters.locationGPS;
- },
- },
-
- locationName: {
- type: String,
- bindNuclear: function (hass) {
- return hass.configGetters.locationName;
- },
- },
-
- locationEntities: {
- type: Array,
- bindNuclear: function (hass) {
- return [
- hass.entityGetters.entityMap,
- function (entities) {
- return entities.valueSeq().filter(
- function (entity) {
- return 'latitude' in entity.attributes;
- }
- );
- },
- ];
- },
observer: 'drawEntities',
},
@@ -96,7 +63,7 @@ Polymer({
}
).addTo(map);
- this.drawEntities(this.locationEntities);
+ this.drawEntities(this.hass);
this.async(function () {
map.invalidateSize();
@@ -118,7 +85,7 @@ Polymer({
this._map.fitBounds(bounds.pad(0.5));
},
- drawEntities: function (entities) {
+ drawEntities: function (hass) {
/* eslint-disable vars-on-top */
var map = this._map;
if (!map) return;
@@ -128,10 +95,21 @@ Polymer({
}
var mapItems = this._mapItems = [];
- entities.forEach(function (entity) {
+ Object.keys(hass.states).forEach(function (entityId) {
+ var entity = hass.states[entityId];
+ var title = window.hassUtil.computeStateName(entity);
+
+ if ((entity.attributes.hidden &&
+ window.hassUtil.computeDomain(entity) !== 'zone') ||
+ entity.state === 'home' ||
+ !('latitude' in entity.attributes) ||
+ !('longitude' in entity.attributes)) {
+ return;
+ }
+
var icon;
- if (entity.domain === 'zone') {
+ if (window.hassUtil.computeDomain(entity) === 'zone') {
// DRAW ZONE
if (entity.attributes.passive) return;
@@ -141,7 +119,7 @@ Polymer({
iconHTML = (
"![[[stateObj.entityDisplay]]]([[cameraFeedSrc]])
+ on-load='imageLoadSuccess' on-error='imageLoadFail' alt='[[computeStateName(stateObj)]]'>
Logbook
-
-
-
- [[stateObj.entityDisplay]]
+ [[computeStateName(stateObj)]]
(Error loading image)
@@ -99,9 +99,7 @@ Polymer({
},
cardTapped: function () {
- this.async(function () {
- this.hass.moreInfoActions.selectEntity(this.stateObj.entityId);
- }.bind(this), 1);
+ this.fire('hass-more-info', { entityId: this.stateObj.entity_id });
},
updateCameraFeedSrc: function (stateObj) {
@@ -117,5 +115,9 @@ Polymer({
imageLoadFail: function () {
this.imageLoaded = false;
},
+
+ computeStateName: function (stateObj) {
+ return window.hassUtil.computeStateName(stateObj);
+ },
});
diff --git a/src/cards/ha-entities-card.html b/src/cards/ha-entities-card.html
index 8f87acb268..8d1355fb0d 100644
--- a/src/cards/ha-entities-card.html
+++ b/src/cards/ha-entities-card.html
@@ -75,14 +75,16 @@ Polymer({
states: {
type: Array,
},
+
groupEntity: {
type: Object,
},
},
computeTitle: function (states, groupEntity) {
- return groupEntity ? groupEntity.entityDisplay :
- states[0].domain.replace(/_/g, ' ');
+ return groupEntity ?
+ window.hassUtil.computeStateName(groupEntity) :
+ window.hassUtil.computeDomain(states[0]).replace(/_/g, ' ');
},
computeTitleClass: function (groupEntity) {
@@ -105,26 +107,32 @@ Polymer({
ev.stopPropagation();
if (ev.model) {
- entityId = ev.model.item.entityId;
+ entityId = ev.model.item.entity_id;
} else {
- entityId = this.groupEntity.entityId;
+ entityId = this.groupEntity.entity_id;
}
- this.async(function () { this.hass.moreInfoActions.selectEntity(entityId); }.bind(this), 1);
+ this.fire('hass-more-info', { entityId: entityId });
},
showGroupToggle: function (groupEntity, states) {
- var canToggleCount;
-
if (!groupEntity || !states || groupEntity.attributes.control === 'hidden' ||
(groupEntity.state !== 'on' && groupEntity.state !== 'off')) {
return false;
}
// only show if we can toggle 2+ entities in group
- canToggleCount = states.reduce(
- function (sum, state) {
- return sum + window.hassUtil.canToggle(this.hass, state.entityId);
- }, 0);
+ var canToggleCount = 0;
+ for (var i = 0; i < states.length; i++) {
+ if (!window.hassUtil.canToggleState(this.hass, states[i])) {
+ continue;
+ }
+
+ canToggleCount++;
+
+ if (canToggleCount > 1) {
+ break;
+ }
+ }
return canToggleCount > 1;
},
diff --git a/src/cards/ha-media_player-card.html b/src/cards/ha-media_player-card.html
index a23e06f25d..0b3f972b1a 100644
--- a/src/cards/ha-media_player-card.html
+++ b/src/cards/ha-media_player-card.html
@@ -6,6 +6,8 @@
+
+
-
@@ -56,101 +57,48 @@ Polymer({
is: 'state-history-charts',
properties: {
- stateHistory: {
+ historyData: {
type: Object,
+ value: null,
},
isLoadingData: {
type: Boolean,
- value: false,
+ value: true,
},
- apiLoaded: {
+ _apiLoaded: {
type: Boolean,
value: false,
},
- isLoading: {
+ _isLoading: {
type: Boolean,
- computed: 'computeIsLoading(isLoadingData, apiLoaded)',
- },
-
- groupedStateHistory: {
- type: Object,
- computed: 'computeGroupedStateHistory(isLoading, stateHistory)',
- },
-
- isSingleDevice: {
- type: Boolean,
- computed: 'computeIsSingleDevice(stateHistory)',
+ computed: '_computeIsLoading(isLoadingData, _apiLoaded)',
},
},
- computeIsSingleDevice: function (stateHistory) {
- return stateHistory && stateHistory.size === 1;
+ _computeIsSingleLineChart: function (historyData) {
+ return historyData && historyData.line.length === 1;
},
- computeGroupedStateHistory: function (isLoading, stateHistory) {
- var lineChartDevices = {};
- var timelineDevices = [];
- var unitStates;
-
- if (isLoading || !stateHistory) {
- return { line: [], timeline: [] };
- }
-
- stateHistory.forEach(function (stateInfo) {
- var stateWithUnit;
- var unit;
-
- if (!stateInfo || stateInfo.size === 0) {
- return;
- }
-
- stateWithUnit = stateInfo.find(
- function (state) { return 'unit_of_measurement' in state.attributes; });
-
- unit = stateWithUnit ?
- stateWithUnit.attributes.unit_of_measurement : false;
-
- if (!unit) {
- timelineDevices.push(stateInfo.toArray());
- } else if (unit in lineChartDevices) {
- lineChartDevices[unit].push(stateInfo.toArray());
- } else {
- lineChartDevices[unit] = [stateInfo.toArray()];
- }
- });
-
- timelineDevices = timelineDevices.length > 0 && timelineDevices;
-
- unitStates = Object.keys(lineChartDevices).map(
- function (unit) {
- return { unit: unit, data: lineChartDevices[unit] };
- });
-
- return { line: unitStates, timeline: timelineDevices };
- },
-
- googleApiLoaded: function () {
+ _googleApiLoaded: function () {
window.google.load('visualization', '1', {
packages: ['timeline', 'corechart'],
callback: function () {
- this.apiLoaded = true;
+ this._apiLoaded = true;
}.bind(this),
});
},
- computeContentClasses: function (isLoading) {
- return isLoading ? 'loading' : '';
+ _computeIsLoading: function (_isLoadingData, _apiLoaded) {
+ return _isLoadingData || !_apiLoaded;
},
- computeIsLoading: function (isLoadingData, apiLoaded) {
- return isLoadingData || !apiLoaded;
- },
-
- computeIsEmpty: function (stateHistory) {
- return stateHistory && stateHistory.size === 0;
+ _computeIsEmpty: function (historyData) {
+ return (historyData &&
+ historyData.timeline.length === 0 &&
+ historyData.line.length === 0);
},
});
diff --git a/src/data/ha-state-history-data.html b/src/data/ha-state-history-data.html
new file mode 100644
index 0000000000..8cc770435b
--- /dev/null
+++ b/src/data/ha-state-history-data.html
@@ -0,0 +1,162 @@
+
+
+
diff --git a/src/dialogs/ha-voice-command-dialog.html b/src/dialogs/ha-voice-command-dialog.html
index ef42bd7537..9d096a1253 100644
--- a/src/dialogs/ha-voice-command-dialog.html
+++ b/src/dialogs/ha-voice-command-dialog.html
@@ -5,8 +5,6 @@
-
-
-
+
-
-
+
+
+
-
-
+ connection-promise='{{connectionPromise}}'
+ show-loading='[[computeShowLoading(connectionPromise, iconsLoaded)]]'>
diff --git a/src/layouts/home-assistant-main.html b/src/layouts/home-assistant-main.html
index a641983e50..b5ee7630de 100644
--- a/src/layouts/home-assistant-main.html
+++ b/src/layouts/home-assistant-main.html
@@ -5,22 +5,25 @@
-
+
-
@@ -51,10 +49,18 @@
-
+
+
+
+
-
-
+
+
No state history found.
+ data='[[historyData.timeline]]'>
-
+
+ is-single-device='[[_computeIsSingleLineChart(historyData)]]'>
-
+
+
-
+
-
- [[errorMessage]]
+
+ [[errorMessage]]
Remember
@@ -74,31 +80,25 @@
Polymer({
is: 'login-form',
- behaviors: [window.hassBehavior],
-
properties: {
hass: {
type: Object,
},
- errorMessage: {
- type: String,
- bindNuclear: function (hass) { return hass.authGetters.attemptErrorMessage; },
+ connectionPromise: {
+ type: Object,
+ notify: true,
+ observer: 'handleConnectionPromiseChanged',
},
- isInvalid: {
- type: Boolean,
- bindNuclear: function (hass) { return hass.authGetters.isInvalidAttempt; },
+ errorMessage: {
+ type: String,
+ value: '',
},
isValidating: {
type: Boolean,
observer: 'isValidatingChanged',
- bindNuclear: function (hass) { return hass.authGetters.isValidating; },
- },
-
- loadingResources: {
- type: Boolean,
value: false,
},
@@ -111,6 +111,11 @@ Polymer({
type: Boolean,
computed: 'computeShowSpinner(forceShowLoading, isValidating)',
},
+
+ password: {
+ type: String,
+ value: '',
+ },
},
listeners: {
@@ -118,10 +123,6 @@ Polymer({
'loginButton.tap': 'validatePassword',
},
- observers: [
- 'validatingChanged(isValidating, isInvalid)',
- ],
-
attached: function () {
window.removeInitMsg();
},
@@ -130,15 +131,11 @@ Polymer({
return forceShowLoading || isValidating;
},
- validatingChanged: function (isValidating, isInvalid) {
- if (!isValidating && !isInvalid) {
- this.$.passwordInput.value = '';
- }
- },
-
isValidatingChanged: function (newVal) {
if (!newVal) {
- this.async(function () { this.$.passwordInput.focus(); }.bind(this), 10);
+ this.async(function () {
+ this.$.passwordInput.focus();
+ }.bind(this), 10);
}
},
@@ -148,16 +145,46 @@ Polymer({
this.validatePassword();
ev.preventDefault();
// clear error after we start typing again
- } else if (this.isInvalid) {
- this.isInvalid = false;
+ } else if (this.errorMessage) {
+ this.errorMessage = '';
}
},
validatePassword: function () {
+ var auth = this.password;
this.$.hideKeyboardOnFocus.focus();
+ this.connectionPromise = window.createHassConnection(auth);
- window.validateAuth(this.$.passwordInput.value,
- this.$.rememberLogin.checked);
+ if (this.$.rememberLogin.checked) {
+ this.connectionPromise.then(function () {
+ localStorage.authToken = auth;
+ });
+ }
},
+
+ handleConnectionPromiseChanged: function (newVal) {
+ if (!newVal) return;
+
+ var el = this;
+ this.isValidating = true;
+
+ this.connectionPromise.then(
+ function () {
+ el.isValidating = false;
+ el.password = '';
+ },
+ function (errCode) {
+ el.isValidating = false;
+
+ if (errCode === window.HAWS.ERR_CANNOT_CONNECT) {
+ el.errorMessage = 'Unable to connect';
+ } else if (errCode === window.HAWS.ERR_INVALID_AUTH) {
+ el.errorMessage = 'Invalid password';
+ } else {
+ el.errorMessage = 'Unknown error: ' + errCode;
+ }
+ }
+ );
+ }
});
diff --git a/src/layouts/partial-cards.html b/src/layouts/partial-cards.html
index 605f82ddbc..e35428c344 100644
--- a/src/layouts/partial-cards.html
+++ b/src/layouts/partial-cards.html
@@ -4,7 +4,6 @@
-
@@ -14,8 +13,8 @@
+
-
@@ -42,9 +41,7 @@
[[computeTitle(views, locationName)]]
-
@@ -60,14 +57,14 @@
>[[locationName]]
@@ -82,8 +79,8 @@
>
Polymer({
- is: 'partial-cards',
+ DEFAULT_VIEW_ENTITY_ID: 'group.default_view',
+ ALWAYS_SHOW_DOMAIN: ['persistent_notification', 'configurator'],
- behaviors: [window.hassBehavior],
+ is: 'partial-cards',
properties: {
hass: {
type: Object,
+ value: null,
},
narrow: {
@@ -124,7 +123,6 @@ Polymer({
showMenu: {
type: Boolean,
- value: false,
observer: 'handleWindowChange',
},
@@ -138,62 +136,30 @@ Polymer({
value: 1,
},
- canListen: {
- type: Boolean,
- bindNuclear: function (hass) {
- return [
- hass.voiceGetters.isVoiceSupported,
- hass.configGetters.isComponentLoaded('conversation'),
- function (isVoiceSupported, componentLoaded) {
- return isVoiceSupported && componentLoaded;
- },
- ];
- },
- },
-
introductionLoaded: {
type: Boolean,
- bindNuclear: function (hass) {
- return hass.configGetters.isComponentLoaded('introduction');
- },
+ computed: 'computeIntroductionLoaded(hass)',
},
locationName: {
type: String,
- bindNuclear: function (hass) {
- return hass.configGetters.locationName;
- },
+ value: '',
+ computed: 'computeLocationName(hass)',
},
currentView: {
type: String,
- bindNuclear: function (hass) {
- return [
- hass.viewGetters.currentView,
- function (view) { return view || ''; },
- ];
- },
+ computed: 'computeCurrentView(hass)',
},
views: {
type: Array,
- bindNuclear: function (hass) {
- return [
- hass.viewGetters.views,
- function (views) {
- return views.valueSeq()
- .sortBy(function (view) { return view.attributes.order; })
- .toArray();
- },
- ];
- },
+ computed: 'computeViews(hass)',
},
- states: {
+ viewStates: {
type: Object,
- bindNuclear: function (hass) {
- return hass.viewGetters.currentViewEntities;
- },
+ computed: 'computeViewStates(currentView, hass)',
},
},
@@ -259,17 +225,11 @@ Polymer({
}).call(this);
},
- handleListenClick: function () {
- this.hass.voiceActions.listen();
- },
-
handleViewSelected: function (ev) {
var view = ev.detail.item.getAttribute('data-entity') || null;
var current = this.currentView || null;
if (view !== current) {
- this.async(function () {
- this.hass.viewActions.selectView(view);
- }.bind(this), 0);
+ this.fire('hass-navigate', { view: view });
}
},
@@ -280,5 +240,72 @@ Polymer({
computeShowIntroduction: function (currentView, introductionLoaded, states) {
return currentView === '' && (introductionLoaded || states.size === 0);
},
+
+ computeStateName: function (stateObj) {
+ return window.hassUtil.computeStateName(stateObj);
+ },
+
+ computeLocationName: function (hass) {
+ return window.hassUtil.computeLocationName(hass);
+ },
+
+ computeIntroductionLoaded: function (hass) {
+ return window.hassUtil.isComponentLoaded(hass, 'introduction');
+ },
+
+ computeViews: function (hass) {
+ return window.HAWS.extractViews(hass.states);
+ },
+
+ /*
+ Compute the states to show for current view.
+
+ Will make sure we always show entities from ALWAYS_SHOW_DOMAINS domains.
+ */
+ computeViewStates: function (currentView, hass) {
+ var i;
+ var entityId;
+ var state;
+ var states;
+ var entityIds = Object.keys(hass.states);
+
+ // If we base off all entities, only have to filter out hidden
+ if (!currentView && !(this.DEFAULT_VIEW_ENTITY_ID in hass.states)) {
+ states = {};
+ for (i = 0; i < entityIds.length; i++) {
+ entityId = entityIds[i];
+ state = hass.states[entityId];
+
+ // We can filter out hidden and domain at the same time.
+ if (!state.attributes.hidden) {
+ states[entityId] = state;
+ }
+ }
+ return states;
+ }
+
+ if (currentView) {
+ states = window.HAWS.getViewEntities(hass.states, hass.states[currentView]);
+ } else {
+ states = window.HAWS.getViewEntities(
+ hass.states, hass.states[this.DEFAULT_VIEW_ENTITY_ID]);
+ }
+
+ // Make sure certain domains are always shown.
+ for (i = 0; i < entityIds.length; i++) {
+ entityId = entityIds[i];
+ state = hass.states[entityId];
+
+ if (this.ALWAYS_SHOW_DOMAIN.indexOf(window.hassUtil.computeDomain(state)) !== -1) {
+ states[entityId] = state;
+ }
+ }
+
+ return states;
+ },
+
+ computeCurrentView: function (hass) {
+ return hass.currentView || '';
+ },
});
diff --git a/src/layouts/partial-panel-resolver.html b/src/layouts/partial-panel-resolver.html
index 1efb7fbb77..69668e53a1 100644
--- a/src/layouts/partial-panel-resolver.html
+++ b/src/layouts/partial-panel-resolver.html
@@ -5,7 +5,6 @@
-
@@ -46,8 +45,6 @@
Polymer({
is: 'partial-panel-resolver',
- behaviors: [window.hassBehavior],
-
properties: {
hass: {
type: Object,
@@ -78,13 +75,15 @@ Polymer({
panel: {
type: Object,
- bindNuclear: function (hass) {
- return hass.navigationGetters.activePanel;
- },
+ computed: 'computeCurrentPanel(hass)',
observer: 'panelChanged',
},
},
+ computeCurrentPanel: function (hass) {
+ return hass.config.panels[hass.currentPanel];
+ },
+
panelChanged: function (panel) {
if (!panel) {
if (this.$.panel.lastChild) {
@@ -97,15 +96,15 @@ Polymer({
this.errorLoading = false;
this.importHref(
- panel.get('url'),
+ panel.url,
function success() {
window.hassUtil.dynamicContentUpdater(
- this.$.panel, 'ha-panel-' + panel.get('component_name'), {
+ this.$.panel, 'ha-panel-' + panel.component_name, {
hass: this.hass,
narrow: this.narrow,
showMenu: this.showMenu,
- panel: panel.toJS(),
+ panel: panel,
});
this.resolved = true;
}.bind(this),
diff --git a/src/managers/notification-manager.html b/src/managers/notification-manager.html
index e541b516f6..46632e9a72 100644
--- a/src/managers/notification-manager.html
+++ b/src/managers/notification-manager.html
@@ -2,8 +2,6 @@
-
-
![[[stateObj.entityDisplay]]]([[computeCameraImageUrl(hass, stateObj, isVisible)]])
+ on-load='imageLoaded' alt='[[computeStateName(stateObj)]]' />
@@ -40,11 +40,15 @@ Polymer({
this.fire('iron-resize');
},
+ computeStateName: function (stateObj) {
+ return window.hassUtil.computeStateName(stateObj);
+ },
+
computeCameraImageUrl: function (hass, stateObj, isVisible) {
if (hass.demo) {
return '/demo/webcam.jpg';
} else if (stateObj && isVisible) {
- return '/api/camera_proxy_stream/' + stateObj.entityId +
+ return '/api/camera_proxy_stream/' + stateObj.entity_id +
'?token=' + stateObj.attributes.access_token;
}
// Return an empty image if no stateObj (= dialog not open) or in cleanup mode.
diff --git a/src/more-infos/more-info-climate.html b/src/more-infos/more-info-climate.html
index 7a00ded4eb..426bd74481 100644
--- a/src/more-infos/more-info-climate.html
+++ b/src/more-infos/more-info-climate.html
@@ -376,9 +376,9 @@ Polymer({
// result in the entity to be turned on. Since the state is not changing,
// the resync is not called automatic.
/* eslint-disable no-param-reassign */
- data.entity_id = this.stateObj.entityId;
+ data.entity_id = this.stateObj.entity_id;
/* eslint-enable no-param-reassign */
- this.hass.serviceActions.callService('climate', service, data)
+ this.hass.callService('climate', service, data)
.then(function () {
this.stateObjChanged(this.stateObj);
}.bind(this));
diff --git a/src/more-infos/more-info-configurator.html b/src/more-infos/more-info-configurator.html
index 028ecb978a..65c3864f4c 100644
--- a/src/more-infos/more-info-configurator.html
+++ b/src/more-infos/more-info-configurator.html
@@ -7,8 +7,6 @@
-
-
@@ -94,8 +92,6 @@
Polymer({
is: 'more-info-configurator',
- behaviors: [window.hassBehavior],
-
properties: {
stateObj: {
type: Object,
@@ -106,13 +102,6 @@ Polymer({
value: 'display',
},
- isStreaming: {
- type: Boolean,
- bindNuclear: function (hass) {
- return hass.streamGetters.isStreamingEvents;
- },
- },
-
isConfigurable: {
type: Boolean,
computed: 'computeIsConfigurable(stateObj)',
@@ -154,13 +143,9 @@ Polymer({
this.isConfiguring = true;
- this.hass.serviceActions.callService('configurator', 'configure', data).then(
+ this.hass.callService('configurator', 'configure', data).then(
function () {
this.isConfiguring = false;
-
- if (!this.isStreaming) {
- this.hass.syncActions.fetchAll();
- }
}.bind(this),
function () {
this.isConfiguring = false;
diff --git a/src/more-infos/more-info-cover.html b/src/more-infos/more-info-cover.html
index 72d95b0d5b..b27f502ec6 100644
--- a/src/more-infos/more-info-cover.html
+++ b/src/more-infos/more-info-cover.html
@@ -84,15 +84,15 @@ Polymer({
},
coverPositionSliderChanged: function (ev) {
- this.hass.serviceActions.callService('cover', 'set_cover_position', {
- entity_id: this.stateObj.entityId,
+ this.hass.callService('cover', 'set_cover_position', {
+ entity_id: this.stateObj.entity_id,
position: ev.target.value,
});
},
coverTiltPositionSliderChanged: function (ev) {
- this.hass.serviceActions.callService('cover', 'set_cover_tilt_position', {
- entity_id: this.stateObj.entityId,
+ this.hass.callService('cover', 'set_cover_tilt_position', {
+ entity_id: this.stateObj.entity_id,
tilt_position: ev.target.value,
});
},
@@ -106,18 +106,18 @@ Polymer({
},
onOpenTiltTap: function () {
- this.hass.serviceActions.callService('cover', 'open_cover_tilt',
- { entity_id: this.stateObj.entityId });
+ this.hass.callService('cover', 'open_cover_tilt',
+ { entity_id: this.stateObj.entity_id });
},
onCloseTiltTap: function () {
- this.hass.serviceActions.callService('cover', 'close_cover_tilt',
- { entity_id: this.stateObj.entityId });
+ this.hass.callService('cover', 'close_cover_tilt',
+ { entity_id: this.stateObj.entity_id });
},
onStopTiltTap: function () {
- this.hass.serviceActions.callService('cover', 'stop_cover_tilt',
- { entity_id: this.stateObj.entityId });
+ this.hass.callService('cover', 'stop_cover_tilt',
+ { entity_id: this.stateObj.entity_id });
},
});
diff --git a/src/more-infos/more-info-fan.html b/src/more-infos/more-info-fan.html
index 684e0974b2..8ff952d0e2 100644
--- a/src/more-infos/more-info-fan.html
+++ b/src/more-infos/more-info-fan.html
@@ -114,8 +114,8 @@ Polymer({
speedInput = this.stateObj.attributes.speed_list[speedIndex];
if (speedInput === this.stateObj.attributes.speed) return;
- this.hass.serviceActions.callService('fan', 'turn_on', {
- entity_id: this.stateObj.entityId,
+ this.hass.callService('fan', 'turn_on', {
+ entity_id: this.stateObj.entity_id,
speed: speedInput,
});
},
@@ -126,22 +126,22 @@ Polymer({
if (oldVal === newVal) return;
- this.hass.serviceActions.callService('fan', 'oscillate', {
- entity_id: this.stateObj.entityId,
+ this.hass.callService('fan', 'oscillate', {
+ entity_id: this.stateObj.entity_id,
oscillating: newVal,
});
},
onDirectionLeft: function () {
- this.hass.serviceActions.callService('fan', 'set_direction', {
- entity_id: this.stateObj.entityId,
+ this.hass.callService('fan', 'set_direction', {
+ entity_id: this.stateObj.entity_id,
direction: 'left'
});
},
onDirectionRight: function () {
- this.hass.serviceActions.callService('fan', 'set_direction', {
- entity_id: this.stateObj.entityId,
+ this.hass.callService('fan', 'set_direction', {
+ entity_id: this.stateObj.entity_id,
direction: 'right'
});
},
diff --git a/src/more-infos/more-info-group.html b/src/more-infos/more-info-group.html
index a7956a30f0..30e028709e 100644
--- a/src/more-infos/more-info-group.html
+++ b/src/more-infos/more-info-group.html
@@ -2,8 +2,6 @@
-
-
@@ -115,14 +113,10 @@
Polymer({
is: 'more-info-media_player',
- behaviors: [window.hassBehavior],
-
properties: {
ttsLoaded: {
type: Boolean,
- bindNuclear: function (hass) {
- return hass.configGetters.isComponentLoaded('tts');
- },
+ computed: 'computeTTSLoaded(hass)',
},
hass: {
@@ -307,6 +301,10 @@ Polymer({
return !ttsLoaded || !supportsPlayMedia;
},
+ computeTTSLoaded: function (hass) {
+ return window.hassUtil.isComponentLoaded(hass, 'tts');
+ },
+
handleTogglePower: function () {
this.callService(this.isOff ? 'turn_on' : 'turn_off');
},
@@ -376,15 +374,14 @@ Polymer({
},
sendTTS: function () {
- var services = this.hass.reactor.evaluate(
- this.hass.serviceGetters.entityMap).get('tts').get('services').keySeq()
- .toArray();
+ var services = this.hass.config.services.tts;
+ var serviceKeys = Object.keys(services).sort();
var service;
var i;
- for (i = 0; i < services.length; i++) {
- if (services[i].indexOf('_say') !== -1) {
- service = services[i];
+ for (i = 0; i < serviceKeys.length; i++) {
+ if (services[serviceKeys[i]].indexOf('_say') !== -1) {
+ service = services[serviceKeys[i]];
break;
}
}
@@ -393,8 +390,8 @@ Polymer({
return;
}
- this.hass.serviceActions.callService('tts', service, {
- entity_id: this.stateObj.entityId,
+ this.hass.callService('tts', service, {
+ entity_id: this.stateObj.entity_id,
message: this.ttsMessage,
});
this.ttsMessage = '';
@@ -403,8 +400,8 @@ Polymer({
callService: function (service, data) {
var serviceData = data || {};
- serviceData.entity_id = this.stateObj.entityId;
- this.hass.serviceActions.callService('media_player', service, serviceData);
+ serviceData.entity_id = this.stateObj.entity_id;
+ this.hass.callService('media_player', service, serviceData);
},
});
diff --git a/src/state-summary/state-card-content.html b/src/state-summary/state-card-content.html
index f1fa12210a..d699210ad8 100644
--- a/src/state-summary/state-card-content.html
+++ b/src/state-summary/state-card-content.html
@@ -36,12 +36,12 @@ Polymer({
],
inputChanged: function (hass, inDialog, stateObj) {
- if (!stateObj) return;
+ if (!stateObj || !hass) return;
window.hassUtil.dynamicContentUpdater(
this,
('STATE-CARD-' +
- window.hassUtil.stateCardType(this.hass, stateObj).toUpperCase()),
+ window.hassUtil.stateCardType(hass, stateObj).toUpperCase()),
{
hass: hass,
stateObj: stateObj,
diff --git a/src/state-summary/state-card-cover.html b/src/state-summary/state-card-cover.html
index dc0e4886e3..c673a934a5 100644
--- a/src/state-summary/state-card-cover.html
+++ b/src/state-summary/state-card-cover.html
@@ -68,18 +68,18 @@ Polymer({
},
onOpenTap: function () {
- this.hass.serviceActions.callService('cover', 'open_cover',
- { entity_id: this.stateObj.entityId });
+ this.hass.callService('cover', 'open_cover',
+ { entity_id: this.stateObj.entity_id });
},
onCloseTap: function () {
- this.hass.serviceActions.callService('cover', 'close_cover',
- { entity_id: this.stateObj.entityId });
+ this.hass.callService('cover', 'close_cover',
+ { entity_id: this.stateObj.entity_id });
},
onStopTap: function () {
- this.hass.serviceActions.callService('cover', 'stop_cover',
- { entity_id: this.stateObj.entityId });
+ this.hass.callService('cover', 'stop_cover',
+ { entity_id: this.stateObj.entity_id });
},
});
diff --git a/src/state-summary/state-card-display.html b/src/state-summary/state-card-display.html
index 28e497756d..c0bf72fd8d 100755
--- a/src/state-summary/state-card-display.html
+++ b/src/state-summary/state-card-display.html
@@ -20,7 +20,7 @@
@@ -39,5 +39,9 @@ Polymer({
type: Object,
},
},
+
+ computeStateDisplay: function (stateObj) {
+ return window.hassUtil.computeStateState(stateObj);
+ },
});
diff --git a/src/state-summary/state-card-input_select.html b/src/state-summary/state-card-input_select.html
index 3ae6577be3..df5473f6da 100644
--- a/src/state-summary/state-card-input_select.html
+++ b/src/state-summary/state-card-input_select.html
@@ -27,7 +27,7 @@
+ label='[[computeStateName(stateObj)]]'>
[[item]]
@@ -61,6 +61,10 @@ Polymer({
},
},
+ computeStateName: function (stateObj) {
+ return window.hassUtil.computeStateName(stateObj);
+ },
+
computeSelected: function (stateObj) {
return stateObj.attributes.options.indexOf(stateObj.state);
},
@@ -70,9 +74,9 @@ Polymer({
if (option === '' || option === this.stateObj.state) {
return;
}
- this.hass.serviceActions.callService('input_select', 'select_option', {
+ this.hass.callService('input_select', 'select_option', {
option: option,
- entity_id: this.stateObj.entityId,
+ entity_id: this.stateObj.entity_id,
});
},
diff --git a/src/state-summary/state-card-input_slider.html b/src/state-summary/state-card-input_slider.html
index 7946ea0a01..8777169e02 100644
--- a/src/state-summary/state-card-input_slider.html
+++ b/src/state-summary/state-card-input_slider.html
@@ -68,9 +68,9 @@ Polymer({
if (this.value === Number(this.stateObj.state)) {
return;
}
- this.hass.serviceActions.callService('input_slider', 'select_value', {
+ this.hass.callService('input_slider', 'select_value', {
value: this.value,
- entity_id: this.stateObj.entityId,
+ entity_id: this.stateObj.entity_id,
});
},
diff --git a/src/state-summary/state-card-media_player.html b/src/state-summary/state-card-media_player.html
index 47ac07e22c..b8fa04b610 100644
--- a/src/state-summary/state-card-media_player.html
+++ b/src/state-summary/state-card-media_player.html
@@ -38,8 +38,8 @@
@@ -43,6 +43,10 @@ Polymer({
tap: 'onTap',
},
+ computeStateName: function (stateObj) {
+ return window.hassUtil.computeStateName(stateObj);
+ },
+
onTap: function (ev) {
ev.stopPropagation();
if (ev.target === this.$.link) {
diff --git a/src/util/ha-pref-storage.html b/src/util/ha-pref-storage.html
new file mode 100644
index 0000000000..55410c66dc
--- /dev/null
+++ b/src/util/ha-pref-storage.html
@@ -0,0 +1,48 @@
+
diff --git a/src/util/ha-url-sync.html b/src/util/ha-url-sync.html
new file mode 100644
index 0000000000..e38ce67d4e
--- /dev/null
+++ b/src/util/ha-url-sync.html
@@ -0,0 +1,89 @@
+
diff --git a/src/util/hass-behavior.html b/src/util/hass-behavior.html
deleted file mode 100644
index 48dd2fb472..0000000000
--- a/src/util/hass-behavior.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
diff --git a/src/util/hass-call-api.html b/src/util/hass-call-api.html
new file mode 100644
index 0000000000..385c342f83
--- /dev/null
+++ b/src/util/hass-call-api.html
@@ -0,0 +1,81 @@
+
diff --git a/src/util/hass-util.html b/src/util/hass-util.html
index 5d69ca2756..a8b225e837 100644
--- a/src/util/hass-util.html
+++ b/src/util/hass-util.html
@@ -46,8 +46,28 @@ window.hassUtil.attributeClassNames = function (stateObj, attributes) {
).join(' ');
};
-window.hassUtil.canToggle = function (hass, entityId) {
- return hass.reactor.evaluate(hass.serviceGetters.canToggleEntity(entityId));
+window.hassUtil.canToggleState = function (hass, stateObj) {
+ var domain = window.hassUtil.computeDomain(stateObj);
+ if (domain === 'group') {
+ return stateObj.state === 'on' || stateObj.state === 'off';
+ }
+
+ return window.hassUtil.canToggleDomain(hass, domain);
+};
+
+window.hassUtil.canToggleDomain = function (hass, domain) {
+ var turnOnService;
+ var services = hass.config.services[domain];
+
+ if (domain === 'lock') {
+ turnOnService = 'lock';
+ } else if (domain === 'cover') {
+ turnOnService = 'open_cover';
+ } else {
+ turnOnService = 'turn_on';
+ }
+
+ return services && turnOnService in services;
};
// Update root's child element to be newElementTag replacing another existing child if any.
@@ -168,22 +188,29 @@ window.hassUtil.relativeTime.tests = [
7, 'day',
];
-window.hassUtil.stateCardType = function (hass, state) {
- if (state.state === 'unavailable') {
+window.hassUtil.stateCardType = function (hass, stateObj) {
+ if (stateObj.state === 'unavailable') {
return 'display';
- } else if (window.hassUtil.DOMAINS_WITH_CARD.indexOf(state.domain) !== -1) {
- return state.domain;
- } else if (window.hassUtil.canToggle(hass, state.entityId) && state.attributes.control !== 'hidden') {
+ }
+
+ var domain = window.hassUtil.computeDomain(stateObj);
+
+ if (window.hassUtil.DOMAINS_WITH_CARD.indexOf(domain) !== -1) {
+ return domain;
+ } else if (window.hassUtil.canToggleState(hass, stateObj) &&
+ stateObj.attributes.control !== 'hidden') {
return 'toggle';
}
return 'display';
};
-window.hassUtil.stateMoreInfoType = function (state) {
- if (window.hassUtil.DOMAINS_WITH_MORE_INFO.indexOf(state.domain) !== -1) {
- return state.domain;
+window.hassUtil.stateMoreInfoType = function (stateObj) {
+ var domain = window.hassUtil.computeDomain(stateObj);
+
+ if (window.hassUtil.DOMAINS_WITH_MORE_INFO.indexOf(domain) !== -1) {
+ return domain;
}
- if (window.hassUtil.HIDE_MORE_INFO.indexOf(state.domain) !== -1) {
+ if (window.hassUtil.HIDE_MORE_INFO.indexOf(domain) !== -1) {
return 'hidden';
}
return 'default';
@@ -318,27 +345,65 @@ window.hassUtil.binarySensorIcon = function (state) {
};
window.hassUtil.stateIcon = function (state) {
- var unit;
-
if (!state) {
return window.hassUtil.DEFAULT_ICON;
} else if (state.attributes.icon) {
return state.attributes.icon;
}
- unit = state.attributes.unit_of_measurement;
+ var unit = state.attributes.unit_of_measurement;
+ var domain = window.hassUtil.computeDomain(state);
- if (unit && state.domain === 'sensor') {
+ if (unit && domain === 'sensor') {
if (unit === '°C' || unit === '°F') {
return 'mdi:thermometer';
} else if (unit === 'Mice') {
return 'mdi:mouse-variant';
}
- } else if (state.domain === 'binary_sensor') {
+ } else if (domain === 'binary_sensor') {
return window.hassUtil.binarySensorIcon(state);
}
- return window.hassUtil.domainIcon(state.domain, state.state);
+ return window.hassUtil.domainIcon(domain, state.state);
+};
+
+window.hassUtil.computeDomain = function (stateObj) {
+ if (!stateObj._domain) {
+ stateObj._domain = window.HAWS.extractDomain(stateObj.entity_id);
+ }
+
+ return stateObj._domain;
+};
+
+window.hassUtil.computeStateName = function (stateObj) {
+ if (!stateObj._entityDisplay) {
+ stateObj._entityDisplay = (
+ stateObj.attributes.friendly_name ||
+ window.HAWS.extractObjectId(stateObj.entity_id)
+ .replace(/_/g, ' '));
+ }
+
+ return stateObj._entityDisplay;
+};
+
+window.hassUtil.computeStateState = function (stateObj) {
+ if (!stateObj._stateDisplay) {
+ stateObj._stateDisplay = stateObj.state.replace(/_/g, ' ');
+
+ if (stateObj.attributes.unit_of_measurement) {
+ stateObj._stateDisplay += ` ${stateObj.attributes.unit_of_measurement}`;
+ }
+ }
+
+ return stateObj._stateDisplay;
+};
+
+window.hassUtil.isComponentLoaded = function (hass, component) {
+ return hass.config.core.components.indexOf(component) !== -1;
+};
+
+window.hassUtil.computeLocationName = function (hass) {
+ return hass.config.core.location_name;
};
diff --git a/src/util/media-player-model.html b/src/util/media-player-model.html
new file mode 100644
index 0000000000..61cfb526a5
--- /dev/null
+++ b/src/util/media-player-model.html
@@ -0,0 +1,195 @@
+
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index ac4be7f7f9..6b0690e49d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -905,10 +905,6 @@ class-extend@^0.1.0, class-extend@^0.1.1:
dependencies:
object-assign "^2.0.0"
-classnames@^2.2.5:
- version "2.2.5"
- resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
-
clean-css@3.4.x:
version "3.4.24"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.24.tgz#89f5a5e9da37ae02394fe049a41388abbe72c3b5"
@@ -2806,9 +2802,9 @@ hoek@2.x.x:
version "2.16.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-home-assistant-js-websocket@0.5.0:
- version "0.5.0"
- resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-0.5.0.tgz#f78b31d160d7bdd083cf53ae01328483e7046ef5"
+home-assistant-js-websocket@^0.7.3:
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/home-assistant-js-websocket/-/home-assistant-js-websocket-0.7.3.tgz#e65ac99b59a0b2c623048457c259808d67030c7f"
homedir-polyfill@^1.0.0:
version "1.0.1"
@@ -2934,10 +2930,6 @@ ignore@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.0.tgz#8d88f03c3002a0ac52114db25d2c673b0bf1e435"
-immutable@^3.8.1:
- version "3.8.1"
- resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2"
-
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -3336,10 +3328,6 @@ keep-alive-agent@^0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz#44847ca394ce8d6b521ae85816bd64509942b385"
-keymirror@^0.1.1:
- version "0.1.1"
- resolved "https://registry.yarnpkg.com/keymirror/-/keymirror-0.1.1.tgz#918889ea13f8d0a42e7c557250eee713adc95c35"
-
kind-of@^3.0.2:
version "3.1.0"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
@@ -3997,12 +3985,6 @@ nth-check@~1.0.0:
dependencies:
boolbase "~1.0.0"
-nuclear-js@^1.4.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/nuclear-js/-/nuclear-js-1.4.0.tgz#6c9c001b0673f0ae9d8f8b188c4da04ed693a7be"
- dependencies:
- immutable "^3.8.1"
-
number-is-nan@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -4027,7 +4009,7 @@ object-assign@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
@@ -5535,9 +5517,9 @@ ternary-stream@^2.0.1:
merge-stream "^1.0.0"
through2 "^2.0.1"
-"test-fixture@github:polymerelements/test-fixture":
+test-fixture@PolymerElements/test-fixture:
version "2.0.1"
- resolved "https://codeload.github.com/polymerelements/test-fixture/tar.gz/f72f0ff4e83b83b0157afed664f560da91d20f31"
+ resolved "https://codeload.github.com/PolymerElements/test-fixture/tar.gz/f72f0ff4e83b83b0157afed664f560da91d20f31"
test-value@^1.1.0:
version "1.1.0"
[[stateObj.stateDisplay]]
+ [[computeStateDisplay(stateObj)]]
-
[[computePrimaryText(stateObj, isPlaying)]]
- [[secondaryText]]
+ [[playerObj.primaryText]]
+ [[playerObj.secondaryText]]