From 53a1e5b7e6d475e6a43f1659e28128082c1ba3ce Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 2 Feb 2023 04:01:07 -0500
Subject: [PATCH] [v9.4.x] Fix/60084/save and test (#62750)

Fix: Save and test error message does not persist across datasource instance settings anymore

(cherry picked from commit ce50168b70b4444abb5a1aa36d695dc1b7c339b9)

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
---
 public/app/features/datasources/state/hooks.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/app/features/datasources/state/hooks.ts b/public/app/features/datasources/state/hooks.ts
index 8432bb01bb7..3687ea740fc 100644
--- a/public/app/features/datasources/state/hooks.ts
+++ b/public/app/features/datasources/state/hooks.ts
@@ -23,6 +23,7 @@ import {
 } from './actions';
 import { DataSourcesRoutesContext } from './contexts';
 import { getDataSourceLoadingNav, buildNavModel, getDataSourceNav } from './navModel';
+import { initialDataSourceSettingsState } from './reducers';
 import { getDataSource, getDataSourceMeta } from './selectors';
 
 export const useInitDataSourceSettings = (uid: string) => {
@@ -34,7 +35,7 @@ export const useInitDataSourceSettings = (uid: string) => {
     return function cleanUp() {
       dispatch(
         cleanUpAction({
-          cleanupAction: (state) => state.dataSourceSettings,
+          cleanupAction: (state) => (state.dataSourceSettings = initialDataSourceSettingsState),
         })
       );
     };