github
/
ha-frontend
mirror of https://github.com/home-assistant/frontend
1
Fork 0
Code Releases Activity

Remove HA instance singleton

This commit is contained in:
Paulus Schoutsen 2016-05-28 01:32:39 -07:00
parent fcb0aa5fb9
commit 4f8e2d5687
67 changed files with 444 additions and 476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cards/ha-badges-card.html
View File

@ -7,7 +7,7 @@
</style>
<template>
<template is='dom-repeat' items='[[states]]'>
<ha-state-label-badge state='[[item]]'></ha-state-label-badge>
<ha-state-label-badge hass='[[hass]]' state='[[item]]'></ha-state-label-badge>
</template>
</template>
</dom-module>

4
src/cards/ha-badges-card.js
View File

@ -6,6 +6,10 @@ export default new Polymer({
is: 'ha-badges-card',
properties: {
hass: {
type: Object,
},
states: {
type: Array,
},

9
src/cards/ha-camera-card.js
View File

@ -1,7 +1,4 @@
import Polymer from '../polymer';
import hass from '../util/home-assistant-js-instance';
const { moreInfoActions } = hass;
const UPDATE_INTERVAL = 10000; // ms
@ -9,6 +6,10 @@ export default new Polymer({
is: 'ha-camera-card',
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
observer: 'updateCameraFeedSrc',
@ -47,7 +48,7 @@ export default new Polymer({
},
cardTapped() {
this.async(() => moreInfoActions.selectEntity(this.stateObj.entityId), 1);
this.async(() => this.hass.moreInfoActions.selectEntity(this.stateObj.entityId), 1);
},
updateCameraFeedSrc(stateObj) {

9
src/cards/ha-entities-card.html
View File

@ -38,13 +38,18 @@
<div class$='[[computeTitleClass(groupEntity)]]' on-tap='entityTapped'>
<div class='flex name'>[[computeTitle(states, groupEntity)]]</div>
<template is='dom-if' if='[[showGroupToggle(groupEntity, states)]]'>
<ha-entity-toggle state-obj='[[groupEntity]]'></ha-entity-toggle>
<ha-entity-toggle
hass='[[hass]]'
state-obj='[[groupEntity]]'></ha-entity-toggle>
</template>
</div>
<div class='states'>
<template is='dom-repeat' items="[[states]]">
<div class='state' on-tap='entityTapped'>
<state-card-content class="state-card" state-obj="[[item]]"></state-card-content>
<state-card-content
hass='[[hass]]'
class="state-card"
state-obj="[[item]]"></state-card-content>
</div>
</template>
</div>

11
src/cards/ha-entities-card.js
View File

@ -1,17 +1,18 @@
import Polymer from '../polymer';
import hass from '../util/home-assistant-js-instance';
import canToggle from '../util/can-toggle';
require('../components/ha-card');
require('../components/entity/ha-entity-toggle');
require('../state-summary/state-card-content');
const { moreInfoActions } = hass;
export default new Polymer({
is: 'ha-entities-card',
properties: {
hass: {
type: Object,
},
states: {
type: Array,
},
@ -45,7 +46,7 @@ export default new Polymer({
} else {
entityId = this.groupEntity.entityId;
}
this.async(() => moreInfoActions.selectEntity(entityId), 1);
this.async(() => this.hass.moreInfoActions.selectEntity(entityId), 1);
},
showGroupToggle(groupEntity, states) {
@ -54,6 +55,6 @@ export default new Polymer({
}
// only show if we can toggle 2+ entities in group
return states.reduce((sum, state) => sum + canToggle(state.entityId), 0) > 1;
return states.reduce((sum, state) => sum + canToggle(this.hass, state.entityId), 0) > 1;
},
});

11
src/cards/ha-media_player-card.js
View File

@ -1,14 +1,15 @@
import classnames from 'classnames';
import Polymer from '../polymer';
import hass from '../util/home-assistant-js-instance';
const { moreInfoActions } = hass;
export default new Polymer({
is: 'ha-media_player-card',
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
},
@ -54,7 +55,7 @@ export default new Polymer({
},
computePlayerObj(stateObj) {
return stateObj.domainModel(hass);
return stateObj.domainModel(this.hass);
},
computePlaybackControlIcon(playerObj) {
@ -77,7 +78,7 @@ export default new Polymer({
handleOpenMoreInfo(ev) {
ev.stopPropagation();
this.async(() => moreInfoActions.selectEntity(this.stateObj.entityId), 1);
this.async(() => this.hass.moreInfoActions.selectEntity(this.stateObj.entityId), 1);
},
handlePlaybackControl(ev) {

12
src/components/entity-list.js
View File

@ -1,20 +1,20 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
const { entityGetters } = hass;
export default new Polymer({
is: 'entity-list',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
entities: {
type: Array,
bindNuclear: [
entityGetters.entityMap,
bindNuclear: hass => [
hass.entityGetters.entityMap,
(map) => map.valueSeq().sortBy((entity) => entity.entityId).toArray(),
],
},

2
src/components/entity/ha-entity-marker.html
View File

@ -31,7 +31,7 @@
</template>
<template is='dom-if' if='[[value]]'>[[value]]</template>
<template is='dom-if' if='[[image]]'>
<iron-image sizing='cover' class='fit'src='[[image]]'></iron-image>
<iron-image sizing='cover' class='fit' src='[[image]]'></iron-image>
</template>
</div>
</template>

16
src/components/entity/ha-entity-marker.js
View File

@ -1,21 +1,19 @@
import Polymer from '../../polymer';
import hass from '../../util/home-assistant-js-instance';
require('../../components/ha-label-badge');
const {
reactor,
entityGetters,
moreInfoActions,
} = hass;
export default new Polymer({
is: 'ha-entity-marker',
properties: {
hass: {
type: Object,
},
entityId: {
type: String,
value: '',
reflectToAttribute: true,
},
state: {
@ -46,12 +44,12 @@ export default new Polymer({
badgeTap(ev) {
ev.stopPropagation();
if (this.entityId) {
this.async(() => moreInfoActions.selectEntity(this.entityId), 1);
this.async(() => window.hass.moreInfoActions.selectEntity(this.entityId), 1);
}
},
computeState(entityId) {
return entityId && reactor.evaluate(entityGetters.byId(entityId));
return entityId && window.hass.reactor.evaluate(window.hass.entityGetters.byId(entityId));
},
computeIcon(state) {

9
src/components/entity/ha-entity-toggle.js
View File

@ -1,14 +1,15 @@
import Polymer from '../../polymer';
import hass from '../../util/home-assistant-js-instance';
import OFF_STATES from '../../util/off-states';
const { serviceActions } = hass;
export default new Polymer({
is: 'ha-entity-toggle',
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
},
@ -89,7 +90,7 @@ export default new Polymer({
service = turnOn ? 'turn_on' : 'turn_off';
}
const call = serviceActions.callService(
const call = this.hass.serviceActions.callService(
domain, service, { entity_id: this.stateObj.entityId });
if (!this.stateObj.attributes.assumed_state) {

11
src/components/entity/ha-state-label-badge.js
View File

@ -1,18 +1,17 @@
import Polymer from '../../polymer';
import hass from '../../util/home-assistant-js-instance';
import domainIcon from '../../util/domain-icon';
import stateIcon from '../../util/state-icon';
require('../../components/ha-label-badge');
const {
moreInfoActions,
} = hass;
export default new Polymer({
is: 'ha-state-label-badge',
properties: {
hass: {
type: Object,
},
state: {
type: Object,
observer: 'stateChanged',
@ -25,7 +24,7 @@ export default new Polymer({
badgeTap(ev) {
ev.stopPropagation();
this.async(() => moreInfoActions.selectEntity(this.state.entityId), 1);
this.async(() => this.hass.moreInfoActions.selectEntity(this.state.entityId), 1);
},
computeClasses(state) {

12
src/components/events-list.js
View File

@ -1,20 +1,20 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
const { eventGetters } = hass;
export default new Polymer({
is: 'events-list',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
events: {
type: Array,
bindNuclear: [
eventGetters.entityMap,
bindNuclear: hass => [
hass.eventGetters.entityMap,
(map) => map.valueSeq().sortBy((event) => event.event).toArray(),
],
},

4
src/components/ha-cards.html
View File

@ -58,7 +58,7 @@
<ha-demo-badge></ha-demo-badge>
</template>
<ha-badges-card states='[[cards.badges]]'></ha-badges-card>
<ha-badges-card states='[[cards.badges]]' hass='[[hass]]'></ha-badges-card>
</div>
</template>
<template is='dom-if' if='[[!cards.badges]]'>
@ -70,7 +70,7 @@
<div class='column flex-1'>
<template is='dom-repeat' items='[[column]]' as='card'>
<div class='zone-card'>
<ha-card-chooser card-data='[[card]]'
<ha-card-chooser card-data='[[card]]' hass='[[hass]]'
></ha-card-chooser>
</div>
</template>

14
src/components/ha-cards.js
View File

@ -1,12 +1,9 @@
import Polymer from '../polymer';
import hass from '../util/home-assistant-js-instance';
require('.//ha-demo-badge');
require('../cards/ha-badges-card');
require('../cards/ha-card-chooser');
const { util } = hass;
// mapping domain to size of the card.
const DOMAINS_WITH_CARD = {
camera: 4,
@ -38,6 +35,10 @@ export default new Polymer({
is: 'ha-cards',
properties: {
hass: {
type: Object,
},
showIntroduction: {
type: Boolean,
value: false,
@ -70,6 +71,7 @@ export default new Polymer({
},
computeCards(columns, states, showIntroduction) {
const hass = this.hass;
const byDomain = states.groupBy(entity => entity.domain);
const hasGroup = {};
@ -137,6 +139,7 @@ export default new Polymer({
if (other.length > 0) {
cards.columns[curIndex].push({
hass,
cardType: 'entities',
states: other,
groupEntity,
@ -145,12 +148,15 @@ export default new Polymer({
owncard.forEach(entity => {
cards.columns[curIndex].push({
hass,
cardType: entity.domain,
stateObj: entity,
});
});
}
const expandGroup = this.hass.util.expandGroup;
byDomain.keySeq().sortBy(domain => getPriority(domain))
.forEach(domain => {
if (domain === 'a') {
@ -167,7 +173,7 @@ export default new Polymer({
} else if (domain === 'group') {
byDomain.get(domain).sortBy(entitySortBy)
.forEach(groupState => {
const entities = util.expandGroup(groupState, states);
const entities = expandGroup(groupState, states);
entities.forEach(entity => { hasGroup[entity.entityId] = true; });
addEntitiesCard(groupState.entityId, entities.toArray(), groupState);
}

2
src/components/ha-sidebar.html
View File

@ -140,7 +140,7 @@
<paper-item class='horizontal layout justified'>
<div class='streaming'>Streaming updates</div>
<stream-status></stream-status>
<stream-status hass='[[hass]]'></stream-status>
</paper-item>
<div class='divider'></div>

23
src/components/ha-sidebar.js
View File

@ -1,23 +1,18 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
require('./stream-status');
const {
configGetters,
navigationGetters,
authActions,
navigationActions,
} = hass;
export default new Polymer({
is: 'ha-sidebar',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
menuShown: {
type: Boolean,
},
@ -32,17 +27,17 @@ export default new Polymer({
selected: {
type: String,
bindNuclear: navigationGetters.activePane,
bindNuclear: hass => hass.navigationGetters.activePane,
},
hasHistoryComponent: {
type: Boolean,
bindNuclear: configGetters.isComponentLoaded('history'),
bindNuclear: hass => hass.configGetters.isComponentLoaded('history'),
},
hasLogbookComponent: {
type: Boolean,
bindNuclear: configGetters.isComponentLoaded('logbook'),
bindNuclear: hass => hass.configGetters.isComponentLoaded('logbook'),
},
},
@ -76,11 +71,11 @@ export default new Polymer({
this.handleLogOut();
return;
}
navigationActions.navigate.apply(null, newChoice.split('/'));
this.hass.navigationActions.navigate.apply(null, newChoice.split('/'));
this.debounce('updateStyles', () => this.updateStyles(), 1);
},
handleLogOut() {
authActions.logOut();
this.hass.authActions.logOut();
},
});

24
src/components/ha-view-tabs.js
View File

@ -1,37 +1,33 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
const {
configGetters,
viewActions,
viewGetters,
} = hass;
export default new Polymer({
is: 'ha-view-tabs',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
locationName: {
type: String,
bindNuclear: configGetters.locationName,
bindNuclear: hass => hass.configGetters.locationName,
},
currentView: {
type: String,
bindNuclear: [
viewGetters.currentView,
bindNuclear: hass => [
hass.viewGetters.currentView,
view => view || '',
],
},
views: {
type: Array,
bindNuclear: [
viewGetters.views,
bindNuclear: hass => [
hass.viewGetters.views,
views => views.valueSeq()
.sortBy(view => view.attributes.order)
.toArray(),
@ -48,7 +44,7 @@ export default new Polymer({
const current = this.currentView || null;
this.expectChange = true;
if (view !== current) {
this.async(() => viewActions.selectView(view), 0);
this.async(() => this.hass.viewActions.selectView(view), 0);
}
},
});

12
src/components/logbook-entry.js
View File

@ -1,18 +1,20 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
require('./domain-icon');
require('./display-time');
require('./relative-ha-datetime');
const { moreInfoActions } = hass;
export default new Polymer({
is: 'logbook-entry',
properties: {
hass: {
type: Object,
},
},
entityClicked(ev) {
ev.preventDefault();
moreInfoActions.selectEntity(this.entryObj.entityId);
this.hass.moreInfoActions.selectEntity(this.entryObj.entityId);
},
});

5
src/components/relative-ha-datetime.js
View File

@ -1,11 +1,8 @@
import moment from 'moment';
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
const UPDATE_INTERVAL = 60000; // 60 seconds
const { util: { parseDateTime } } = hass;
export default new Polymer({
is: 'relative-ha-datetime',
@ -43,7 +40,7 @@ export default new Polymer({
},
datetimeChanged(newVal) {
this.parsedDateTime = newVal ? parseDateTime(newVal) : null;
this.parsedDateTime = newVal ? new Date(newVal) : null;
this.updateRelative();
},

10
src/components/services-list.js
View File

@ -1,21 +1,21 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
require('./domain-icon');
const { serviceGetters } = hass;
export default new Polymer({
is: 'services-list',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
serviceDomains: {
type: Array,
bindNuclear: serviceGetters.entityMap,
bindNuclear: hass => hass.serviceGetters.entityMap,
},
},

16
src/components/stream-status.js
View File

@ -1,32 +1,32 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
const { streamGetters, streamActions } = hass;
export default new Polymer({
is: 'stream-status',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
isStreaming: {
type: Boolean,
bindNuclear: streamGetters.isStreamingEvents,
bindNuclear: hass => hass.streamGetters.isStreamingEvents,
},
hasError: {
type: Boolean,
bindNuclear: streamGetters.hasStreamingEventsError,
bindNuclear: hass => hass.streamGetters.hasStreamingEventsError,
},
},
toggleChanged() {
if (this.isStreaming) {
streamActions.stop();
this.hass.streamActions.stop();
} else {
streamActions.start();
this.hass.streamActions.start();
}
},
});

21
src/dialogs/ha-voice-command-dialog.js
View File

@ -1,19 +1,16 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
const {
voiceActions,
voiceGetters,
} = hass;
export default new Polymer({
is: 'ha-voice-command-dialog',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
dialogOpen: {
type: Boolean,
value: false,
@ -22,22 +19,22 @@ export default new Polymer({
finalTranscript: {
type: String,
bindNuclear: voiceGetters.finalTranscript,
bindNuclear: hass => hass.voiceGetters.finalTranscript,
},
interimTranscript: {
type: String,
bindNuclear: voiceGetters.extraInterimTranscript,
bindNuclear: hass => hass.voiceGetters.extraInterimTranscript,
},
isTransmitting: {
type: Boolean,
bindNuclear: voiceGetters.isTransmitting,
bindNuclear: hass => hass.voiceGetters.isTransmitting,
},
isListening: {
type: Boolean,
bindNuclear: voiceGetters.isListening,
bindNuclear: hass => hass.voiceGetters.isListening,
},
showListenInterface: {
@ -53,7 +50,7 @@ export default new Polymer({
dialogOpenChanged(newVal) {
if (!newVal && this.isListening) {
voiceActions.stop();
this.hass.voiceActions.stop();
}
},

17
src/dialogs/more-info-dialog.html
View File

@ -37,13 +37,18 @@
<template>
<!-- entry-animation='slide-up-animation' exit-animation='slide-down-animation' -->
<paper-dialog id="dialog" with-backdrop opened='{{dialogOpen}}'>
<h2><state-card-content state-obj="[[stateObj]]" in-dialog></state-card-content></h2>
<h2>
<state-card-content
state-obj="[[stateObj]]"
hass='[[hass]]' in-dialog></state-card-content>
</h2>
<paper-dialog-scrollable>
<template is='dom-if' if="[[showHistoryComponent]]">
<state-history-charts state-history="[[stateHistory]]"
is-loading-data="[[isLoadingHistoryData]]"></state-history-charts>
</template>
<more-info-content state-obj="[[stateObj]]"></more-info-content>
<template is='dom-if' if="[[showHistoryComponent]]">
<state-history-charts state-history="[[stateHistory]]"
is-loading-data="[[isLoadingHistoryData]]"></state-history-charts>
</template>
<more-info-content
state-obj="[[stateObj]]" hass='[[hass]]'></more-info-content>
</paper-dialog-scrollable>
</paper-dialog>
</template>

26
src/dialogs/more-info-dialog.js
View File

@ -1,5 +1,3 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
@ -7,14 +5,6 @@ require('../state-summary/state-card-content');
require('../components/state-history-charts');
require('../more-infos/more-info-content');
const {
configGetters,
entityHistoryGetters,
entityHistoryActions,
moreInfoGetters,
moreInfoActions,
} = hass;
const DOMAINS_WITH_NO_HISTORY = ['camera', 'configurator', 'scene'];
export default new Polymer({
@ -25,14 +15,14 @@ export default new Polymer({
properties: {
stateObj: {
type: Object,
bindNuclear: moreInfoGetters.currentEntity,
bindNuclear: hass => hass.moreInfoGetters.currentEntity,
observer: 'stateObjChanged',
},
stateHistory: {
type: Object,
bindNuclear: [
moreInfoGetters.currentEntityHistory,
bindNuclear: hass => [
hass.moreInfoGetters.currentEntityHistory,
(history) => (history ? [history] : false),
],
},
@ -44,18 +34,18 @@ export default new Polymer({
isLoadingEntityHistoryData: {
type: Boolean,
bindNuclear: entityHistoryGetters.isLoadingEntityHistory,
bindNuclear: hass => hass.entityHistoryGetters.isLoadingEntityHistory,
},
hasHistoryComponent: {
type: Boolean,
bindNuclear: configGetters.isComponentLoaded('history'),
bindNuclear: hass => hass.configGetters.isComponentLoaded('history'),
observer: 'fetchHistoryData',
},
shouldFetchHistory: {
type: Boolean,
bindNuclear: moreInfoGetters.isCurrentEntityHistoryStale,
bindNuclear: hass => hass.moreInfoGetters.isCurrentEntityHistoryStale,
observer: 'fetchHistoryData',
},
@ -95,7 +85,7 @@ export default new Polymer({
fetchHistoryData() {
if (this.stateObj && this.hasHistoryComponent &&
this.shouldFetchHistory) {
entityHistoryActions.fetchRecent(this.stateObj.entityId);
this.hass.entityHistoryActions.fetchRecent(this.stateObj.entityId);
}
},
@ -118,7 +108,7 @@ export default new Polymer({
if (newVal) {
this.async(() => { this.delayedDialogOpen = true; }, 10);
} else if (!newVal && this.stateObj) {
this.async(() => moreInfoActions.deselectEntity(), 10);
this.async(() => this.hass.moreInfoActions.deselectEntity(), 10);
this.delayedDialogOpen = false;
}
},

6
src/home-assistant.html
View File

@ -22,12 +22,14 @@
<template>
<template is='dom-if' if='[[!loaded]]'>
<login-form force-show-loading='[[computeForceShowLoading(dataLoaded, iconsLoaded)]]'>
<login-form
hass='[[hass]]'
force-show-loading='[[computeForceShowLoading(dataLoaded, iconsLoaded)]]'>
</login-form>
</template>
<template is='dom-if' if='[[loaded]]'>
<home-assistant-main></home-assistant-main>
<home-assistant-main hass='[[hass]]'></home-assistant-main>
</template>
</template>
</dom-module>

54
src/home-assistant.js
View File

@ -1,20 +1,13 @@
import Polymer from './polymer';
import hass from './util/home-assistant-js-instance';
import HomeAssistant from 'home-assistant-js';
import nuclearObserver from './util/bound-nuclear-behavior';
import validateAuth from './util/validate-auth';
require('./layouts/login-form');
require('./layouts/home-assistant-main');
const {
localStoragePreferences,
navigationActions,
reactor,
startLocalStoragePreferencesSync,
syncGetters,
} = hass;
window.hass = new HomeAssistant();
export default new Polymer({
is: 'home-assistant',
@ -27,6 +20,10 @@ export default new Polymer({
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
value: window.hass,
},
auth: {
type: String,
},
@ -35,7 +32,7 @@ export default new Polymer({
},
dataLoaded: {
type: Boolean,
bindNuclear: syncGetters.isDataLoaded,
bindNuclear: hass => hass.syncGetters.isDataLoaded,
},
iconsLoaded: {
type: Boolean,
@ -65,26 +62,6 @@ export default new Polymer({
},
created() {
this.registerServiceWorker();
},
ready() {
reactor.batch(() => {
// if auth was given, tell the backend
if (this.auth) {
validateAuth(this.auth, false);
} else if (localStoragePreferences.authToken) {
validateAuth(localStoragePreferences.authToken, true);
}
navigationActions.showSidebar(localStoragePreferences.showSidebar);
});
startLocalStoragePreferencesSync();
this.loadIcons();
},
registerServiceWorker() {
if (!('serviceWorker' in navigator)) {
return;
}
@ -97,4 +74,21 @@ export default new Polymer({
}
});
},
ready() {
const hass = this.hass;
hass.reactor.batch(() => {
// if auth was given, tell the backend
if (this.auth) {
validateAuth(this.hass, this.auth, false);
} else if (hass.localStoragePreferences.authToken) {
validateAuth(this.hass, hass.localStoragePreferences.authToken, true);
}
hass.navigationActions.showSidebar(hass.localStoragePreferences.showSidebar);
});
hass.startLocalStoragePreferencesSync();
this.loadIcons();
},
});

26
src/layouts/home-assistant-main.html
View File

@ -18,9 +18,9 @@
<dom-module id='home-assistant-main'>
<template>
<notification-manager></notification-manager>
<more-info-dialog></more-info-dialog>
<ha-voice-command-dialog></ha-voice-command-dialog>
<notification-manager hass='[[hass]]'></notification-manager>
<more-info-dialog hass='[[hass]]'></more-info-dialog>
<ha-voice-command-dialog hass='[[hass]]'></ha-voice-command-dialog>
<iron-media-query query="(max-width: 870px)" query-matches="{{narrow}}">
</iron-media-query>
@ -28,34 +28,34 @@
force-narrow='[[computeForceNarrow(narrow, showSidebar)]]'
responsive-width='0' disable-swipe='[[isSelectedMap]]'
disable-edge-swipe='[[isSelectedMap]]'>
<ha-sidebar drawer narrow='[[narrow]]'></ha-sidebar>
<ha-sidebar drawer narrow='[[narrow]]' hass='[[hass]]'></ha-sidebar>
<template is='dom-if' if='[[isSelectedStates]]'>
<partial-cards main narrow='[[narrow]]' show-menu='[[showSidebar]]'></partial-cards>
<partial-cards main narrow='[[narrow]]' hass='[[hass]]' show-menu='[[showSidebar]]'></partial-cards>
</template>
<template is='dom-if' if='[[isSelectedLogbook]]'>
<partial-logbook main narrow='[[narrow]]' show-menu='[[showSidebar]]'></partial-logbook>
<partial-logbook main narrow='[[narrow]]' hass='[[hass]]' show-menu='[[showSidebar]]'></partial-logbook>
</template>
<template is='dom-if' if='[[isSelectedHistory]]'>
<partial-history main narrow='[[narrow]]' show-menu='[[showSidebar]]'></partial-history>
<partial-history main narrow='[[narrow]]' hass='[[hass]]' show-menu='[[showSidebar]]'></partial-history>
</template>
<template is='dom-if' if='[[isSelectedMap]]'>
<partial-map main narrow='[[narrow]]' show-menu='[[showSidebar]]'></partial-map>
<partial-map main narrow='[[narrow]]' hass='[[hass]]' show-menu='[[showSidebar]]'></partial-map>
</template>
<template is='dom-if' if='[[isSelectedDevService]]'>
<partial-dev-call-service main narrow='[[narrow]]' show-menu='[[showSidebar]]'></partial-dev-call-service>
<partial-dev-call-service main narrow='[[narrow]]' hass='[[hass]]' show-menu='[[showSidebar]]'></partial-dev-call-service>
</template>
<template is='dom-if' if='[[isSelectedDevEvent]]'>
<partial-dev-fire-event main narrow='[[narrow]]' show-menu='[[showSidebar]]'></partial-dev-fire-event>
<partial-dev-fire-event main narrow='[[narrow]]' hass='[[hass]]' show-menu='[[showSidebar]]'></partial-dev-fire-event>
</template>
<template is='dom-if' if='[[isSelectedDevState]]'>
<partial-dev-set-state main narrow='[[narrow]]' show-menu='[[showSidebar]]'></partial-dev-set-state>
<partial-dev-set-state main narrow='[[narrow]]' hass='[[hass]]' show-menu='[[showSidebar]]'></partial-dev-set-state>
</template>
<template is='dom-if' if='[[isSelectedDevTemplate]]'>
<partial-dev-template main narrow='[[narrow]]' show-menu='[[showSidebar]]'></partial-dev-template>
<partial-dev-template main narrow='[[narrow]]' hass='[[hass]]' show-menu='[[showSidebar]]'></partial-dev-template>
</template>
<template is='dom-if' if='[[isSelectedDevInfo]]'>
<partial-dev-info main narrow='[[narrow]]' show-menu='[[showSidebar]]'></partial-dev-info>
<partial-dev-info main narrow='[[narrow]]' hass='[[hass]]' show-menu='[[showSidebar]]'></partial-dev-info>
</template>
</paper-drawer-panel>

47
src/layouts/home-assistant-main.js
View File

@ -1,5 +1,4 @@
import Polymer from '../polymer';
import hass from '../util/home-assistant-js-instance';
import nuclearObserver from '../util/bound-nuclear-behavior';
import removeInitMsg from '../util/remove-init-message';
@ -18,12 +17,12 @@ require('../managers/notification-manager');
require('../dialogs/more-info-dialog');
require('../dialogs/ha-voice-command-dialog');
const {
navigationActions,
navigationGetters,
startUrlSync,
stopUrlSync,
} = hass;
// const {
// navigationActions,
// navigationGetters,
// startUrlSync,
// stopUrlSync,
// } = hass;
export default new Polymer({
is: 'home-assistant-main',
@ -31,6 +30,10 @@ export default new Polymer({
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
narrow: {
type: Boolean,
value: false,
@ -38,58 +41,58 @@ export default new Polymer({
activePane: {
type: String,
bindNuclear: navigationGetters.activePane,
bindNuclear: hass => hass.navigationGetters.activePane,
observer: 'activePaneChanged',
},
isSelectedStates: {
type: Boolean,
bindNuclear: navigationGetters.isActivePane('states'),
bindNuclear: hass => hass.navigationGetters.isActivePane('states'),
},
isSelectedHistory: {
type: Boolean,
bindNuclear: navigationGetters.isActivePane('history'),
bindNuclear: hass => hass.navigationGetters.isActivePane('history'),
},
isSelectedMap: {
type: Boolean,
bindNuclear: navigationGetters.isActivePane('map'),
bindNuclear: hass => hass.navigationGetters.isActivePane('map'),
},
isSelectedLogbook: {
type: Boolean,
bindNuclear: navigationGetters.isActivePane('logbook'),
bindNuclear: hass => hass.navigationGetters.isActivePane('logbook'),
},
isSelectedDevEvent: {
type: Boolean,
bindNuclear: navigationGetters.isActivePane('devEvent'),
bindNuclear: hass => hass.navigationGetters.isActivePane('devEvent'),
},
isSelectedDevState: {
type: Boolean,
bindNuclear: navigationGetters.isActivePane('devState'),
bindNuclear: hass => hass.navigationGetters.isActivePane('devState'),
},
isSelectedDevTemplate: {
type: Boolean,
bindNuclear: navigationGetters.isActivePane('devTemplate'),
bindNuclear: hass => hass.navigationGetters.isActivePane('devTemplate'),
},
isSelectedDevService: {
type: Boolean,
bindNuclear: navigationGetters.isActivePane('devService'),
bindNuclear: hass => hass.navigationGetters.isActivePane('devService'),
},
isSelectedDevInfo: {
type: Boolean,
bindNuclear: navigationGetters.isActivePane('devInfo'),
bindNuclear: hass => hass.navigationGetters.isActivePane('devInfo'),
},
showSidebar: {
type: Boolean,
bindNuclear: navigationGetters.showSidebar,
bindNuclear: hass => hass.navigationGetters.showSidebar,
},
},
@ -102,14 +105,14 @@ export default new Polymer({
if (this.narrow) {
this.$.drawer.openDrawer();
} else {
navigationActions.showSidebar(true);
this.hass.navigationActions.showSidebar(true);
}
},
closeMenu() {
this.$.drawer.closeDrawer();
if (this.showSidebar) {
navigationActions.showSidebar(false);
this.hass.navigationActions.showSidebar(false);
}
},
@ -121,7 +124,7 @@ export default new Polymer({
attached() {
removeInitMsg();
startUrlSync();
this.hass.startUrlSync();
},
computeForceNarrow(narrow, showSidebar) {
@ -129,6 +132,6 @@ export default new Polymer({
},
detached() {
stopUrlSync();
this.hass.stopUrlSync();
},
});

16
src/layouts/login-form.js
View File

@ -1,33 +1,33 @@
import Polymer from '../polymer';
import hass from '../util/home-assistant-js-instance';
import nuclearObserver from '../util/bound-nuclear-behavior';
import validateAuth from '../util/validate-auth';
import removeInitMsg from '../util/remove-init-message';
const { authGetters } = hass;
export default new Polymer({
is: 'login-form',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
errorMessage: {
type: String,
bindNuclear: authGetters.attemptErrorMessage,
bindNuclear: hass => hass.authGetters.attemptErrorMessage,
},
isInvalid: {
type: Boolean,
bindNuclear: authGetters.isInvalidAttempt,
bindNuclear: hass => hass.authGetters.isInvalidAttempt,
},
isValidating: {
type: Boolean,
observer: 'isValidatingChanged',
bindNuclear: authGetters.isValidating,
bindNuclear: hass => hass.authGetters.isValidating,
},
loadingResources: {
@ -89,6 +89,6 @@ export default new Polymer({
validatePassword() {
this.$.hideKeyboardOnFocus.focus();
validateAuth(this.$.passwordInput.value, this.$.rememberLogin.checked);
validateAuth(this.hass, this.$.passwordInput.value, this.$.rememberLogin.checked);
},
});

4
src/layouts/partial-cards.html
View File

@ -65,14 +65,14 @@
<template is='dom-if' if='[[hasViews]]'>
<div class='fit bottom views'>
<ha-view-tabs on-view-tapped='scrollToTop'></ha-view-tabs>
<ha-view-tabs hass='[[hass]]' on-view-tapped='scrollToTop'></ha-view-tabs>
</div>
</template>
</paper-toolbar>
<ha-cards
show-introduction='[[computeShowIntroduction(currentView, introductionLoaded, states)]]'
states='[[states]]' columns='[[columns]]'></ha-cards>
states='[[states]]' columns='[[columns]]' hass='[[hass]]'></ha-cards>
</paper-header-panel>
</template>

44
src/layouts/partial-cards.js
View File

@ -1,5 +1,3 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
@ -7,22 +5,16 @@ require('./partial-base');
require('../components/ha-cards');
require('../components/ha-view-tabs');
const {
configGetters,
viewGetters,
voiceGetters,
streamGetters,
syncGetters,
syncActions,
voiceActions,
} = hass;
export default new Polymer({
is: 'partial-cards',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
narrow: {
type: Boolean,
value: false,
@ -30,31 +22,31 @@ export default new Polymer({
isFetching: {
type: Boolean,
bindNuclear: syncGetters.isFetching,
bindNuclear: hass => hass.syncGetters.isFetching,
},
isStreaming: {
type: Boolean,
bindNuclear: streamGetters.isStreamingEvents,
bindNuclear: hass => hass.streamGetters.isStreamingEvents,
},
canListen: {
type: Boolean,
bindNuclear: [
voiceGetters.isVoiceSupported,
configGetters.isComponentLoaded('conversation'),
bindNuclear: hass => [
hass.voiceGetters.isVoiceSupported,
hass.configGetters.isComponentLoaded('conversation'),
(isVoiceSupported, componentLoaded) => isVoiceSupported && componentLoaded,
],
},
introductionLoaded: {
type: Boolean,
bindNuclear: configGetters.isComponentLoaded('introduction'),
bindNuclear: hass => hass.configGetters.isComponentLoaded('introduction'),
},
locationName: {
type: String,
bindNuclear: configGetters.locationName,
bindNuclear: hass => hass.configGetters.locationName,
},
showMenu: {
@ -65,23 +57,23 @@ export default new Polymer({
currentView: {
type: String,
bindNuclear: [
viewGetters.currentView,
bindNuclear: hass => [
hass.viewGetters.currentView,
view => view || '',
],
},
hasViews: {
type: Boolean,
bindNuclear: [
viewGetters.views,
bindNuclear: hass => [
hass.viewGetters.views,
views => views.size > 0,
],
},
states: {
type: Object,
bindNuclear: viewGetters.currentViewEntities,
bindNuclear: hass => hass.viewGetters.currentViewEntities,
},
columns: {
@ -136,11 +128,11 @@ export default new Polymer({
},
handleRefresh() {
syncActions.fetchAll();
this.hass.syncActions.fetchAll();
},
handleListenClick() {
voiceActions.listen();
this.hass.voiceActions.listen();
},
headerScrollAdjust(ev) {

22
src/layouts/partial-dev-call-service.js
View File

@ -1,20 +1,16 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
require('./partial-base');
require('../components/services-list');
const {
reactor,
serviceActions,
serviceGetters,
} = hass;
export default new Polymer({
is: 'partial-dev-call-service',
properties: {
hass: {
type: Object,
},
narrow: {
type: Boolean,
value: false,
@ -42,13 +38,13 @@ export default new Polymer({
description: {
type: String,
computed: 'computeDescription(domain, service)',
computed: 'computeDescription(hass, domain, service)',
},
},
computeDescription(domain, service) {
return reactor.evaluate([
serviceGetters.entityMap,
computeDescription(hass, domain, service) {
return hass.reactor.evaluate([
hass.serviceGetters.entityMap,
map => (map.has(domain) && map.get(domain).get('services').has(service) ?
JSON.stringify(map.get(domain).get('services').get(service).toJS(), null, 2) :
'No description available'),
@ -71,7 +67,7 @@ export default new Polymer({
return;
}
serviceActions.callService(this.domain, this.service, serviceData);
this.hass.serviceActions.callService(this.domain, this.service, serviceData);
},
computeFormClasses(narrow) {

10
src/layouts/partial-dev-fire-event.js
View File

@ -1,16 +1,16 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
require('./partial-base');
require('../components/events-list');
const { eventActions } = hass;
export default new Polymer({
is: 'partial-dev-fire-event',
properties: {
hass: {
type: Object,
},
narrow: {
type: Boolean,
value: false,
@ -48,7 +48,7 @@ export default new Polymer({
return;
}
eventActions.fireEvent(this.eventType, eventData);
this.hass.eventActions.fireEvent(this.eventType, eventData);
},
computeFormClasses(narrow) {

15
src/layouts/partial-dev-info.js
View File

@ -1,21 +1,18 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
require('./partial-base');
const {
configGetters,
errorLogActions,
} = hass;
export default new Polymer({
is: 'partial-dev-info',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
narrow: {
type: Boolean,
value: false,
@ -28,7 +25,7 @@ export default new Polymer({
hassVersion: {
type: String,
bindNuclear: configGetters.serverVersion,
bindNuclear: hass => hass.configGetters.serverVersion,
},
polymerVersion: {
@ -56,7 +53,7 @@ export default new Polymer({
this.errorLog = 'Loading error log…';
errorLogActions.fetchErrorLog().then(
this.hass.errorLogActions.fetchErrorLog().then(
log => { this.errorLog = log || 'No errors have been reported.'; });
},
});

12
src/layouts/partial-dev-set-state.js
View File

@ -1,16 +1,16 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
require('./partial-base');
require('../components/entity-list');
const { reactor, entityGetters, entityActions } = hass;
export default new Polymer({
is: 'partial-dev-set-state',
properties: {
hass: {
type: Object,
},
narrow: {
type: Boolean,
value: false,
@ -47,7 +47,7 @@ export default new Polymer({
},
entitySelected(ev) {
const state = reactor.evaluate(entityGetters.byId(ev.detail.entityId));
const state = this.hass.reactor.evaluate(this.hass.entityGetters.byId(ev.detail.entityId));
this.entityId = state.entityId;
this.state = state.state;
@ -65,7 +65,7 @@ export default new Polymer({
return;
}
entityActions.save({
this.hass.entityActions.save({
entityId: this.entityId,
state: this.state,
attributes: attr,

12
src/layouts/partial-dev-template.js
View File

@ -1,20 +1,18 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
require('./partial-base');
const {
templateActions,
} = hass;
export default new Polymer({
is: 'partial-dev-template',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
narrow: {
type: Boolean,
value: false,
@ -84,7 +82,7 @@ export default new Polymer({
renderTemplate() {
this.rendering = true;
templateActions.render(this.template).then(processed => {
this.hass.templateActions.render(this.template).then(processed => {
this.processed = processed;
this.rendering = false;
}, error => {

25
src/layouts/partial-history.js
View File

@ -1,22 +1,19 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
require('./partial-base');
require('../components/state-history-charts');
const {
entityHistoryGetters,
entityHistoryActions,
} = hass;
export default new Polymer({
is: 'partial-history',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
narrow: {
type: Boolean,
},
@ -28,35 +25,35 @@ export default new Polymer({
isDataLoaded: {
type: Boolean,
bindNuclear: entityHistoryGetters.hasDataForCurrentDate,
bindNuclear: hass => hass.entityHistoryGetters.hasDataForCurrentDate,
observer: 'isDataLoadedChanged',
},
stateHistory: {
type: Object,
bindNuclear: entityHistoryGetters.entityHistoryForCurrentDate,
bindNuclear: hass => hass.entityHistoryGetters.entityHistoryForCurrentDate,
},
isLoadingData: {
type: Boolean,
bindNuclear: entityHistoryGetters.isLoadingEntityHistory,
bindNuclear: hass => hass.entityHistoryGetters.isLoadingEntityHistory,
},
selectedDate: {
type: String,
value: null,
bindNuclear: entityHistoryGetters.currentDate,
bindNuclear: hass => hass.entityHistoryGetters.currentDate,
},
},
isDataLoadedChanged(newVal) {
if (!newVal) {
this.async(() => entityHistoryActions.fetchSelectedDate(), 1);
this.async(() => this.hass.entityHistoryActions.fetchSelectedDate(), 1);
}
},
handleRefreshClick() {
entityHistoryActions.fetchSelectedDate();
this.hass.entityHistoryActions.fetchSelectedDate();
},
datepickerFocus() {
@ -66,7 +63,7 @@ export default new Polymer({
attached() {
this.datePicker = new window.Pikaday({
field: this.$.datePicker.inputElement,
onSelect: entityHistoryActions.changeCurrentDate,
onSelect: this.hass.entityHistoryActions.changeCurrentDate,
});
},

24
src/layouts/partial-logbook.js
View File

@ -1,5 +1,3 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
@ -7,14 +5,16 @@ require('./partial-base');
require('../components/ha-logbook');
require('../components/loading-box');
const { logbookGetters, logbookActions } = hass;
export default new Polymer({
is: 'partial-logbook',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
narrow: {
type: Boolean,
value: false,
@ -27,24 +27,24 @@ export default new Polymer({
selectedDate: {
type: String,
bindNuclear: logbookGetters.currentDate,
bindNuclear: hass => hass.logbookGetters.currentDate,
},
isLoading: {
type: Boolean,
bindNuclear: logbookGetters.isLoadingEntries,
bindNuclear: hass => hass.logbookGetters.isLoadingEntries,
},
isStale: {
type: Boolean,
bindNuclear: logbookGetters.isCurrentStale,
bindNuclear: hass => hass.logbookGetters.isCurrentStale,
observer: 'isStaleChanged',
},
entries: {
type: Array,
bindNuclear: [
logbookGetters.currentEntries,
bindNuclear: hass => [
hass.logbookGetters.currentEntries,
(entries) => entries.reverse().toArray(),
],
},
@ -56,12 +56,12 @@ export default new Polymer({
isStaleChanged(newVal) {
if (newVal) {
this.async(() => logbookActions.fetchDate(this.selectedDate), 1);
this.async(() => this.hass.logbookActions.fetchDate(this.selectedDate), 1);
}
},
handleRefresh() {
logbookActions.fetchDate(this.selectedDate);
this.hass.logbookActions.fetchDate(this.selectedDate);
},
datepickerFocus() {
@ -71,7 +71,7 @@ export default new Polymer({
attached() {
this.datePicker = new window.Pikaday({
field: this.$.datePicker.inputElement,
onSelect: logbookActions.changeCurrentDate,
onSelect: this.hass.logbookActions.changeCurrentDate,
});
},

3
src/layouts/partial-map.html
View File

@ -62,7 +62,8 @@
<template is='dom-repeat' items='[[locationEntities]]'>
<leaflet-divicon id="[[item.entityId]]" icon-height="45" icon-width="45">
<ha-entity-marker entity-id$="[[item.entityId]]"></ha-entity-marker>
<ha-entity-marker hass='[[hass]]'
entity-id="[[item.entityId]]"></ha-entity-marker>
</leaflet-divicon>
<leaflet-marker latitude="[[item.attributes.latitude]]" icon="[[item.entityId]]"

23
src/layouts/partial-map.js
View File

@ -1,15 +1,8 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
require('../components/entity/ha-entity-marker');
const {
configGetters,
entityGetters,
} = hass;
window.L.Icon.Default.imagePath = '/static/images/leaflet';
export default new Polymer({
@ -18,20 +11,24 @@ export default new Polymer({
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
locationGPS: {
type: Number,
bindNuclear: configGetters.locationGPS,
bindNuclear: hass => hass.configGetters.locationGPS,
},
locationName: {
type: String,
bindNuclear: configGetters.locationName,
bindNuclear: hass => hass.configGetters.locationName,
},
locationEntities: {
type: Array,
bindNuclear: [
entityGetters.visibleEntityMap,
bindNuclear: hass => [
hass.entityGetters.visibleEntityMap,
entities => entities.valueSeq().filter(
entity => entity.attributes.latitude && entity.state !== 'home'
).toArray(),
@ -40,8 +37,8 @@ export default new Polymer({
zoneEntities: {
type: Array,
bindNuclear: [
entityGetters.entityMap,
bindNuclear: hass => [
hass.entityGetters.entityMap,
entities => entities.valueSeq()
.filter(entity => entity.domain === 'zone' &&
!entity.attributes.passive)

10
src/managers/notification-manager.js
View File

@ -1,16 +1,16 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
const { notificationGetters } = hass;
export default new Polymer({
is: 'notification-manager',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
// Otherwise we cannot close a modal when a notification is being shown.
neg: {
type: Boolean,
@ -19,7 +19,7 @@ export default new Polymer({
text: {
type: String,
bindNuclear: notificationGetters.lastNotificationMessage,
bindNuclear: hass => hass.notificationGetters.lastNotificationMessage,
observer: 'showNotification',
},
},

10
src/more-infos/more-info-alarm_control_panel.js
View File

@ -1,9 +1,5 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
const { serviceActions } = hass;
export default new Polymer({
is: 'more-info-alarm_control_panel',
handleDisarmTap() {
@ -16,6 +12,10 @@ export default new Polymer({
this.callService('alarm_arm_away', { code: this.enteredCode });
},
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
observer: 'stateObjChanged',
@ -83,6 +83,6 @@ export default new Polymer({
callService(service, data) {
const serviceData = data || {};
serviceData.entity_id = this.stateObj.entityId;
serviceActions.callService('alarm_control_panel', service, serviceData);
this.hass.serviceActions.callService('alarm_control_panel', service, serviceData);
},
});

14
src/more-infos/more-info-configurator.js
View File

@ -1,16 +1,8 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
require('../components/loading-box');
const {
streamGetters,
syncActions,
serviceActions,
} = hass;
export default new Polymer({
is: 'more-info-configurator',
@ -28,7 +20,7 @@ export default new Polymer({
isStreaming: {
type: Boolean,
bindNuclear: streamGetters.isStreamingEvents,
bindNuclear: hass => hass.streamGetters.isStreamingEvents,
},
isConfigurable: {
@ -72,12 +64,12 @@ export default new Polymer({
fields: this.fieldInput,
};
serviceActions.callService('configurator', 'configure', data).then(
this.hass.serviceActions.callService('configurator', 'configure', data).then(
() => {
this.isConfiguring = false;
if (!this.isStreaming) {
syncActions.fetchAll();
this.hass.syncActions.fetchAll();
}
},
() => {

7
src/more-infos/more-info-content.js
View File

@ -21,6 +21,10 @@ export default new Polymer({
is: 'more-info-content',
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
observer: 'stateObjChanged',
@ -31,6 +35,7 @@ export default new Polymer({
if (!stateObj) return;
dynamicContentUpdater(
this, `MORE-INFO-${stateMoreInfoType(stateObj).toUpperCase()}`, { stateObj });
this, `MORE-INFO-${stateMoreInfoType(stateObj).toUpperCase()}`,
{ hass: this.hass, stateObj });
},
});

2
src/more-infos/more-info-group.html
View File

@ -17,7 +17,7 @@
<div id="groupedControlDetails"></div>
<template is='dom-repeat' items="[[states]]" as='state'>
<div class='child-card'>
<state-card-content state-obj="[[state]]"></state-card-content>
<state-card-content state-obj="[[state]]" hass='[[hass]]'></state-card-content>
</div>
</template>
</template>

17
src/more-infos/more-info-group.js
View File

@ -1,4 +1,3 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import nuclearObserver from '../util/bound-nuclear-behavior';
import dynamicContentUpdater from '../util/dynamic-content-updater';
@ -6,27 +5,25 @@ import stateMoreInfoType from '../util/state-more-info-type';
require('../state-summary/state-card-content');
const {
entityGetters,
moreInfoGetters,
} = hass;
export default new Polymer({
is: 'more-info-group',
behaviors: [nuclearObserver],
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
},
states: {
type: Array,
bindNuclear: [
moreInfoGetters.currentEntity,
entityGetters.entityMap,
bindNuclear: hass => [
hass.moreInfoGetters.currentEntity,
hass.entityGetters.entityMap,
(currentEntity, entities) => {
// weird bug??
if (!currentEntity) {

9
src/more-infos/more-info-hvac.js
View File

@ -1,9 +1,6 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import attributeClassNames from '../util/attribute-class-names';
const { serviceActions } = hass;
const ATTRIBUTE_CLASSES = [
'away_mode',
'aux_heat',
@ -18,6 +15,10 @@ export default new Polymer({
is: 'more-info-hvac',
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
observer: 'stateObjChanged',
@ -154,7 +155,7 @@ export default new Polymer({
/* eslint-disable no-param-reassign */
data.entity_id = this.stateObj.entityId;
/* eslint-enable no-param-reassign */
serviceActions.callService('hvac', service, data)
this.hass.serviceActions.callService('hvac', service, data)
.then(() => this.stateObjChanged(this.stateObj));
},
});

21
src/more-infos/more-info-light.js
View File

@ -1,15 +1,12 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import attributeClassNames from '../util/attribute-class-names';
require('../components/ha-color-picker');
const { serviceActions } = hass;
const ATTRIBUTE_CLASSES = ['brightness', 'rgb_color', 'color_temp'];
function pickColor(entityId, color) {
serviceActions.callService('light', 'turn_on', {
function pickColor(hass, entityId, color) {
hass.serviceActions.callService('light', 'turn_on', {
entity_id: entityId,
rgb_color: [color.r, color.g, color.b],
});
@ -19,6 +16,10 @@ export default new Polymer({
is: 'more-info-light',
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
observer: 'stateObjChanged',
@ -54,9 +55,9 @@ export default new Polymer({
if (isNaN(bri)) return;
if (bri === 0) {
serviceActions.callTurnOff(this.stateObj.entityId);
this.hass.serviceActions.callTurnOff(this.stateObj.entityId);
} else {
serviceActions.callService('light', 'turn_on', {
this.hass.serviceActions.callService('light', 'turn_on', {
entity_id: this.stateObj.entityId,
brightness: bri,
});
@ -68,7 +69,7 @@ export default new Polymer({
if (isNaN(ct)) return;
serviceActions.callService('light', 'turn_on', {
this.hass.serviceActions.callService('light', 'turn_on', {
entity_id: this.stateObj.entityId,
color_temp: ct,
});
@ -86,14 +87,14 @@ export default new Polymer({
this.color = ev.detail.rgb;
pickColor(this.stateObj.entityId, this.color);
pickColor(this.hass, this.stateObj.entityId, this.color);
this.colorChanged = false;
this.skipColorPicked = true;
this.colorDebounce = setTimeout(() => {
if (this.colorChanged) {
pickColor(this.stateObj.entityId, this.color);
pickColor(this.hass, this.stateObj.entityId, this.color);
}
this.skipColorPicked = false;
}, 500);

10
src/more-infos/more-info-lock.js
View File

@ -1,12 +1,12 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
const { serviceActions } = hass;
export default new Polymer({
is: 'more-info-lock',
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
observer: 'stateObjChanged',
@ -35,6 +35,6 @@ export default new Polymer({
callService(service, data) {
const serviceData = data || {};
serviceData.entity_id = this.stateObj.entityId;
serviceActions.callService('lock', service, serviceData);
this.hass.serviceActions.callService('lock', service, serviceData);
},
});

9
src/more-infos/more-info-media_player.js
View File

@ -1,15 +1,16 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import attributeClassNames from '../util/attribute-class-names';
const { serviceActions } = hass;
const ATTRIBUTE_CLASSES = ['volume_level'];
export default new Polymer({
is: 'more-info-media_player',
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
observer: 'stateObjChanged',
@ -232,6 +233,6 @@ export default new Polymer({
callService(service, data) {
const serviceData = data || {};
serviceData.entity_id = this.stateObj.entityId;
serviceActions.callService('media_player', service, serviceData);
this.hass.serviceActions.callService('media_player', service, serviceData);
},
});

7
src/more-infos/more-info-sun.js
View File

@ -1,10 +1,7 @@
import Polymer from '../polymer';
import hass from '../util/home-assistant-js-instance';
import formatTime from '../util/format-time';
const { util: { parseDateTime } } = hass;
export default new Polymer({
is: 'more-info-sun',
@ -25,11 +22,11 @@ export default new Polymer({
},
computeRising(stateObj) {
return parseDateTime(stateObj.attributes.next_rising);
return new Date(stateObj.attributes.next_rising);
},
computeSetting(stateObj) {
return parseDateTime(stateObj.attributes.next_setting);
return new Date(stateObj.attributes.next_setting);
},
computeOrder(risingDate, settingDate) {

11
src/more-infos/more-info-thermostat.js
View File

@ -1,15 +1,16 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
import attributeClassNames from '../util/attribute-class-names';
const { serviceActions } = hass;
const ATTRIBUTE_CLASSES = ['away_mode'];
export default new Polymer({
is: 'more-info-thermostat',
properties: {
hass: {
type: Object,
},
stateObj: {
type: Object,
observer: 'stateObjChanged',
@ -45,7 +46,7 @@ export default new Polymer({
},
targetTemperatureSliderChanged(ev) {
serviceActions.callService('thermostat', 'set_temperature', {
this.hass.serviceActions.callService('thermostat', 'set_temperature', {
entity_id: this.stateObj.entityId,
temperature: ev.target.value,
});
@ -66,7 +67,7 @@ export default new Polymer({
// with the state. It will be out of sync if our service call did not
// result in the entity to be turned on. Since the state is not changing,
// the resync is not called automatic.
serviceActions.callService(
this.hass.serviceActions.callService(
'thermostat', 'set_away_mode',
{ away_mode: awayMode, entity_id: this.stateObj.entityId })

11
src/state-summary/state-card-content.js
View File

@ -20,6 +20,10 @@ export default new Polymer({
is: 'state-card-content',
properties: {
hass: {
type: Object,
},
inDialog: {
type: Boolean,
value: false,
@ -31,13 +35,14 @@ export default new Polymer({
},
observers: [
'inputChanged(inDialog, stateObj)',
'inputChanged(hass, inDialog, stateObj)',
],
inputChanged(inDialog, stateObj) {
inputChanged(hass, inDialog, stateObj) {
if (!stateObj) return;
dynamicContentUpdater(
this, `STATE-CARD-${stateCardType(stateObj).toUpperCase()}`, { stateObj, inDialog });
this, `STATE-CARD-${stateCardType(this.hass, stateObj).toUpperCase()}`,
{ hass, stateObj, inDialog });
},
});

9
src/state-summary/state-card-input_select.js
View File

@ -1,14 +1,15 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
require('../components/state-info');
const { serviceActions } = hass;
export default new Polymer({
is: 'state-card-input_select',
properties: {
hass: {
type: Object,
},
inDialog: {
type: Boolean,
value: false,
@ -33,7 +34,7 @@ export default new Polymer({
if (option === '' || option === this.stateObj.state) {
return;
}
serviceActions.callService('input_select', 'select_option', {
this.hass.serviceActions.callService('input_select', 'select_option', {
option,
entity_id: this.stateObj.entityId,
});

9
src/state-summary/state-card-input_slider.js
View File

@ -1,14 +1,15 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
require('../components/state-info');
const { serviceActions } = hass;
export default new Polymer({
is: 'state-card-input_slider',
properties: {
hass: {
type: Object,
},
inDialog: {
type: Boolean,
value: false,
@ -41,7 +42,7 @@ export default new Polymer({
if (this.value === Number(this.stateObj.state)) {
return;
}
serviceActions.callService('input_slider', 'select_value', {
this.hass.serviceActions.callService('input_slider', 'select_value', {
value: this.value,
entity_id: this.stateObj.entityId,
});

20
src/state-summary/state-card-rollershutter.js
View File

@ -1,15 +1,15 @@
import hass from '../util/home-assistant-js-instance';
import Polymer from '../polymer';
require('../components/state-info');
const { serviceActions } = hass;
export default new Polymer({
is: 'state-card-rollershutter',
properties: {
hass: {
type: Object,
},
inDialog: {
type: Boolean,
value: false,
@ -29,17 +29,17 @@ export default new Polymer({
},
onMoveUpTap() {
serviceActions.callService('rollershutter', 'move_up',
{ entity_id: this.stateObj.entityId });
this.hass.serviceActions.callService('rollershutter', 'move_up',
{ entity_id: this.stateObj.entityId });
},
onMoveDownTap() {
serviceActions.callService('rollershutter', 'move_down',
{ entity_id: this.stateObj.entityId });
this.hass.serviceActions.callService('rollershutter', 'move_down',
{ entity_id: this.stateObj.entityId });
},
onStopTap() {
serviceActions.callService('rollershutter', 'stop',
{ entity_id: this.stateObj.entityId });
this.hass.serviceActions.callService('rollershutter', 'stop',
{ entity_id: this.stateObj.entityId });
},
});

9
src/state-summary/state-card-scene.js
View File

@ -1,14 +1,15 @@
import Polymer from '../polymer';
import hass from '../util/home-assistant-js-instance';
require('../components/state-info.js');
const { serviceActions } = hass;
export default new Polymer({
is: 'state-card-scene',
properties: {
hass: {
type: Object,
},
inDialog: {
type: Boolean,
value: false,
@ -21,6 +22,6 @@ export default new Polymer({
activateScene(ev) {
ev.stopPropagation();
serviceActions.callTurnOn(this.stateObj.entityId);
this.hass.serviceActions.callTurnOn(this.stateObj.entityId);
},
});

2
src/state-summary/state-card-script.html
View File

@ -19,7 +19,7 @@
<div class='horizontal justified layout'>
<state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
<template is='dom-if' if='[[stateObj.attributes.can_cancel]]'>
<ha-entity-toggle state-obj='[[stateObj]]'></ha-entity-toggle>
<ha-entity-toggle state-obj='[[stateObj]]' hass='[[hass]]'></ha-entity-toggle>
</template>
<template is='dom-if' if='[[!stateObj.attributes.can_cancel]]'>
<paper-button on-tap='fireScript'>ACTIVATE</paper-button>

5
src/state-summary/state-card-script.js
View File

@ -1,11 +1,8 @@
import Polymer from '../polymer';
import hass from '../util/home-assistant-js-instance';
require('../components/state-info');
require('../components/entity/ha-entity-toggle');
const { serviceActions } = hass;
export default new Polymer({
is: 'state-card-script',
@ -22,6 +19,6 @@ export default new Polymer({
fireScript(ev) {
ev.stopPropagation();
serviceActions.callTurnOn(this.stateObj.entityId);
this.hass.serviceActions.callTurnOn(this.stateObj.entityId);
},
});

2
src/state-summary/state-card-toggle.html
View File

@ -13,7 +13,7 @@
<template>
<div class='horizontal justified layout'>
<state-info state-obj="[[stateObj]]" in-dialog='[[inDialog]]'></state-info>
<ha-entity-toggle state-obj="[[stateObj]]"></ha-entity-toggle>
<ha-entity-toggle state-obj="[[stateObj]]" hass='[[hass]]'></ha-entity-toggle>
</div>
</template>

4
src/util/bound-nuclear-behavior.js
View File

@ -1,5 +1,3 @@
import hass from './home-assistant-js-instance';
import nuclearObserver from './nuclear-behavior';
export default nuclearObserver(hass.reactor);
export default nuclearObserver;

11
src/util/can-toggle.js
View File

@ -1,11 +1,4 @@
import hass from './home-assistant-js-instance';
const {
reactor,
serviceGetters,
} = hass;
// Return boolean if entity can be toggled.
export default function canToggle(entityId) {
return reactor.evaluate(serviceGetters.canToggleEntity(entityId));
export default function canToggle(hass, entityId) {
return hass.reactor.evaluate(hass.serviceGetters.canToggleEntity(entityId));
}

3
src/util/home-assistant-js-instance.js
View File

@ -1,3 +0,0 @@
import HomeAssistant from 'home-assistant-js';
export default new HomeAssistant();

63
src/util/nuclear-behavior.js
View File

@ -1,29 +1,42 @@
export default function NuclearObserver(reactor) {
return {
export default {
attached() {
this.nuclearUnwatchFns = Object.keys(this.properties).reduce(
(unwatchFns, key) => {
if (!('bindNuclear' in this.properties[key])) {
return unwatchFns;
}
const getter = this.properties[key].bindNuclear;
if (!getter) {
throw new Error(`Undefined getter specified for key ${key}`);
}
this[key] = reactor.evaluate(getter);
attached() {
const hass = this.hass;
return unwatchFns.concat(reactor.observe(getter, (val) => {
this[key] = val;
}));
}, []);
},
if (!hass) {
throw new Error(`No hass property found on ${this.nodeName}`);
}
detached() {
while (this.nuclearUnwatchFns.length) {
this.nuclearUnwatchFns.shift()();
}
},
this.nuclearUnwatchFns = Object.keys(this.properties).reduce(
(unwatchFns, key) => {
if (!('bindNuclear' in this.properties[key])) {
return unwatchFns;
}
};
}
let getter = this.properties[key].bindNuclear;
if (typeof getter !== 'function') {
console.warn(`Component ${this.nodeName} uses old style bindNuclear`);
} else {
getter = getter(hass);
}
if (!getter) {
throw new Error(`Undefined getter specified for key ${key}`);
}
this[key] = hass.reactor.evaluate(getter);
return unwatchFns.concat(hass.reactor.observe(getter, (val) => {
this[key] = val;
}));
}, []);
},
detached() {
while (this.nuclearUnwatchFns.length) {
this.nuclearUnwatchFns.shift()();
}
},
};

4
src/util/state-card-type.js
View File

@ -13,12 +13,12 @@ const DOMAINS_WITH_CARD = [
'weblink',
];
export default function stateCardType(state) {
export default function stateCardType(hass, state) {
if (state.state === 'unavailable') {
return 'display';
} else if (DOMAINS_WITH_CARD.indexOf(state.domain) !== -1) {
return state.domain;
} else if (canToggle(state.entityId)) {
} else if (canToggle(hass, state.entityId)) {
return 'toggle';
}
return 'display';

6
src/util/state-icon.js
View File

@ -1,8 +1,5 @@
import defaultIcon from './default-icon';
import domainIcon from './domain-icon.js';
import hass from './home-assistant-js-instance';
const { util: { temperatureUnits } } = hass;
function binarySensorIcon(state) {
const activated = state.state && state.state === 'off';
@ -42,8 +39,7 @@ export default function stateIcon(state) {
const unit = state.attributes.unit_of_measurement;
if (unit && state.domain === 'sensor') {
if (unit === temperatureUnits.UNIT_TEMP_C ||
unit === temperatureUnits.UNIT_TEMP_F) {
if (unit === '°C' || unit === '°F') {
return 'mdi:thermometer';
} else if (unit === 'Mice') {
return 'mdi:mouse-variant';

10
src/util/validate-auth.js
View File

@ -1,10 +1,6 @@
import hass from '../util/home-assistant-js-instance';
const { authActions, localStoragePreferences } = hass;
export default function (authToken, rememberAuth) {
authActions.validate(authToken, {
export default function (hass, authToken, rememberAuth) {
hass.authActions.validate(authToken, {
rememberAuth,
useStreaming: localStoragePreferences.useStreaming,
useStreaming: hass.localStoragePreferences.useStreaming,
});
}