Move last changed / last updated out of state table (#7649)

This commit is contained in:
Bram Kragten 2020-11-11 14:42:27 +01:00 committed by GitHub
parent a0e67d4c03
commit bae29c6d62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 154 additions and 101 deletions

View File

@ -12,6 +12,7 @@ import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box";
import { EventsMixin } from "../../../mixins/events-mixin"; import { EventsMixin } from "../../../mixins/events-mixin";
import LocalizeMixin from "../../../mixins/localize-mixin"; import LocalizeMixin from "../../../mixins/localize-mixin";
import "../../../styles/polymer-ha-style"; import "../../../styles/polymer-ha-style";
import { formatDateTimeWithSeconds } from "../../../common/datetime/format_date_time";
import { mdiInformationOutline } from "@mdi/js"; import { mdiInformationOutline } from "@mdi/js";
import { computeRTL } from "../../../common/util/compute_rtl"; import { computeRTL } from "../../../common/util/compute_rtl";
@ -33,14 +34,25 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
} }
.inputs { .inputs {
width: 100%;
max-width: 400px; max-width: 400px;
} }
.info {
padding: 0 16px;
}
mwc-button { mwc-button {
margin-top: 8px; margin-top: 8px;
} }
.table-wrapper {
width: 100%;
overflow: auto;
}
.entities th { .entities th {
padding: 0 8px;
text-align: left; text-align: left;
font-size: var( font-size: var(
--paper-input-container-shared-input-style_-_font-size --paper-input-container-shared-input-style_-_font-size
@ -65,7 +77,7 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
} }
.entities td { .entities td {
padding: 4px; padding: 4px;
min-width: 220px; min-width: 200px;
word-break: break-word; word-break: break-word;
} }
.entities ha-svg-icon { .entities ha-svg-icon {
@ -81,14 +93,22 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
.entities a { .entities a {
color: var(--primary-color); color: var(--primary-color);
} }
:host([narrow]) .state-wrapper {
flex-direction: column;
}
:host([narrow]) .info {
padding: 0;
}
</style> </style>
<div class="inputs">
<p> <p>
[[localize('ui.panel.developer-tools.tabs.states.description1')]]<br /> [[localize('ui.panel.developer-tools.tabs.states.description1')]]<br />
[[localize('ui.panel.developer-tools.tabs.states.description2')]] [[localize('ui.panel.developer-tools.tabs.states.description2')]]
</p> </p>
<div class="state-wrapper flex layout horizontal">
<div class="inputs">
<ha-entity-picker <ha-entity-picker
autofocus autofocus
hass="[[hass]]" hass="[[hass]]"
@ -119,10 +139,26 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
>[[localize('ui.panel.developer-tools.tabs.states.set_state')]]</mwc-button >[[localize('ui.panel.developer-tools.tabs.states.set_state')]]</mwc-button
> >
</div> </div>
<div class="info">
<template is="dom-if" if="[[_entity]]">
<p>
<b
>[[localize('ui.panel.developer-tools.tabs.states.last_changed')]]:</b
><br />[[lastChangedString(_entity)]]
</p>
<p>
<b
>[[localize('ui.panel.developer-tools.tabs.states.last_updated')]]:</b
><br />[[lastUpdatedString(_entity)]]
</p>
</template>
</div>
</div>
<h1> <h1>
[[localize('ui.panel.developer-tools.tabs.states.current_entities')]] [[localize('ui.panel.developer-tools.tabs.states.current_entities')]]
</h1> </h1>
<div class="table-wrapper">
<table class="entities"> <table class="entities">
<tr> <tr>
<th>[[localize('ui.panel.developer-tools.tabs.states.entity')]]</th> <th>[[localize('ui.panel.developer-tools.tabs.states.entity')]]</th>
@ -172,11 +208,7 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
<a href="#" on-click="entitySelected">[[entity.entity_id]]</a> <a href="#" on-click="entitySelected">[[entity.entity_id]]</a>
</td> </td>
<td> <td>
[[entity.state]]<br /><br /> [[entity.state]]
<span class="secondary">
last_changed: [[lastChangedString(entity)]]<br />
last_updated: [[lastUpdatedString(entity)]]
</span>
</td> </td>
<template <template
is="dom-if" is="dom-if"
@ -187,6 +219,7 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
</tr> </tr>
</template> </template>
</table> </table>
</div>
`; `;
} }
@ -226,6 +259,10 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
value: "", value: "",
}, },
_entity: {
type: Object,
},
_state: { _state: {
type: String, type: String,
value: "", value: "",
@ -247,6 +284,11 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
"computeEntities(hass, _entityFilter, _stateFilter, _attributeFilter)", "computeEntities(hass, _entityFilter, _stateFilter, _attributeFilter)",
}, },
narrow: {
type: Boolean,
reflectToAttribute: true,
},
rtl: { rtl: {
reflectToAttribute: true, reflectToAttribute: true,
computed: "_computeRTL(hass)", computed: "_computeRTL(hass)",
@ -257,6 +299,7 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
entitySelected(ev) { entitySelected(ev) {
const state = ev.model.entity; const state = ev.model.entity;
this._entityId = state.entity_id; this._entityId = state.entity_id;
this._entity = state;
this._state = state.state; this._state = state.state;
this._stateAttributes = safeDump(state.attributes); this._stateAttributes = safeDump(state.attributes);
ev.preventDefault(); ev.preventDefault();
@ -264,6 +307,7 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
entityIdChanged() { entityIdChanged() {
if (this._entityId === "") { if (this._entityId === "") {
this._entity = undefined;
this._state = ""; this._state = "";
this._stateAttributes = ""; this._stateAttributes = "";
return; return;
@ -272,6 +316,7 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
if (!state) { if (!state) {
return; return;
} }
this._entity = state;
this._state = state.state; this._state = state.state;
this._stateAttributes = safeDump(state.attributes); this._stateAttributes = safeDump(state.attributes);
} }
@ -391,11 +436,17 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
} }
lastChangedString(entity) { lastChangedString(entity) {
return new Date(entity.last_changed).toISOString(); return formatDateTimeWithSeconds(
new Date(entity.last_changed),
this.hass.language
);
} }
lastUpdatedString(entity) { lastUpdatedString(entity) {
return new Date(entity.last_updated).toISOString(); return formatDateTimeWithSeconds(
new Date(entity.last_updated),
this.hass.language
);
} }
formatAttributeValue(value) { formatAttributeValue(value) {

View File

@ -3061,7 +3061,9 @@
"filter_attributes": "Filter attributes", "filter_attributes": "Filter attributes",
"no_entities": "No entities", "no_entities": "No entities",
"more_info": "More Info", "more_info": "More Info",
"alert_entity_field": "Entity is a mandatory field" "alert_entity_field": "Entity is a mandatory field",
"last_updated": "[%key:ui::dialogs::more_info_control::last_updated%]",
"last_changed": "[%key:ui::dialogs::more_info_control::last_changed%]"
}, },
"templates": { "templates": {
"title": "Template", "title": "Template",