Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: or-rules bug fix (don't filter out readonly attributes in when)

Rich Turnerc8061c9ecf79
diff --git a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts
index 0e28b57fc..5cb1cd911 100644
--- a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts
+++ b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts
@@ -159,14 +159,14 @@ class OrRuleAssetQuery extends translate(i18next)(LitElement) {
if (asset) {
attribute = attributeName ? Util.getAssetAttribute(asset, attributeName) : undefined;
- attributes = Util.getAssetAttributes(asset).filter((attr) => !Util.hasMetaItem(attr, MetaItemType.READ_ONLY.urn!))
+ attributes = Util.getAssetAttributes(asset)
.map((attr) => {
const attrDescriptor = AssetModelUtil.getAssetAttributeDescriptor(assetDescriptor, attr.name);
return [attr.name!, Util.getAttributeLabel(attr, attrDescriptor)];
});
} else {
attributes = !assetDescriptor || !assetDescriptor.attributeDescriptors ? []
- : assetDescriptor.attributeDescriptors.filter((ad) => !AssetModelUtil.hasMetaItem(ad, MetaItemType.READ_ONLY.urn!))
+ : assetDescriptor.attributeDescriptors
.map((ad) => [ad.attributeName!, Util.getAttributeLabel(undefined, ad)]);
}