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: core util and AssetModelUtil updates

Rich Turner135cf5029118
diff --git a/ui/component/core/src/index.ts b/ui/component/core/src/index.ts
index 55ffeb4fa..adad117a5 100644
--- a/ui/component/core/src/index.ts
+++ b/ui/component/core/src/index.ts
@@ -6,7 +6,7 @@ import {AxiosRequestConfig} from "axios";
import {EventProvider, EventProviderFactory, EventProviderStatus, WebSocketEventProvider} from "./event";
import i18next from "i18next";
import i18nextXhr from "i18next-xhr-backend";
-import {AssetDescriptor, AttributeDescriptor, AttributeValueDescriptor, MetaItemDescriptor, Asset} from "@openremote/model/dist";
+import {AssetDescriptor, AttributeDescriptor, AttributeValueDescriptor, MetaItemDescriptor, Asset, MetaItemType} from "@openremote/model";
export enum ORError {
NONE = "NONE",
@@ -76,19 +76,19 @@ export class AssetModelUtil {
public static _metaItemDescriptors: MetaItemDescriptor[] = [];
public static getAssetDescriptors(): AssetDescriptor[] {
- return this._assetDescriptors;
+ return [...this._assetDescriptors];
}
public static getAttributeDescriptors(): AttributeDescriptor[] {
- return this._attributeDescriptors;
+ return [...this._attributeDescriptors];
}
public static getAttributeValueDescriptors(): AttributeValueDescriptor[] {
- return this._attributeValueDescriptors;
+ return [...this._attributeValueDescriptors];
}
public static getMetaItemDescriptors(): MetaItemDescriptor[] {
- return this._metaItemDescriptors;
+ return [...this._metaItemDescriptors];
}
public static getAssetDescriptor(type?: string): AssetDescriptor | undefined {
@@ -119,6 +119,24 @@ export class AssetModelUtil {
});
}
+ public static getAttributeDescriptorFromAsset(assetType?: string, attributeName?: string): AttributeDescriptor | undefined {
+ if (!attributeName) {
+ return;
+ }
+
+ if (assetType) {
+ const assetDescriptor = this.getAssetDescriptor(assetType);
+ if (assetDescriptor && assetDescriptor.attributeDescriptors) {
+ const attributeDescriptor = assetDescriptor.attributeDescriptors.find((ad) => ad.attributeName === attributeName);
+ if (attributeDescriptor) {
+ return attributeDescriptor;
+ }
+ }
+ }
+
+ return this.getAttributeDescriptor(attributeName);
+ }
+
public static getAttributeValueDescriptor(name?: string): AttributeValueDescriptor | undefined {
if (!name) {
return;
@@ -148,6 +166,28 @@ export class AssetModelUtil {
}
return attributeValueDescriptor1.name === attributeValueDescriptor2.name && attributeValueDescriptor1.valueType === attributeValueDescriptor2.valueType;
}
+
+ public static getMetaInitialValueFromMetaDescriptors(metaItemUrn: MetaItemDescriptor | string, metaItemDescriptors: MetaItemDescriptor[] | undefined): any | undefined {
+ if (!metaItemDescriptors) {
+ return;
+ }
+
+ const matchUrn = typeof metaItemUrn === "string" ? metaItemUrn : metaItemUrn.urn;
+ const metaItemDescriptor = metaItemDescriptors && metaItemDescriptors.find((mid) => mid && mid.urn === matchUrn);
+ if (metaItemDescriptor) {
+ return metaItemDescriptor.initialValue;
+ }
+ }
+
+ public static getMetaItemDescriptorInitialValue(metaItemDescriptor: MetaItemDescriptor, initialValue: any) {
+ if (metaItemDescriptor.valueFixed) {
+ return metaItemDescriptor;
+ }
+
+ const newMetaItem = JSON.parse(JSON.stringify(metaItemDescriptor)) as MetaItemDescriptor;
+ newMetaItem.initialValue = initialValue;
+ return newMetaItem;
+ }
}
export type EventCallback = (event: OREvent) => any;
diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.ts
index 78f1bdd6a..f853fec01 100644
--- a/ui/component/core/src/util.ts
+++ b/ui/component/core/src/util.ts
@@ -5,7 +5,7 @@ import {
PushNotificationMessage,
RuleActionUnion,
RuleCondition,
- RuleTrigger
+ LogicGroup
} from "@openremote/model";
export class Deferred<T> {
@@ -48,7 +48,7 @@ export function getGeoNotificationsFromRulesSet(rulesetDefinition: JsonRulesetDe
if (rule.when && rule.then && rule.then.length > 0) {
const geoNotificationMap = new Map<String, GeoNotification[]>();
- addGeofencePredicatesFromRuleTriggerCondition(rule.when, 0, geoNotificationMap);
+ addGeofencePredicatesFromRuleConditionCondition(rule.when, 0, geoNotificationMap);
if (geoNotificationMap.size > 0) {
rule.then.forEach((ruleAction) => addPushNotificationsFromRuleAction(ruleAction, geoNotificationMap));
@@ -67,13 +67,13 @@ export function getGeoNotificationsFromRulesSet(rulesetDefinition: JsonRulesetDe
return geoNotifications;
}
-function addGeofencePredicatesFromRuleTriggerCondition(ruleCondition: RuleCondition<RuleTrigger> | undefined, index: number, geoNotificationMap: Map<String, GeoNotification[]>) {
+function addGeofencePredicatesFromRuleConditionCondition(ruleCondition: LogicGroup<RuleCondition> | undefined, index: number, geoNotificationMap: Map<String, GeoNotification[]>) {
if (!ruleCondition) {
return;
}
- if (ruleCondition.predicates) {
- ruleCondition.predicates.forEach((ruleTrigger) => {
+ if (ruleCondition.items) {
+ ruleCondition.items.forEach((ruleTrigger) => {
if (ruleTrigger.assets && ruleTrigger.assets.attributes) {
const geoNotifications: GeoNotification[] = [];
addGeoNotificationsFromAttributePredicateCondition(ruleTrigger.assets.attributes, geoNotifications);
@@ -86,12 +86,12 @@ function addGeofencePredicatesFromRuleTriggerCondition(ruleCondition: RuleCondit
}
}
-function addGeoNotificationsFromAttributePredicateCondition(attributeCondition: RuleCondition<AttributePredicate> | undefined, geoNotifications: GeoNotification[]) {
+function addGeoNotificationsFromAttributePredicateCondition(attributeCondition: LogicGroup<AttributePredicate> | undefined, geoNotifications: GeoNotification[]) {
if (!attributeCondition) {
return;
}
- attributeCondition.predicates!.forEach((predicate) => {
+ attributeCondition.items!.forEach((predicate) => {
if (predicate.value && (predicate.value.predicateType === "radial" || predicate.value!.predicateType === "rect")) {
geoNotifications.push({
predicate: predicate.value as GeofencePredicate
@@ -99,8 +99,8 @@ function addGeoNotificationsFromAttributePredicateCondition(attributeCondition:
}
});
- if (attributeCondition.conditions) {
- attributeCondition.conditions.forEach((condition) => addGeoNotificationsFromAttributePredicateCondition(condition, geoNotifications));
+ if (attributeCondition.groups) {
+ attributeCondition.groups.forEach((condition) => addGeoNotificationsFromAttributePredicateCondition(condition, geoNotifications));
}
}
@@ -109,8 +109,8 @@ function addPushNotificationsFromRuleAction(ruleAction: RuleActionUnion, geoPred
if (ruleAction.notification && ruleAction.notification.message && ruleAction.notification.message.type === "push") {
// Find applicable targets
const target = ruleAction.target;
- if (target && target.ruleTriggerTag) {
- const geoNotifications = geoPredicateMap.get(target.ruleTriggerTag);
+ if (target && target.ruleConditionTag) {
+ const geoNotifications = geoPredicateMap.get(target.ruleConditionTag);
if (geoNotifications) {
geoNotifications.forEach((geoNotification) => {
geoNotification.notification = ruleAction.notification!.message as PushNotificationMessage;
@@ -128,6 +128,31 @@ function addPushNotificationsFromRuleAction(ruleAction: RuleActionUnion, geoPred
}
}
+const TIME_DURATION_REGEXP = /([+-])?((\d+)[Dd])?\s*((\d+)[Hh])?\s*((\d+)[Mm]$)?\s*((\d+)[Ss])?\s*((\d+)([Mm][Ss]$))?\s*((\d+)[Ww])?\s*((\d+)[Mm][Nn])?\s*((\d+)[Yy])?/;
+
+export function isTimeDuration(time?: string): boolean {
+ if (!time) {
+ return false;
+ }
+
+ time = time.trim();
+
+ return time.length > 0
+ && (TIME_DURATION_REGEXP.test(time)
+ || isTimeDurationPositiveInfinity(time)
+ || isTimeDurationNegativeInfinity(time));
+}
+
+export function isTimeDurationPositiveInfinity(time?: string): boolean {
+ time = time != null ? time.trim() : undefined;
+ return "*" === time || "+*" === time;
+}
+
+export function isTimeDurationNegativeInfinity(time?: string): boolean {
+ time = time != null ? time.trim() : undefined;
+ return "-*" === time;
+}
+
export function arraysEqual<T>(arr1?: T[], arr2?: T[]) {
if (arr1 === arr2) {
return true;
@@ -156,3 +181,13 @@ export function arrayRemove<T>(arr: T[], item: T) {
arr.splice(index, 1);
}
}
+
+export function enumContains(enm: object, val: string): boolean {
+ return enm && Object.values(enm).includes(val);
+}
+
+export function getEnumKeyAsString(enm: object, val: string): string {
+ // @ts-ignore
+ const key = Object.keys(enm).find((k) => enm[k] === val);
+ return key!;
+}