From 7e0ff14f281e067ec518c07699a29afc1106773d Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 19 Sep 2018 11:11:00 +0200 Subject: [PATCH] Merge overview into integrations (#1672) * Merge overview into integrations * Lint --- src/layouts/hass-subpage.js | 1 + .../ha-config-entries-dashboard.js | 197 ++++++++++++++++ .../config-entries/ha-config-entries.js | 215 ++++-------------- .../config-entries/ha-config-entry-page.js | 107 +++++++++ .../ha-device-card.js} | 83 +++---- .../config/dashboard/ha-config-dashboard.js | 12 +- src/panels/config/ha-panel-config.js | 10 +- .../config/overview/ha-config-overview.js | 178 --------------- 8 files changed, 394 insertions(+), 409 deletions(-) create mode 100644 src/panels/config/config-entries/ha-config-entries-dashboard.js create mode 100644 src/panels/config/config-entries/ha-config-entry-page.js rename src/panels/config/{overview/ha-overview-device-row.js => config-entries/ha-device-card.js} (61%) delete mode 100644 src/panels/config/overview/ha-config-overview.js diff --git a/src/layouts/hass-subpage.js b/src/layouts/hass-subpage.js index eedde86637..ca225ad2a5 100644 --- a/src/layouts/hass-subpage.js +++ b/src/layouts/hass-subpage.js @@ -14,6 +14,7 @@ class HassSubpage extends PolymerElement {
[[header]]
+ diff --git a/src/panels/config/config-entries/ha-config-entries-dashboard.js b/src/panels/config/config-entries/ha-config-entries-dashboard.js new file mode 100644 index 0000000000..dbce3667b3 --- /dev/null +++ b/src/panels/config/config-entries/ha-config-entries-dashboard.js @@ -0,0 +1,197 @@ +import '@polymer/iron-flex-layout/iron-flex-layout-classes.js'; +import '@polymer/paper-tooltip/paper-tooltip.js'; +import '@polymer/paper-button/paper-button.js'; +import '@polymer/paper-card/paper-card.js'; +import '@polymer/iron-icon/iron-icon.js'; +import '@polymer/paper-item/paper-item.js'; +import '@polymer/paper-item/paper-item-body.js'; +import { html } from '@polymer/polymer/lib/utils/html-tag.js'; +import { PolymerElement } from '@polymer/polymer/polymer-element.js'; + +import '../../../components/entity/ha-state-icon.js'; +import '../../../layouts/hass-subpage.js'; +import '../../../resources/ha-style.js'; + +import '../ha-config-section.js'; +import EventsMixin from '../../../mixins/events-mixin.js'; +import LocalizeMixin from '../../../mixins/localize-mixin.js'; +import computeStateName from '../../../common/entity/compute_state_name.js'; + +let registeredDialog = false; + +/* + * @appliesMixin LocalizeMixin + * @appliesMixin EventsMixin + */ +class HaConfigManagerDashboard extends + LocalizeMixin(EventsMixin(PolymerElement)) { + static get template() { + return html` + + + + + + + Configured + + + + + + + + Set up a new integration + + + + + +`; + } + + static get properties() { + return { + hass: Object, + isWide: Boolean, + + /** + * Existing entries. + */ + entries: Array, + + /** + * Entity Registry entries. + */ + entities: Array, + + /** + * Current flows that are in progress and have not been started by a user. + * For example, can be discovered devices that require more config. + */ + progress: Array, + + handlers: Array, + }; + } + + connectedCallback() { + super.connectedCallback(); + + if (!registeredDialog) { + registeredDialog = true; + this.fire('register-dialog', { + dialogShowEvent: 'show-config-flow', + dialogTag: 'ha-config-flow', + dialogImport: () => import('./ha-config-flow.js'), + }); + } + } + + _createFlow(ev) { + this.fire('show-config-flow', { + hass: this.hass, + newFlowForHandler: ev.model.item, + dialogClosedCallback: () => this.fire('hass-reload-entries'), + }); + } + + _continueFlow(ev) { + this.fire('show-config-flow', { + hass: this.hass, + continueFlowId: ev.model.item.flow_id, + dialogClosedCallback: () => this.fire('hass-reload-entries'), + }); + } + + _computeIntegrationTitle(localize, integration) { + return localize(`component.${integration}.config.title`); + } + + _computeConfigEntryEntities(hass, configEntry, entities) { + if (!entities) { + return []; + } + const states = []; + entities.forEach((entity) => { + if (entity.config_entry_id === configEntry.entry_id && entity.entity_id in hass.states) { + states.push(hass.states[entity.entity_id]); + } + }); + return states; + } + + _computeStateName(stateObj) { + return computeStateName(stateObj); + } + + _handleMoreInfo(ev) { + this.fire('hass-more-info', { entityId: ev.model.item.entity_id }); + } +} + +customElements.define('ha-config-entries-dashboard', HaConfigManagerDashboard); diff --git a/src/panels/config/config-entries/ha-config-entries.js b/src/panels/config/config-entries/ha-config-entries.js index aa9d5eddfe..aef873ccae 100644 --- a/src/panels/config/config-entries/ha-config-entries.js +++ b/src/panels/config/config-entries/ha-config-entries.js @@ -1,112 +1,37 @@ -import '@polymer/iron-flex-layout/iron-flex-layout-classes.js'; -import '@polymer/paper-tooltip/paper-tooltip.js'; -import '@polymer/paper-button/paper-button.js'; -import '@polymer/paper-card/paper-card.js'; -import '@polymer/paper-item/paper-item-body.js'; +import '@polymer/app-route/app-route.js'; import { html } from '@polymer/polymer/lib/utils/html-tag.js'; import { PolymerElement } from '@polymer/polymer/polymer-element.js'; import { Debouncer } from '@polymer/polymer/lib/utils/debounce.js'; import { timeOut } from '@polymer/polymer/lib/utils/async.js'; -import '../../../components/entity/ha-state-icon.js'; -import '../../../layouts/hass-subpage.js'; -import '../../../resources/ha-style.js'; +import './ha-config-entries-dashboard.js'; +import './ha-config-entry-page.js'; +import NavigateMixin from '../../../mixins/navigate-mixin.js'; +import compare from '../../../common/string/compare.js'; -import '../ha-config-section.js'; -import EventsMixin from '../../../mixins/events-mixin.js'; -import LocalizeMixin from '../../../mixins/localize-mixin.js'; -import computeStateName from '../../../common/entity/compute_state_name.js'; - -let registeredDialog = false; - -/* - * @appliesMixin LocalizeMixin - * @appliesMixin EventsMixin - */ -class HaConfigManager extends - LocalizeMixin(EventsMixin(PolymerElement)) { +class HaConfigEntries extends NavigateMixin(PolymerElement) { static get template() { return html` - + - - - - - Configured - - - - - - - - Set up a new integration - - - - - + + `; } @@ -114,6 +39,12 @@ class HaConfigManager extends return { hass: Object, isWide: Boolean, + route: Object, + + _configEntry: { + type: Object, + computed: '_computeConfigEntry(_routeData, _entries)', + }, /** * Existing entries. @@ -125,6 +56,11 @@ class HaConfigManager extends */ _entities: Array, + /** + * Device Registry entries. + */ + _devices: Array, + /** * Current flows that are in progress and have not been started by a user. * For example, can be discovered devices that require more config. @@ -132,26 +68,22 @@ class HaConfigManager extends _progress: Array, _handlers: Array, + + _routeData: Object, + _routeTail: Object, + }; } ready() { super.ready(); this._loadData(); + this.addEventListener('hass-reload-entries', () => this._loadData()); } connectedCallback() { super.connectedCallback(); - if (!registeredDialog) { - registeredDialog = true; - this.fire('register-dialog', { - dialogShowEvent: 'show-config-flow', - dialogTag: 'ha-config-flow', - dialogImport: () => import('./ha-config-flow.js'), - }); - } - this.hass.connection.subscribeEvents(() => { this._debouncer = Debouncer.debounce( this._debouncer, @@ -166,39 +98,10 @@ class HaConfigManager extends if (this._unsubEvents) this._unsubEvents(); } - _createFlow(ev) { - this.fire('show-config-flow', { - hass: this.hass, - newFlowForHandler: ev.model.item, - dialogClosedCallback: () => this._loadData(), - }); - } - - _continueFlow(ev) { - this.fire('show-config-flow', { - hass: this.hass, - continueFlowId: ev.model.item.flow_id, - dialogClosedCallback: () => this._loadData(), - }); - } - - _removeEntry(ev) { - if (!confirm('Are you sure you want to delete this integration?')) return; - - const entryId = ev.model.item.entry_id; - - this.hass.callApi('delete', `config/config_entries/entry/${entryId}`) - .then((result) => { - this._entries = this._entries.filter(entry => entry.entry_id !== entryId); - if (result.require_restart) { - alert('Restart Home Assistant to finish removing this integration'); - } - }); - } - _loadData() { - this.hass.callApi('get', 'config/config_entries/entry') - .then((entries) => { this._entries = entries; }); + this.hass.callApi('get', 'config/config_entries/entry').then((entries) => { + this._entries = entries.sort((conf1, conf2) => compare(conf1.title, conf2.title)); + }); this.hass.callApi('get', 'config/config_entries/flow') .then((progress) => { this._progress = progress; }); @@ -208,32 +111,14 @@ class HaConfigManager extends this.hass.callWS({ type: 'config/entity_registry/list' }) .then((entities) => { this._entities = entities; }); + + this.hass.callWS({ type: 'config/device_registry/list' }) + .then((devices) => { this._devices = devices; }); } - _computeIntegrationTitle(localize, integration) { - return localize(`component.${integration}.config.title`); - } - - _computeConfigEntryEntities(hass, configEntry, entities) { - if (!entities) { - return []; - } - const states = []; - entities.forEach((entity) => { - if (entity.config_entry_id === configEntry.entry_id && entity.entity_id in hass.states) { - states.push(hass.states[entity.entity_id]); - } - }); - return states; - } - - _computeStateName(stateObj) { - return computeStateName(stateObj); - } - - _handleMoreInfo(ev) { - this.fire('hass-more-info', { entityId: ev.model.item.entity_id }); + _computeConfigEntry(routeData, entries) { + return !!entries && !!routeData && entries.find(ent => ent.entry_id === routeData.page); } } -customElements.define('ha-config-entries', HaConfigManager); +customElements.define('ha-config-entries', HaConfigEntries); diff --git a/src/panels/config/config-entries/ha-config-entry-page.js b/src/panels/config/config-entries/ha-config-entry-page.js new file mode 100644 index 0000000000..1df8e85508 --- /dev/null +++ b/src/panels/config/config-entries/ha-config-entry-page.js @@ -0,0 +1,107 @@ +import '@polymer/paper-card/paper-card.js'; +import { html } from '@polymer/polymer/lib/utils/html-tag.js'; +import { PolymerElement } from '@polymer/polymer/polymer-element.js'; + +import '../../../layouts/hass-subpage.js'; + +import '../../../components/entity/state-badge.js'; +import compare from '../../../common/string/compare.js'; + +import './ha-device-card.js'; +import EventsMixin from '../../../mixins/events-mixin.js'; +import NavigateMixin from '../../../mixins/navigate-mixin.js'; + +class HaConfigEntryPage extends NavigateMixin(EventsMixin(PolymerElement)) { + static get template() { + return html` + + + +
+ +
+ +`; + } + + static get properties() { + return { + hass: Object, + isWide: Boolean, + + configEntry: { + type: Object, + value: null, + }, + + /** + * Existing entries. + */ + _entries: Array, + + /** + * Entity Registry entries. + */ + _entities: Array, + }; + } + + _computeConfigEntryDevices(configEntry, devices) { + if (!devices) return []; + return devices.filter(device => + device.config_entries.includes(configEntry.entry_id)).sort((dev1, dev2) => + // Put hub devices first, then sort by name + (!!dev1.hub_device_id - !!dev2.hub_device_id) || + compare(dev1.name, dev2.name)); + } + + _removeEntry() { + if (!confirm('Are you sure you want to delete this integration?')) return; + + const entryId = this.configEntry.entry_id; + + this.hass.callApi('delete', `config/config_entries/entry/${entryId}`) + .then((result) => { + this.fire('hass-reload-entries'); + if (result.require_restart) { + alert('Restart Home Assistant to finish removing this integration'); + } + this.navigate('/config/integrations/dashboard', true); + }); + } +} + +customElements.define('ha-config-entry-page', HaConfigEntryPage); + diff --git a/src/panels/config/overview/ha-overview-device-row.js b/src/panels/config/config-entries/ha-device-card.js similarity index 61% rename from src/panels/config/overview/ha-overview-device-row.js rename to src/panels/config/config-entries/ha-device-card.js index 781a3dccc1..c8fa7d74d4 100644 --- a/src/panels/config/overview/ha-overview-device-row.js +++ b/src/panels/config/config-entries/ha-device-card.js @@ -1,3 +1,5 @@ +import '@polymer/paper-item/paper-icon-item.js'; +import '@polymer/paper-item/paper-item-body.js'; import '@polymer/paper-card/paper-card.js'; import { html } from '@polymer/polymer/lib/utils/html-tag.js'; import { PolymerElement } from '@polymer/polymer/polymer-element.js'; @@ -18,12 +20,13 @@ function computeEntityName(hass, entity) { /* * @appliesMixin EventsMixin */ -class HaDeviceRow extends EventsMixin(PolymerElement) { +class HaDeviceCard extends EventsMixin(PolymerElement) { static get template() { return html` -
-
-
-
[[device.name]]
-
[[device.model]]
-
by [[device.manufacturer]]
-
- -
-