@c8y/ngx-components 1024.21.3 → 1024.21.5

package/fesm2022/c8y-ngx-components-widgets-implementations-scada.mjs

@@ -189,13 +189,13 @@ const INITIAL_SVG_CODE = `<?xml version="1.0" encoding="utf-8"?>
   <text x="60" y="495" class="label">Examples:</text>
   
   <text x="60" y="525" class="label">Device name:</text>
-  <text x="180" y="525" class="placeholder">\${this.c8yScadaValues?.deviceName || '-'}</text>
+  <text x="180" y="525" class="placeholder">\${this.c8yScadaValues?.deviceName ?? '-'}</text>
 
   <text x="60" y="550" class="label">Temperature:</text>
-  <text x="180" y="550" class="placeholder">\${this.c8yScadaValues?.temperature || '-'} °C</text>
+  <text x="180" y="550" class="placeholder">\${this.c8yScadaValues?.temperature ?? '-'} °C</text>
 
   <text x="60" y="575" class="label">Status:</text>
-  <text x="180" y="575" class="placeholder">\${this.c8yScadaValues?.status || '-'}</text>
+  <text x="180" y="575" class="placeholder">\${this.c8yScadaValues?.status ?? '-'}</text>
 
   <!-- STEP 4: Advanced Customization -->
   <circle cx="55" cy="630" r="15" class="step-circle" />
@@ -453,6 +453,13 @@ function restoreLitExpressions(svg, litExpressions) {
         return `\${${expr}}`;
     });
 }
+/**
+ * The expression inserted for a text turned into a placeholder. It shows `[name]` until the
+ * placeholder has a value; `??` keeps a value of `0` visible.
+ */
+function placeholderExpressionWithFallback(placeholderName) {
+    return `\${this.c8yScadaValues?.${placeholderName} ?? '[${placeholderName}]'}`;
+}
 /**
  * Generates Lit web component code for rendering SCADA SVG elements.
  *
@@ -600,6 +607,7 @@ export default class ScadaElement extends LitElement {
 }`;
 }
 
