From 4263b3a982ec7e7e83b03afc038e5a68891e4788 Mon Sep 17 00:00:00 2001
From: Alyssa Joyner <58453566+alyssajoyner@users.noreply.github.com>
Date: Wed, 6 Aug 2025 16:13:01 -0600
Subject: [PATCH] [InfluxDB]: Fix max series bug (#109291)

---
 .../config-v2/AdvancedDBConnectionSettings.tsx    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx
index cb5c7617372..d3254abbdcb 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/config-v2/AdvancedDBConnectionSettings.tsx
@@ -5,6 +5,7 @@ import {
   onUpdateDatasourceJsonDataOption,
   onUpdateDatasourceJsonDataOptionChecked,
   onUpdateDatasourceJsonDataOptionSelect,
+  updateDatasourcePluginJsonDataOption,
 } from '@grafana/data';
 import { InlineFieldRow, InlineField, Combobox, InlineSwitch, Input, Space, useStyles2 } from '@grafana/ui';
 
@@ -24,11 +25,18 @@ import { Props } from './types';
 export const AdvancedDbConnectionSettings = (props: Props) => {
   const { options } = props;
   const styles = useStyles2(getInlineLabelStyles);
+  const [maxSeriesValue, setMaxSeriesValue] = useState(options.jsonData.maxSeries?.toString() || '');
 
   const [advancedDbConnectionSettingsIsOpen, setAdvancedDbConnectionSettingsIsOpen] = useState(
-    () => !!options.jsonData.timeInterval || !!options.jsonData.insecureGrpc
+    () => !!options.jsonData.timeInterval || !!options.jsonData.insecureGrpc || !!options.jsonData.maxSeries
   );
 
+  const onMaxSeriesChange = (e: { currentTarget: { value: string } }) => {
+    setMaxSeriesValue(e.currentTarget.value);
+    const val = parseInt(e.currentTarget.value, 10);
+    updateDatasourcePluginJsonDataOption(props, 'maxSeries', Number.isFinite(val) ? val : undefined);
+  };
+
   return (
     <>
       <Space v={2} />
@@ -125,9 +133,10 @@ export const AdvancedDbConnectionSettings = (props: Props) => {
                 className="width-15"
                 data-testid="influxdb-v2-config-max-series"
                 onBlur={trackInfluxDBConfigV2AdvancedDbConnectionSettingsMaxSeriesClicked}
-                onChange={onUpdateDatasourceJsonDataOption(props, 'maxSeries')}
+                onChange={onMaxSeriesChange}
                 placeholder="1000"
-                value={options.jsonData.maxSeries || ''}
+                value={maxSeriesValue}
+                type="number"
               />
             </InlineField>
           </InlineFieldRow>