jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-04-24 21:37:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dev states: replace pattern in word by wildcard search (#9288)

Browse Source
This commit is contained in:
Bram Kragten 2021-05-31 05:11:53 +02:00 committed by GitHub
parent 93b3b8f985
commit 2aa8f5b352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/string/escape_regexp.ts Normal file
View File

@ -0,0 +1,2 @@
export const escapeRegExp = (text: string): string =>
text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");

94
src/panels/developer-tools/state/developer-tools-state.js
View File

@ -11,8 +11,8 @@ import { html } from "@polymer/polymer/lib/utils/html-tag";
import { PolymerElement } from "@polymer/polymer/polymer-element";
import { dump, load } from "js-yaml";
import { formatDateTimeWithSeconds } from "../../../common/datetime/format_date_time";
import { isPatternInWord } from "../../../common/string/filter/filter";
import { computeRTL } from "../../../common/util/compute_rtl";
import { escapeRegExp } from "../../../common/string/escape_regexp";
import { copyToClipboard } from "../../../common/util/copy-clipboard";
import "../../../components/entity/ha-entity-picker";
import "../../../components/ha-code-editor";
@ -412,72 +412,68 @@ class HaPanelDevState extends EventsMixin(LocalizeMixin(PolymerElement)) {
}
computeEntities(hass, _entityFilter, _stateFilter, _attributeFilter) {
const _entityFilterLength = _entityFilter && _entityFilter.length;
const _entityFilterLow = _entityFilter && _entityFilter.toLowerCase();
const entityFilterRegExp =
_entityFilter &&
RegExp(escapeRegExp(_entityFilter).replace(/\\\*/g, ".*"), "i");
return Object.keys(hass.states)
.map((key) => hass.states[key])
const stateFilterRegExp =
_stateFilter &&
RegExp(escapeRegExp(_stateFilter).replace(/\\\*/g, ".*"), "i");
let keyFilterRegExp;
let valueFilterRegExp;
let multiMode = false;
if (_attributeFilter) {
const colonIndex = _attributeFilter.indexOf(":");
multiMode = colonIndex !== -1;
const keyFilter = multiMode
? _attributeFilter.substring(0, colonIndex).trim()
: _attributeFilter;
const valueFilter = multiMode
? _attributeFilter.substring(colonIndex + 1).trim()
: _attributeFilter;
keyFilterRegExp = RegExp(
escapeRegExp(keyFilter).replace(/\\\*/g, ".*"),
"i"
);
valueFilterRegExp = multiMode
? RegExp(escapeRegExp(valueFilter).replace(/\\\*/g, ".*"), "i")
: keyFilterRegExp;
}
return Object.values(hass.states)
.filter((value) => {
if (
_entityFilter &&
!isPatternInWord(
_entityFilterLow,
0,
_entityFilterLength,
value.entity_id.toLowerCase(),
0,
value.entity_id.length,
true
) &&
entityFilterRegExp &&
!entityFilterRegExp.test(value.entity_id) &&
(value.attributes.friendly_name === undefined ||
!isPatternInWord(
_entityFilterLow,
0,
_entityFilterLength,
value.attributes.friendly_name.toLowerCase(),
0,
value.attributes.friendly_name.length,
true
))
!entityFilterRegExp.test(value.attributes.friendly_name))
) {
return false;
}
if (!value.state.toLowerCase().includes(_stateFilter.toLowerCase())) {
if (stateFilterRegExp && !stateFilterRegExp.test(value.state)) {
return false;
}
if (_attributeFilter !== "") {
const attributeFilter = _attributeFilter.toLowerCase();
const colonIndex = attributeFilter.indexOf(":");
const multiMode = colonIndex !== -1;
let keyFilter = attributeFilter;
let valueFilter = attributeFilter;
if (multiMode) {
// we need to filter keys and values separately
keyFilter = attributeFilter.substring(0, colonIndex).trim();
valueFilter = attributeFilter.substring(colonIndex + 1).trim();
}
const attributeKeys = Object.keys(value.attributes);
for (let i = 0; i < attributeKeys.length; i++) {
const key = attributeKeys[i];
if (key.includes(keyFilter) && !multiMode) {
if (keyFilterRegExp && valueFilterRegExp) {
for (const [key, attributeValue] of Object.entries(
value.attributes
)) {
const match = keyFilterRegExp.test(key);
if (match && !multiMode) {
return true; // in single mode we're already satisfied with this match
}
if (!key.includes(keyFilter) && multiMode) {
if (!match && multiMode) {
continue;
}
const attributeValue = value.attributes[key];
if (
attributeValue !== undefined &&
JSON.stringify(attributeValue).toLowerCase().includes(valueFilter)
valueFilterRegExp.test(JSON.stringify(attributeValue))
) {
return true;
}