+const LAST_MEASUREMENT = 'lastMeasurement';
 class ScadaWidgetConfigService {
     constructor() {
         this.widgetConfigService = inject(WidgetConfigService);
@@ -618,6 +626,8 @@ class ScadaWidgetConfigService {
         if (!migratedConfig.config?.htmlWidgetConfig) {
             migratedConfig = await this.updateConfigWithSvgCode(migratedConfig, INITIAL_SVG_CODE);
         }
+        this.addKeyPathToSavedLegacyMappings(migratedConfig);
+        this.addRawValueToSavedLegacyLastMeasurements(migratedConfig);
         return migratedConfig;
     }
     save(config) {
@@ -740,6 +750,65 @@ class ScadaWidgetConfigService {
         }
         config.config.mappings = newMappings;
     }
+    /**
+     * A widget migrated and saved before the migration set `keyPath` is never migrated again, so
+     * its nested property mappings get it on load. It comes from the stored 1.0 mapping, or from
+     * splitting the dotted `name` the migration built from it.
+     */
+    addKeyPathToSavedLegacyMappings(config) {
+        if (!config.config?.htmlWidgetConfig?.config?.legacy) {
+            return;
+        }
+        for (const [placeholder, mapping] of Object.entries(config.config.mappings || {})) {
+            const property = mapping?.assetProperty;
+            const isNestedPropertyWithoutKeyPath = property && !property.computed && !('keyPath' in property) && property.name?.includes('.');
+            if (!isNestedPropertyWithoutKeyPath) {
+                continue;
+            }
+            const legacyKeyPath = config.mapping?.[placeholder]?.keyPath;
+            const keyPath = Array.isArray(legacyKeyPath) && legacyKeyPath.join('.') === property.name
+                ? [...legacyKeyPath]
+                : property.name.split('.');
+            mapping.assetProperty = { ...property, keyPath };
+        }
+    }
+    /**
+     * A widget migrated and saved before the migration set `rawValue` is never migrated again,
+     * so its "Last measurement" mappings get it on load.
+     */
+    addRawValueToSavedLegacyLastMeasurements(config) {
+        if (!config.config?.htmlWidgetConfig?.config?.legacy) {
+            return;
+        }
+        for (const [placeholder, mapping] of Object.entries(config.config.mappings || {})) {
+            const legacyMapping = config.mapping?.[placeholder];
+            if (this.isUnchangedMigratedLastMeasurement(mapping?.assetProperty, legacyMapping)) {
+                mapping.assetProperty = {
+                    ...mapping.assetProperty,
+                    config: { ...mapping.assetProperty.config, rawValue: true }
+                };
+            }
+        }
+    }
+    /**
+     * True while the mapping still holds the "Last measurement" it was migrated from, and nobody
+     * has chosen its formatting since.
+     */
+    isUnchangedMigratedLastMeasurement(property, legacyMapping) {
+        const propertyConfig = property?.config;
+        return (!!property?.computed &&
+            property.name === LAST_MEASUREMENT &&
+            !!propertyConfig?._id &&
+            propertyConfig._id === legacyMapping?.config?._id &&
+            !('rawValue' in propertyConfig));
+    }
+    /**
+     * SCADA 1.0 drawings compare the measured value as the device sent it. A rounded string
+     * reads differently: `"0.00"` is truthy in `ng-if="LangHL"`, where `0` is not.
+     */
+    withRawValueForLastMeasurement(computedPropertyName, config) {
+        return computedPropertyName === LAST_MEASUREMENT ? { ...config, rawValue: true } : config;
+    }
     /**
      * Removes hardcoded width and height attributes from the root SVG element.
      *
@@ -866,9 +935,13 @@ class ScadaWidgetConfigService {
         const binary = await this.inventoryBinary.download(binaryId);
         const svgCode = await binary.text();
         const mappings = {};
-        for (const key of Object.keys(config.mapping)) {
-            mappings[key] = {
-                assetProperty: await this.migrateProperty(config.mapping[key], config.deviceIds[key])
+        const legacyMappings = config.mapping;
+        for (const [placeholder, legacyProperty] of Object.entries(legacyMappings)) {
+            const isUnmapped = !legacyProperty;
+            mappings[placeholder] = {
+                assetProperty: isUnmapped
+                    ? null
+                    : await this.migrateProperty(legacyProperty, config.deviceIds[placeholder])
             };
         }
         return {
@@ -915,7 +988,7 @@ class ScadaWidgetConfigService {
                 active: true,
                 temporary: true,
                 contextAssetId: assetId,
-                config: legacyProperty.config,
+                config: this.withRawValueForLastMeasurement(computedPropertyName, legacyProperty.config),
                 asset: {
                     id: asset.id,
                     name: asset.name
@@ -947,6 +1020,8 @@ class ScadaWidgetConfigService {
                 c8y_JsonSchema: {
                     properties: buildJsonSchema(legacyProperty.keyPath, legacyProperty.label, legacyProperty.type)
                 },
+                // Without `keyPath`, the dotted `name` is looked up as a single top-level key.
+                keyPath: legacyProperty.keyPath,
                 name: legacyProperty.keyPath.join('.'),
                 active: true,
                 label: legacyProperty.label,
@@ -1543,7 +1618,7 @@ class ScadaWidgetViewComponent {
                         this.scadaWidgetService.getSvgComputedStyling(this.svgDisplaySettings());
                 }
                 if (this.legacyScopeRef) {
-                    Object.assign(this.legacyScopeRef, scadaValues);
+                    Object.assign(this.legacyScopeRef, this.withEmptyStringForMissingValues(scadaValues));
                     Object.assign(this.legacyScopeRef, scadaFunctions);
                 }
             },
@@ -1558,6 +1633,15 @@ class ScadaWidgetViewComponent {
             }
         });
     }
+    /**
+     * SCADA 1.0 resolved a placeholder without a value to `''`, and its drawings rely on it:
+     * `ng-if="state==0"` matches `''` but not `undefined`. Lit drawings keep `undefined`.
+     */
+    withEmptyStringForMissingValues(values) {
+        const placeholders = Object.keys(this.effectiveConfig()?.config?.mappings ?? {});
+        const emptyValues = Object.fromEntries(placeholders.map(placeholder => [placeholder, '']));
+        return { ...emptyValues, ...values };
+    }
     handleFetchError(err) {
         this.alerts?.addAlerts(new DynamicComponentAlert({
             type: 'warning',
@@ -1639,7 +1723,7 @@ class ScadaWidgetAdvancedEditorComponent {
                 const proposedName = textContent && textContent.trim() ? camelCase(textContent) : '';
                 try {
                     const placeholderName = await this.confirmPlaceholderName(proposedName);
-                    node.textContent = `\${${this.PROPERTY_PREFIX}?.${placeholderName} || '[${placeholderName}]'}`;
+                    node.textContent = placeholderExpressionWithFallback(placeholderName);
                     node.classList.remove('potential-placeholder');
                 }
                 catch (e) {