Merge branch 'master' of github.com:thingsboard/thingsboard

2024-12-03 19:25:06 +02:00 · 2024-12-03 19:25:06 +02:00 · 8e8719830f
commit 8e8719830f
parent 290e2faf6a d6437c512d
15 changed files with 67 additions and 23 deletions
--- a/application/src/main/data/json/system/scada_symbols/filter-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/filter-hp.svg
@ -163,8 +163,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/scada_symbols/heat-pump-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/heat-pump-hp.svg
@ -306,8 +306,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/scada_symbols/horizontal-tank-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-tank-hp.svg
@ -247,8 +247,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/scada_symbols/horizontal-valve-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/horizontal-valve-hp.svg
@ -272,8 +272,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/scada_symbols/pool-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/pool-hp.svg
@ -247,8 +247,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/scada_symbols/pump-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/pump-hp.svg
@ -206,8 +206,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/scada_symbols/sand-filter-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/sand-filter-hp.svg
@ -279,8 +279,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/scada_symbols/short-vertical-tank-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/short-vertical-tank-hp.svg
@ -247,8 +247,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/scada_symbols/vertical-tank-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-tank-hp.svg
@ -247,8 +247,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/scada_symbols/vertical-valve-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/vertical-valve-hp.svg
@ -272,8 +272,8 @@
    },
    {
      "id": "criticalAnimation",
-      "name": "{i18n:scada.symbol.critical-state-animation}",
-      "hint": "{i18n:scada.symbol.critical-state-animation-hint}",
+      "name": "{i18n:scada.symbol.warning-critical-state-animation}",
+      "hint": "{i18n:scada.symbol.warning-critical-state-animation-hint}",
      "group": null,
      "type": "value",
      "valueType": "BOOLEAN",
--- a/application/src/main/data/json/system/widget_bundles/general_high_performance_scada_symbols.json
+++ b/application/src/main/data/json/system/widget_bundles/general_high_performance_scada_symbols.json
@ -5,7 +5,7 @@
    "image": "tb-image:aHBfc2NhZGFfZ2VuZXJhbF9zeW1ib2xzX3N5c3RlbV9idW5kbGVfaW1hZ2UucG5n:IkdlbmVyYWwgaGlnaC1wZXJmb3JtYW5jZSBTQ0FEQSBzdW1ib2xzIiBzeXN0ZW0gYnVuZGxlIGltYWdl:SU1BR0U=;data:image/png;base64,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",
    "scada": true,
    "description": "Bundle with high-performance SCADA symbols",
-    "order": 9500,
+    "order": 9400,
    "name": "General high-performance SCADA symbols"
  },
  "widgetTypeFqns": [
--- a/application/src/main/data/json/system/widget_bundles/high_performance_scada_fluid_system.json
+++ b/application/src/main/data/json/system/widget_bundles/high_performance_scada_fluid_system.json
--- a/ui-ngx/src/assets/help/en_US/widget/lib/gateway/bacnet-device-name-field-expression_fn.md
+++ b/ui-ngx/src/assets/help/en_US/widget/lib/gateway/bacnet-device-name-field-expression_fn.md
@ -0,0 +1,21 @@
+## Expressions
+
+This field allows dynamically constructing a formatted device name using values extracted from a JSON object. You can specify variables to access the relevant fields in the JSON.
+
+# Available Variables
+
+You can use the following variables to extract specific device information:
+
+* `objectName`: Extracts the device's object name (e.g., `"Main Controller"`).
+* `vendorId`: Extracts the device's vendor ID, typically a numeric identifier representing the manufacturer (e.g., `"1234"`).
+* `objectId`: Extracts the device's unique object identifier (e.g., `"999"`).
+* `address`: Extracts the device's network address (e.g., `"192.168.1.1"`).
+
+# Examples
+
+* `"Device ${objectName}"`
+  If the objectName variable exist and contains `"objectName": "Main Controller"`, the device on platform will have the following name: `Device Main Controller`.
+* `"Vendor: ${vendorId}"`
+  If the vendorId variable exist and contains `"vendorId": 1234`, the device on platform will have the following name: `Vendor: 1234`.
+* `"Device ID: ${objectId} at ${address}"`
+  If the objectId variable exist and contains `"vendorId": 999 `and address variable exist and contains `"address": "192.168.1.1"` , the device on platform will have the following name: `Device ID: 999 at 192.168.1.1`.
--- a/ui-ngx/src/assets/help/en_US/widget/lib/gateway/bacnet-device-profile-name-expression_fn.md
+++ b/ui-ngx/src/assets/help/en_US/widget/lib/gateway/bacnet-device-profile-name-expression_fn.md
@ -0,0 +1,21 @@
+## Expressions
+
+This field allows dynamically constructing a formatted profile name using values extracted from a JSON object. You can specify variables to access the relevant fields in the JSON.
+
+# Available Variables
+
+You can use the following variables to extract specific device information:
+
+* `objectName`: Extracts the device's object name (e.g., `"Main Controller"`).
+* `vendorId`: Extracts the device's vendor ID, typically a numeric identifier representing the manufacturer (e.g., `"1234"`).
+* `objectId`: Extracts the device's unique object identifier (e.g., `"999"`).
+* `address`: Extracts the device's network address (e.g., `"192.168.1.1"`).
+
+# Examples
+
+* `"Device ${objectName}"`
+  If the objectName variable exist and contains `"objectName": "Main Controller"`, the device on platform will have the following name: `Device Main Controller`.
+* `"Vendor: ${vendorId}"`
+  If the vendorId variable exist and contains `"vendorId": 1234`, the device on platform will have the following name: `Vendor: 1234`.
+* `"Device ID: ${objectId} at ${address}"`
+  If the objectId variable exist and contains `"vendorId": 999 `and address variable exist and contains `"address": "192.168.1.1"` , the device on platform will have the following name: `Device ID: 999 at 192.168.1.1`.
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@ -3179,8 +3179,10 @@
            "critical": "Critical",
            "critical-click": "Critical click",
            "critical-state-hint": "Indicates whether component is in critical state.",
-            "critical-state-animation": "Alarm state animation",
+            "critical-state-animation": "Critical state animation",
            "critical-state-animation-hint": "Whether to enable blinking animation when component is in critical state.",
+            "warning-critical-state-animation": "Warning/Critical state animation",
+            "warning-critical-state-animation-hint": "Whether to enable blinking animation when component is in warning or critical state.",
            "animation": "Animation",
            "broken": "Broken",
            "broken-hint": "Indicates whether component is broken.",