From bec4d225b378c81ac95b4d00ca822da0f2eb3beb Mon Sep 17 00:00:00 2001
From: Kristina Demeshchik <kristina.demeshchik@gmail.com>
Date: Mon, 12 Jan 2026 09:29:16 -0500
Subject: [PATCH] FieldConfig: Fix multiple value mappings in field overrides
 being overwritten (#116027)

* multiple value mappingg overrides

* add comment for clarity

* remove extra check
---
 .../src/field/fieldOverrides.test.ts          | 40 +++++++++++++++++++
 .../grafana-data/src/field/fieldOverrides.ts  | 11 ++++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-data/src/field/fieldOverrides.test.ts b/packages/grafana-data/src/field/fieldOverrides.test.ts
index 767da439543..b0aa271be3f 100644
--- a/packages/grafana-data/src/field/fieldOverrides.test.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.test.ts
@@ -9,6 +9,7 @@ import { FieldColorModeId } from '../types/fieldColor';
 import { FieldConfigPropertyItem, FieldConfigSource } from '../types/fieldOverrides';
 import { InterpolateFunction } from '../types/panel';
 import { ThresholdsMode } from '../types/thresholds';
+import { MappingType } from '../types/valueMapping';
 import { Registry } from '../utils/Registry';
 import { locationUtil } from '../utils/location';
 import { mockStandardProperties } from '../utils/tests/mockStandardProperties';
@@ -999,6 +1000,45 @@ describe('setDynamicConfigValue', () => {
     expect(config.custom.property3).toEqual({});
     expect(config.displayName).toBeUndefined();
   });
+
+  it('works correctly with multiple value mappings in the same override', () => {
+    const config: FieldConfig = {
+      mappings: [{ type: MappingType.ValueToText, options: { existing: { text: 'existing' } } }],
+    };
+
+    setDynamicConfigValue(
+      config,
+      {
+        id: 'mappings',
+        value: [{ type: MappingType.ValueToText, options: { first: { text: 'first' } } }],
+      },
+      {
+        fieldConfigRegistry: customFieldRegistry,
+        data: [],
+        field: { type: FieldType.number } as Field,
+        dataFrameIndex: 0,
+      }
+    );
+
+    setDynamicConfigValue(
+      config,
+      {
+        id: 'mappings',
+        value: [{ type: MappingType.ValueToText, options: { second: { text: 'second' } } }],
+      },
+      {
+        fieldConfigRegistry: customFieldRegistry,
+        data: [],
+        field: { type: FieldType.number } as Field,
+        dataFrameIndex: 0,
+      }
+    );
+
+    expect(config.mappings).toHaveLength(3);
+    expect(config.mappings![0]).toEqual({ type: MappingType.ValueToText, options: { existing: { text: 'existing' } } });
+    expect(config.mappings![1]).toEqual({ type: MappingType.ValueToText, options: { first: { text: 'first' } } });
+    expect(config.mappings![2]).toEqual({ type: MappingType.ValueToText, options: { second: { text: 'second' } } });
+  });
 });
 
 describe('getLinksSupplier', () => {
diff --git a/packages/grafana-data/src/field/fieldOverrides.ts b/packages/grafana-data/src/field/fieldOverrides.ts
index 8b345036c64..bf56f811106 100644
--- a/packages/grafana-data/src/field/fieldOverrides.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.ts
@@ -341,7 +341,7 @@ export function setDynamicConfigValue(config: FieldConfig, value: DynamicConfigV
     return;
   }
 
-  const val = item.process(value.value, context, item.settings);
+  let val = item.process(value.value, context, item.settings);
 
   const remove = val === undefined || val === null;
 
@@ -352,6 +352,15 @@ export function setDynamicConfigValue(config: FieldConfig, value: DynamicConfigV
       unset(config, item.path);
     }
   } else {
+    // Merge arrays (e.g. mappings) when multiple overrides target the same field
+    if (Array.isArray(val)) {
+      const existingValue = item.isCustom ? get(config.custom, item.path) : get(config, item.path);
+
+      if (Array.isArray(existingValue)) {
+        val = [...existingValue, ...val];
+      }
+    }
+
     if (item.isCustom) {
       if (!config.custom) {
         config.custom = {};