[ES|QL] Fix ES|QL columns reset race during active fetch

src/platform/plugins/shared/discover/public/application/main/state_management/redux/internal_state.ts

@@ -416,6 +416,17 @@ export const internalStateSlice = createSlice({
         }),
     },
 
+    setProfileStateFieldsToResetWithoutResetId: (
+      state,
+      action: TabAction<Pick<TabState['defaultProfileState'], 'fieldsToReset'>>
+    ) =>
+      withTab(state, action.payload, (tab) => {
+        tab.defaultProfileState = {
+          ...tab.defaultProfileState,
+          fieldsToReset: action.payload.fieldsToReset,
+        };
+      }),
+
     resetOnSavedSearchChange: (state, action: TabAction) =>
       withTab(state, action.payload, (tab) => {
         tab.overriddenVisContextAfterInvalidation = undefined;

src/platform/plugins/shared/discover/public/application/main/state_management/utils/build_esql_fetch_subscribe.test.ts

@@ -197,6 +197,32 @@ describe('buildEsqlFetchSubscribe', () => {
     });
   });
 
+  test('should keep resetId stable when a transformational fetch requests a columns reset', async () => {
+    const { toolkit, dataState } = await setupTest({});
+    const documents$ = dataState.data$.documents$;
+
+    documents$.next(msgComplete);
+
+    const prevDefaultProfileState = toolkit.getCurrentTab().defaultProfileState;
+
+    documents$.next({
+      fetchStatus: FetchStatus.PARTIAL,
+      result: [
+        {
+          id: '1',
+          raw: { field1: 1 },
+          flattened: { field1: 1 },
+        } as unknown as DataTableRecord,
+      ],
+      query: { esql: 'from the-data-view-title | keep field1' },
+    });
+
+    const nextDefaultProfileState = toolkit.getCurrentTab().defaultProfileState;
+
+    expect(nextDefaultProfileState.fieldsToReset).toEqual(['columns']);
+    expect(nextDefaultProfileState.resetId).toBe(prevDefaultProfileState.resetId);
+  });
+
   test('changing an ES|QL query with same result columns but a different index pattern should change state when loading and finished', async () => {
     const { replaceUrlState, dataState, tabId } = await setupTest({});
     const documents$ = dataState.data$.documents$;

src/platform/plugins/shared/discover/public/application/main/state_management/utils/build_esql_fetch_subscribe.ts

@@ -152,12 +152,13 @@ export const buildEsqlFetchSubscribe = ({
 
     const { viewMode } = getCurrentTab().appState;
     const changeViewMode = viewMode !== getValidViewMode({ viewMode, isEsqlMode: true });
-
     // If the index pattern hasn't changed, but the available columns have changed
     // due to transformational commands, mark the associated profile state fields to reset
     if (!indexPatternChanged && allColumnsChanged) {
       internalState.dispatch(
-        injectCurrentTab(internalStateActions.setProfileStateFieldsToReset)({
+        // This reset comes from the current fetch, so keep the same resetId.
+        // Otherwise the snapshot taken at fetch start looks stale when cleanup runs.
+        injectCurrentTab(internalStateActions.setProfileStateFieldsToResetWithoutResetId)({
           fieldsToReset: ['columns'],
         })
       );