From 7408f7e482f8e036339bae0d1a7ff27984ae92c5 Mon Sep 17 00:00:00 2001
From: kkerezsi <11377875+kkerezsi@users.noreply.github.com>
Date: Mon, 10 Feb 2025 11:22:31 +0200
Subject: [PATCH] fix(assets): fix display for assets in global variable (#123)

Co-authored-by: NI\akerezsi <alex.kerezsi@ni.com>
---
 src/datasources/asset/AssetDataSource.ts             |  6 ++----
 .../asset/__snapshots__/AssetDataSource.test.ts.snap | 12 ++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/datasources/asset/AssetDataSource.ts b/src/datasources/asset/AssetDataSource.ts
index dbf85b89..ca664dbf 100644
--- a/src/datasources/asset/AssetDataSource.ts
+++ b/src/datasources/asset/AssetDataSource.ts
@@ -101,14 +101,12 @@ export class AssetDataSource extends DataSourceBase<AssetQuery, AssetDataSourceO
   }
 
   private getAssetNameForMetricQuery(asset: AssetModel): MetricFindValue {
-
     const vendor = asset.vendorName ? asset.vendorName : asset.vendorNumber;
     const model = asset.modelName ? asset.modelName : asset.modelNumber;
     const serial = asset.serialNumber;
-    const assetIdentifier = `Vendor: ${vendor} - Model: ${model} - Serial: ${serial}`;
 
-    const assetName = !asset.name ? assetIdentifier : `${asset.name} (${assetIdentifier})`;
-    const assetValue = `Assets.${vendor}.${model}.${asset.serialNumber}`
+    const assetName = !asset.name ? `${serial}` : `${asset.name} (${serial})`;
+    const assetValue = `Assets.${vendor}.${model}.${serial}`
 
     return { text: assetName, value: assetValue };
   }
diff --git a/src/datasources/asset/__snapshots__/AssetDataSource.test.ts.snap b/src/datasources/asset/__snapshots__/AssetDataSource.test.ts.snap
index 985337bb..a19f0a89 100644
--- a/src/datasources/asset/__snapshots__/AssetDataSource.test.ts.snap
+++ b/src/datasources/asset/__snapshots__/AssetDataSource.test.ts.snap
@@ -3,11 +3,11 @@
 exports[`queries metricFindQuery returns default identifiers when asset name is not present 1`] = `
 [
   {
-    "text": "Vendor: National Instruments - Model: sbRIO-9629 - Serial: 01FE20D1",
+    "text": "01FE20D1",
     "value": "Assets.National Instruments.sbRIO-9629.01FE20D1",
   },
   {
-    "text": "Vendor: 3333 - Model: 1111 - Serial: 2222",
+    "text": "2222",
     "value": "Assets.3333.1111.2222",
   },
 ]
@@ -16,19 +16,19 @@ exports[`queries metricFindQuery returns default identifiers when asset name is
 exports[`queries metricFindQuery returns name/alias when asset name field is present 1`] = `
 [
   {
-    "text": "NI-sbRIO-9629-01FE20D1 (Vendor: National Instruments - Model: sbRIO-9629 - Serial: 01FE20D1)",
+    "text": "NI-sbRIO-9629-01FE20D1 (01FE20D1)",
     "value": "Assets.National Instruments.sbRIO-9629.01FE20D1",
   },
   {
-    "text": "Conn0_AI (Vendor: National Instruments - Model: AI 0-15 - Serial: 01FE20D1)",
+    "text": "Conn0_AI (01FE20D1)",
     "value": "Assets.National Instruments.AI 0-15.01FE20D1",
   },
   {
-    "text": "Conn0_AO (Vendor: National Instruments - Model: AO 0-3 - Serial: 01FE20D1)",
+    "text": "Conn0_AO (01FE20D1)",
     "value": "Assets.National Instruments.AO 0-3.01FE20D1",
   },
   {
-    "text": "Conn0_DIO0-3 (Vendor: National Instruments - Model: DIO 0-3 - Serial: 01FE20D1)",
+    "text": "Conn0_DIO0-3 (01FE20D1)",
     "value": "Assets.National Instruments.DIO 0-3.01FE20D1",
   },
 ]